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

Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.

Browse source 
Changes from reviewer's comments.

Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079

Former-commit-id: d89ce26aeb [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]
Former-commit-id: d489a7ef9f
This commit is contained in:
Roger Ferrel 2012-11-09 14:52:26 -06:00
parent 87ec259477
commit e01a4ae243
2 changed files with 36 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
View file

@ -153,8 +153,6 @@ public class ProductEditorComp extends Composite implements
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ProductEditorComp.class);
private FindReplaceDlg findAndReplaceDlg;
private final String EMPTY = "";
/**
@ -2464,14 +2462,12 @@ public class ProductEditorComp extends Composite implements
* dialog.
*/
private void displayFindReplaceDialog(boolean findAndReplace) {
if (findAndReplaceDlg == null || findAndReplaceDlg.getShell() == null
|| findAndReplaceDlg.isDisposed()) {
findAndReplaceDlg = new FindReplaceDlg(parent.getShell(),
findAndReplace, textComp);
findAndReplaceDlg.open();
} else {
findAndReplaceDlg.bringToTop();
}
// The dialog being opened is modal to the parent dialog. This will
// prevent the launching of another dialog until the modal dialog is
// closed.
FindReplaceDlg findAndReplaceDlg = new FindReplaceDlg(
parent.getShell(), findAndReplace, textComp);
findAndReplaceDlg.open();
}
private void CTAHazCB(int callToActionType) {

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

@ -97,6 +97,7 @@ import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector;
* 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.
* Changes for non-blocking ShuffleZoneGroupsDialog.
*
* </pre>
*
@ -109,10 +110,6 @@ public class ZoneCombinerComp extends Composite implements
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(ZoneCombinerComp.class);
private SaveDeleteComboDlg saveDeleteCombDlg;
private ClearZoneGroupsDialog examClearDlg;
/**
* Parent composite.
*/
@ -396,17 +393,15 @@ public class ZoneCombinerComp extends Composite implements
saveComboMI.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
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();
}
// The dialog being opened is modal to the parent dialog. This
// will
// prevent the launching of another dialog until the modal
// dialog is
// closed.
SaveDeleteComboDlg saveCombDlg = new SaveDeleteComboDlg(parent
.getShell(), mapNames, "Save", zoneSelector.getCombos());
saveCombDlg.setBlockOnOpen(false);
saveCombDlg.open();
}
});
@ -433,16 +428,15 @@ public class ZoneCombinerComp extends Composite implements
deleteComboMI.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
if (saveDeleteCombDlg == null
|| saveDeleteCombDlg.getShell() == null
|| saveDeleteCombDlg.isDisposed()) {
saveDeleteCombDlg = new SaveDeleteComboDlg(parent
.getShell(), mapNames, "Delete", null);
saveDeleteCombDlg.setBlockOnOpen(false);
saveDeleteCombDlg.open();
} else {
saveDeleteCombDlg.bringToTop();
}
// The dialog being opened is modal to the parent dialog. This
// will
// prevent the launching of another dialog until the modal
// dialog is
// closed.
SaveDeleteComboDlg deleteCombDlg = new SaveDeleteComboDlg(
parent.getShell(), mapNames, "Delete", null);
deleteCombDlg.setBlockOnOpen(false);
deleteCombDlg.open();
}
});
}
@ -505,21 +499,22 @@ public class ZoneCombinerComp extends Composite implements
}
private void openClearDialog() {
if (examClearDlg == null || examClearDlg.getShell() == null
|| examClearDlg.isDisposed()) {
examClearDlg = new ClearZoneGroupsDialog(parent.getShell(),
zoneSelector, getCombinationsFileName());
examClearDlg.setBlockOnOpen(false);
examClearDlg.open();
} else {
examClearDlg.bringToTop();
}
// The dialog being opened is modal to the parent dialog. This will
// prevent the launching of another dialog until the modal dialog is
// closed.
ClearZoneGroupsDialog examClearDlg = new ClearZoneGroupsDialog(
parent.getShell(), zoneSelector, getCombinationsFileName());
examClearDlg.setBlockOnOpen(false);
examClearDlg.open();
}
private void openShuffleDialog() {
// The dialog being opened is modal to the parent dialog. This will
// prevent the launching of another dialog until the modal dialog is
// closed.
ShuffleZoneGroupsDialog shuffleDlg = new ShuffleZoneGroupsDialog(
parent.getShell(), this.zoneSelector, getCombinationsFileName());
shuffleDlg.setBlockOnOpen(false);
shuffleDlg.open();
}