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

Issue #1229 Changes for non-blocking ClimateHistoryDlg.

Browse source 
Change-Id: Icc33809c0cc0874b9854d081eb4bb28f816a4e74

Former-commit-id: 379ed8f81d [formerly b6516168a2] [formerly 379ed8f81d [formerly b6516168a2] [formerly 2a0dcd99fc [formerly c242c08d88e7ef0147046e64c0be261c10540a1f]]]
Former-commit-id: 2a0dcd99fc
Former-commit-id: c5ac86a88b [formerly 1c3a78e961]
Former-commit-id: 43b0a0ea13
This commit is contained in:
Roger Ferrel 2012-10-04 15:14:02 -05:00
parent 653cd7affa
commit 6d3cba365e
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

@ -92,6 +92,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* May 24, 2011 #9075 rferrel Changed getObsHistoryFromInv() to scan * May 24, 2011 #9075 rferrel Changed getObsHistoryFromInv() to scan
* ish-inventory.txt only one time. * ish-inventory.txt only one time.
* Oct 04, 2012 #1229 rferrel Made non-blocking. * Oct 04, 2012 #1229 rferrel Made non-blocking.
* Oct 04, 2012 #1229 rfrreel Changes of non-blocking ClimateHistoryDlg.
* *
* </pre> * </pre>
* *
@ -844,10 +845,12 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
return; return;
} }
if (climateHistoryDlg == null) { if (climateHistoryDlg == null || climateHistoryDlg.getShell() == null
|| climateHistoryDlg.isDisposed()) {
climateHistoryDlg = new ClimateHistoryDlg(shell, data); climateHistoryDlg = new ClimateHistoryDlg(shell, data);
climateHistoryDlg.open(); climateHistoryDlg.open();
climateHistoryDlg = null; } else {
climateHistoryDlg.bringToTop();
} }
} }

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

@ -48,6 +48,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Nov 16, 2009 #3438 lvenable Initial creation * Nov 16, 2009 #3438 lvenable Initial creation
* Oct 06, 2012 #1229 rferrel Made non-blocking.
* *
* </pre> * </pre>
* *
@ -87,7 +88,8 @@ public class ClimateHistoryDlg extends CaveSWTDialog {
*/ */
public ClimateHistoryDlg(Shell parentShell, public ClimateHistoryDlg(Shell parentShell,
ClimateHistoryData climateHistData) { ClimateHistoryData climateHistData) {
super(parentShell, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT); super(parentShell, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
| CAVE.DO_NOT_BLOCK);
setText("Climate History"); setText("Climate History");
this.climateHistData = climateHistData; this.climateHistData = climateHistData;