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

Merge "Issue #1229 Changes for non-blocking NCDCInvHistDlg" into development

Browse source 
Former-commit-id: bb95f024cb [formerly bb95f024cb [formerly 30b0ffaa2c90ede16e27390a4b58218c5085ae54]]
Former-commit-id: ed3ea856d2
Former-commit-id: be5c239912
This commit is contained in:
Lee Venable 2012-10-08 13:11:38 -05:00 • committed by Gerrit Code Review
commit 7af39ceb49
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");
}