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

Merge "Issue #1287 Changes for non-blocking EditActionsDialog." into development

Browse source 
Former-commit-id: 6e973b521040a8bac62c8c78cca7bbc1f91f9229
This commit is contained in:
Lee Venable 2012-10-25 13:04:30 -05:00 • committed by Gerrit Code Review
commit ce1b1f3c54
2 changed files with 18 additions and 26 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/ShowEditActionsDialog.java
View file

@ -36,6 +36,7 @@ import com.raytheon.viz.gfe.dialogs.EditActionsDialog;
* ------------ ---------- ----------- --------------------------
* Feb 19, 2007 njensen Initial creation
* Aug 05, 2010 6112 mpduff One, and only one, dialog open
* Oct 25, 2012 1287 rferrel Changes for non-blocking EditActionsDialog.
*
* </pre>
*
@ -61,11 +62,13 @@ public class ShowEditActionsDialog extends AbstractHandler {
// If the dialog doesn't exist, create one, otherwise call its open
// method
if (dialog == null || dialog.getShell() == null) {
if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
dialog = new EditActionsDialog(shell);
dialog.setBlockOnOpen(false);
dialog.open();
} else {
dialog.bringToTop();
}
dialog.open();
return null;
}

37
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/EditActionsDialog.java
View file

@ -58,6 +58,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* ------------ ---------- ----------- --------------------------
* Feb 18, 2007 njensen Initial creation.
* 05Aug2008 #1407 ebabin Dim delta button for wx/discrete types.
* Oct 25, 2012 #1287 rferrel Code clean up part of non-blocking dialog.
* </pre>
*
* @author njensen
@ -67,15 +68,15 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
public class EditActionsDialog extends CaveJFACEDialog implements
ISmartToolInventoryChanged {
private static final String XCOORD_SETTING = "EditActionDialog_Xcoord";
private final String XCOORD_SETTING = "EditActionDialog_Xcoord";
private static final String YCOORD_SETTING = "EditActionDialog_Ycoord";
private final String YCOORD_SETTING = "EditActionDialog_Ycoord";
public static final int PICKUP_ID = 2;
private final int PICKUP_ID = 2;
public static final int DELTA_ID = 3;
private final int DELTA_ID = 3;
private static final int HEIGHT = 330;
private final int HEIGHT = 330;
private String title;
@ -135,11 +136,6 @@ public class EditActionsDialog extends CaveJFACEDialog implements
dataManager.getSpatialDisplayManager().addActivatedParmChangedListener(
parmChanged);
// LocalizationContext baseCtx = PathManagerFactory.getPathManager()
// .getContext(LocalizationType.CAVE_STATIC,
// LocalizationLevel.BASE);
// baseLF = GfePyIncludeUtil.getSmartToolsLF(baseCtx);
// baseLF.addFileUpdatedObserver(this);
dataManager.getSmartToolInterface().addListener(this);
}
@ -147,9 +143,6 @@ public class EditActionsDialog extends CaveJFACEDialog implements
public boolean close() {
dataManager.getSpatialDisplayManager()
.removeActivatedParmChangedListener(parmChanged);
// if (baseLF != null) {
// baseLF.removeFileUpdatedObserver(this);
// }
dataManager.getSmartToolInterface().removeListener(this);
return super.close();
@ -354,17 +347,13 @@ public class EditActionsDialog extends CaveJFACEDialog implements
}
// @Override
// public void fileUpdated(FileUpdatedMessage message) {
// VizApp.runAsync(new Runnable() {
// @Override
// public void run() {
// toolsList.setItems(getSmartTools(parm));
// }
//
// });
// }
/*
* (non-Javadoc)
*
* @see
* org.eclipse.jface.dialogs.Dialog#getInitialLocation(org.eclipse.swt.graphics
* .Point)
*/
@Override
protected Point getInitialLocation(Point initialSize) {
Point result = super.getInitialLocation(initialSize);