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

Issue #1298 Changes for non-blocking SaveDeleteComboDlg.

Browse source 
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f

Former-commit-id: 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly 853a3e6593 [formerly 359ee69fa6] [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly dfb55edb3d [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]]
Former-commit-id: eae8a68fd5
Former-commit-id: 3851d5161c [formerly e7aa940f52] [formerly 0211367abde3087618fb2170a6c9b3664254ca94 [formerly 24a2e79b28]]
Former-commit-id: 410107753569223f9d35b6fd82a686616658272c [formerly 062109f9a7]
Former-commit-id: b895611562
This commit is contained in:
Roger Ferrel 2012-11-08 10:35:41 -06:00
parent 3708f9b773
commit 91cbd20ccc
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/SaveDeleteComboDlg.java
View file

@ -51,6 +51,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 25 MAR 2008 N/A lvenable Initial creation
* 08 NOV 2012 1298 rferrel Code cleanup for non-blocking dialog.
*
* </pre>
*
@ -59,7 +60,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
*
*/
public class SaveDeleteComboDlg extends CaveJFACEDialog {
private static final transient IUFStatusHandler statusHandler = UFStatus
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(SaveDeleteComboDlg.class);
private Map<String, Integer> comboDict;

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

@ -96,6 +96,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.
* Changes for non-blocking SaveDeleteComboDlg.
*
* </pre>
*
@ -108,6 +109,8 @@ public class ZoneCombinerComp extends Composite implements
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ZoneCombinerComp.class);
private SaveDeleteComboDlg saveDeleteCombDlg;
private ClearZoneGroupsDialog examClearDlg;
/**
@ -393,11 +396,17 @@ public class ZoneCombinerComp extends Composite implements
saveComboMI.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
SaveDeleteComboDlg saveCombDlg = new SaveDeleteComboDlg(parent
.getShell(), mapNames, "Save", zoneSelector.getCombos());
saveCombDlg.setBlockOnOpen(true);
saveCombDlg.open();
if (saveDeleteCombDlg == null
|| saveDeleteCombDlg.getShell() == null
|| saveDeleteCombDlg.isDisposed()) {
saveDeleteCombDlg = new SaveDeleteComboDlg(parent
.getShell(), mapNames, "Save", zoneSelector
.getCombos());
saveDeleteCombDlg.setBlockOnOpen(false);
saveDeleteCombDlg.open();
} else {
saveDeleteCombDlg.bringToTop();
}
}
});
@ -424,10 +433,16 @@ public class ZoneCombinerComp extends Composite implements
deleteComboMI.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
SaveDeleteComboDlg deleteCombDlg = new SaveDeleteComboDlg(
parent.getShell(), mapNames, "Delete", null);
deleteCombDlg.setBlockOnOpen(true);
deleteCombDlg.open();
if (saveDeleteCombDlg == null
|| saveDeleteCombDlg.getShell() == null
|| saveDeleteCombDlg.isDisposed()) {
saveDeleteCombDlg = new SaveDeleteComboDlg(parent
.getShell(), mapNames, "Delete", null);
saveDeleteCombDlg.setBlockOnOpen(false);
saveDeleteCombDlg.open();
} else {
saveDeleteCombDlg.bringToTop();
}
}
});
}