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

Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.

Browse source 
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0

Former-commit-id: ee038e811c [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]
Former-commit-id: 65d10be5d6
Former-commit-id: 35f3a3953c
This commit is contained in:
Roger Ferrel 2012-11-07 15:07:47 -06:00
parent 412c29f116
commit 42f453ffca
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
View file

@ -95,6 +95,7 @@ import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector;
* ------------ ---------- ----------- --------------------------
* 21 APR 2008 ### lvenable Initial creation
* 07 JUL 2011 9293 rferrel Hook to allow checking of includeAllZones
* 07 Nov 2012 1298 rferrel Changes for non-blocking ClearZoneGroupsDialog.
*
* </pre>
*
@ -104,9 +105,11 @@ import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector;
*/
public class ZoneCombinerComp extends Composite implements
ILocalizationFileObserver, IZoneCombiner {
private static final transient IUFStatusHandler statusHandler = UFStatus
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ZoneCombinerComp.class);
private ClearZoneGroupsDialog examClearDlg;
/**
* Parent composite.
*/
@ -192,8 +195,8 @@ public class ZoneCombinerComp extends Composite implements
private List<RGB> colorMap = new ArrayList<RGB>();
private static final String COLOR_MAP_FILE = FileUtil.join("gfe",
"combinations", "Combinations_ColorMap");
private final String COLOR_MAP_FILE = FileUtil.join("gfe", "combinations",
"Combinations_ColorMap");
Matcher matcher;
@ -487,9 +490,15 @@ public class ZoneCombinerComp extends Composite implements
}
private void openClearDialog() {
ClearZoneGroupsDialog examClearDlg = new ClearZoneGroupsDialog(
parent.getShell(), zoneSelector, getCombinationsFileName());
examClearDlg.open();
if (examClearDlg == null || examClearDlg.getShell() == null
|| examClearDlg.isDisposed()) {
examClearDlg = new ClearZoneGroupsDialog(parent.getShell(),
zoneSelector, getCombinationsFileName());
examClearDlg.setBlockOnOpen(false);
examClearDlg.open();
} else {
examClearDlg.bringToTop();
}
}