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

Issue #1287 Changes for non-blocking DefineRefSetDialog.

Browse source 
Change-Id: I0aa3ec5b80140ae79fffd3edd230b1d8e8f68e43

Former-commit-id: eb5aa48960 [formerly eb5aa48960 [formerly 3fd7556be39d7381c3cdc92a3b72a6ff10c2ebed]]
Former-commit-id: c627c6af24
Former-commit-id: be40b56d18
This commit is contained in:
Roger Ferrel 2012-10-24 10:42:33 -05:00
parent 21ec980042
commit 0a60b2f0ba
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowDefineRefSetDialog.java
View file

@ -36,6 +36,7 @@ import com.raytheon.viz.gfe.dialogs.DefineRefSetDialog;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 11, 2008 Eric Babin Initial Creation * Mar 11, 2008 Eric Babin Initial Creation
* Oct 24, 2012 1287 rferrel Changes for non-blocking DefineRefSetDialog.
* *
* </pre> * </pre>
* *
@ -63,11 +64,13 @@ public class ShowDefineRefSetDialog extends AbstractHandler {
return null; return null;
} }
if (dialog == null || dialog.getShell() == null) { if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
dialog = new DefineRefSetDialog(shell, dm); dialog = new DefineRefSetDialog(shell, dm);
dialog.setBlockOnOpen(false); dialog.setBlockOnOpen(false);
}
dialog.open(); dialog.open();
} else {
dialog.bringToTop();
}
return null; return null;
} }

19
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
View file

@ -90,6 +90,7 @@ import com.vividsolutions.jts.geom.MultiPolygon;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 11, 2008 Eric Babin Initial Creation * Mar 11, 2008 Eric Babin Initial Creation
* Jul 15, 2008 njensen Hooked into backend/fixes * Jul 15, 2008 njensen Hooked into backend/fixes
* Oct 24, 2012 1287 rferrel Code clean up for non-blocking dialog.
* *
* </pre> * </pre>
* *
@ -101,18 +102,18 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
IReferenceSetChangedListener, IReferenceSetIDChangedListener, IReferenceSetChangedListener, IReferenceSetIDChangedListener,
IReferenceSetInvChangedListener, IDisplayedParmListChangedListener, IReferenceSetInvChangedListener, IDisplayedParmListChangedListener,
IEditAreaGroupInvChangedListener { IEditAreaGroupInvChangedListener {
private static final transient IUFStatusHandler statusHandler = UFStatus private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(DefineRefSetDialog.class); .getHandler(DefineRefSetDialog.class);
private static final int NUM_ITEMS = 13; private final int NUM_ITEMS = 13;
private static final int CLEAR_QUERY_ID = IDialogConstants.CLIENT_ID + 1; private final int CLEAR_QUERY_ID = IDialogConstants.CLIENT_ID + 1;
private static final int RECALL_QUERY_ID = IDialogConstants.CLIENT_ID + 2; private final int RECALL_QUERY_ID = IDialogConstants.CLIENT_ID + 2;
private static final int UNDO_EDIT_AREA_ID = IDialogConstants.CLIENT_ID + 3; private final int UNDO_EDIT_AREA_ID = IDialogConstants.CLIENT_ID + 3;
private static final int CONVERT_TO_LOCATION_ID = IDialogConstants.CLIENT_ID + 4; private final int CONVERT_TO_LOCATION_ID = IDialogConstants.CLIENT_ID + 4;
private Composite top; private Composite top;
@ -154,10 +155,6 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
{ "3", "" }, { "-", "" }, { "0", "" }, { ".", "" }, { "3", "" }, { "-", "" }, { "0", "" }, { ".", "" },
{ "BS", "BackSpace" }, { "", "" }, { "SP", "Space" }, }; { "BS", "BackSpace" }, { "", "" }, { "SP", "Space" }, };
// private java.util.List<String> gList;
// private HashMap<String, java.util.List<String>> editAreaMap;
private IReferenceSetManager refSetMgr; private IReferenceSetManager refSetMgr;
private IParmManager parmManager; private IParmManager parmManager;
@ -168,7 +165,7 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
public DefineRefSetDialog(Shell parent, DataManager dataManager) { public DefineRefSetDialog(Shell parent, DataManager dataManager) {
super(parent); super(parent);
this.setShellStyle(SWT.TITLE | SWT.MODELESS | SWT.CLOSE); this.setShellStyle(SWT.DIALOG_TRIM | SWT.MODELESS);
this.dataManager = dataManager; this.dataManager = dataManager;
this.refSetMgr = this.dataManager.getRefManager(); this.refSetMgr = this.dataManager.getRefManager();
this.parmManager = this.dataManager.getParmManager(); this.parmManager = this.dataManager.getParmManager();