xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development

Browse source 
Former-commit-id: 17e36a68b1 [formerly 83a37094859e60605f333c18ae4dc4cb72200c64]
Former-commit-id: a19d76eca8
This commit is contained in:
Steve Harris 2012-10-08 13:49:35 -05:00
commit 845ec1aa8b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
View file

@ -95,6 +95,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Oct 04, 2012 #1229 rferrel Made non-blocking.
* Oct 04, 2012 #1229 rferrel Changes for non-blocking ClimateHistoryDlg.
* Oct 08, 2012 #1229 rferrel Changes for non-blocking GenScriptsDlg.
* Oct 08, 2012 #1229 rferrel Changes for non-blocking NCDCInvHistDlg.
*
* </pre>
*
@ -860,10 +861,12 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
* Display the NCDC inventory/history dialog.
*/
private void displayNCDCInventoryHistoryDialog() {
if (invHistoryDlg == null) {
if (invHistoryDlg == null || invHistoryDlg.getShell() == null
|| invHistoryDlg.isDisposed()) {
invHistoryDlg = new NCDCInvHistDlg(shell);
invHistoryDlg.open();
invHistoryDlg = null;
} else {
invHistoryDlg.bringToTop();
}
}

4
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/NCDCInvHistDlg.java
View file

@ -55,6 +55,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* ------------ ---------- ----------- --------------------------
* Nov 16, 2009 #3438 lvenable Initial creation
* Oct 08, 2012 #1229 rferrel Changes for non-blocking GenScriptsDlg.
* Oct 08, 2012 #1229 rferrel Make dialog non-blocking.
*
* </pre>
*
@ -135,7 +136,8 @@ public class NCDCInvHistDlg extends CaveSWTDialog {
* Parent shell.
*/
public NCDCInvHistDlg(Shell parentShell) {
super(parentShell, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT);
super(parentShell, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
| CAVE.DO_NOT_BLOCK);
setText("NCDC Inventory/History");
}