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

Issue #1298 Changes for non-blocking GhgMonitorDlg.

Browse source 
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3

Former-commit-id: fd5621056c [formerly 07cc6ec003] [formerly a29b52ca8c] [formerly a29b52ca8c [formerly dc82ad820b]] [formerly 109dea21e1 [formerly a29b52ca8c [formerly dc82ad820b] [formerly 109dea21e1 [formerly 782113272c208a32e6165c02404138fcaa79d523]]]]
Former-commit-id: 109dea21e1
Former-commit-id: 148db09937474897d540f273a3d5eba90fd4d09b [formerly 2ae5143718b7d58053a166fd95152a86a5f839a4] [formerly e35d7b3f15 [formerly 2206167b00]]
Former-commit-id: e35d7b3f15
Former-commit-id: 76d9479fb9
This commit is contained in:
Roger Ferrel 2012-11-15 14:37:29 -06:00
parent d1d22c1dd7
commit 3f6a9de406
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/GhgMonitorAction.java
View file

@ -35,6 +35,7 @@ import com.raytheon.viz.ghg.monitor.GhgMonitorDlg;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 26, 2008 1033 lvenable Initial creation
* Nov 15, 2012 1298 rferrel Changes for non-blocking GhgMonitorDlg.
*
* </pre>
*
@ -43,12 +44,15 @@ import com.raytheon.viz.ghg.monitor.GhgMonitorDlg;
*/
public class GhgMonitorAction extends AbstractHandler {
private GhgMonitorDlg monitorDlg;
@Override
public Object execute(ExecutionEvent arg0) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
GhgMonitorDlg monitorDlg = new GhgMonitorDlg(shell);
if (monitorDlg == null) {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
monitorDlg = new GhgMonitorDlg(shell);
}
monitorDlg.open();
return null;

14
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
View file

@ -108,6 +108,7 @@ import com.raytheon.viz.ui.statusline.StatusStore;
* ------------ ---------- ----------- --------------------------
* 25 MAR 2008 N/A lvenable Initial creation
* 17Jun2008 1157 MW Fegan Pass configuration to sub-dialogs.
* 15 Nov 2012 1298 rferrel Changes for non-blocking dialog.
*
* </pre>
*
@ -118,7 +119,7 @@ import com.raytheon.viz.ui.statusline.StatusStore;
public class GhgMonitorDlg extends CaveSWTDialog implements
GhgMonitorFilterChangeListener, GhgMonitorZoneSelectionListener,
INotificationObserver {
private static final transient IUFStatusHandler statusHandler = UFStatus
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(GhgMonitorDlg.class);
private static final Map<String, GhgConfigData.DataEnum> labelToEnumMap;
@ -126,22 +127,22 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
/**
* Active group one string.
*/
private static final String ACT_GROUP_ONE_STRING = " CON EXA EXB EXT NEW ";
private final String ACT_GROUP_ONE_STRING = " CON EXA EXB EXT NEW ";
/**
* Active group two string.
*/
private static final String ACT_GROUP_TWO_STRING = " CAN EXP UPG ";
private final String ACT_GROUP_TWO_STRING = " CAN EXP UPG ";
/**
* Default timeout value.
*/
private static final long DEFAULT_TIMEOUT = 30000;
private final long DEFAULT_TIMEOUT = 30000;
/**
* Status bar definition key.
*/
private static final String STATUS_KEY = com.raytheon.viz.ghg.constants.StatusConstants.CATEGORY_GHG;
private final String STATUS_KEY = com.raytheon.viz.ghg.constants.StatusConstants.CATEGORY_GHG;
/**
* The currently selected font data (is null until font is selected)
@ -229,7 +230,8 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
* Parent Shell.
*/
public GhgMonitorDlg(Shell parent) {
super(parent, SWT.RESIZE, CAVE.INDEPENDENT_SHELL);
super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.INDEPENDENT_SHELL
| CAVE.DO_NOT_BLOCK);
// Register as a listener to the display manager and VTECActiveTable
GhgDisplayManager.getInstance().addGhgMonitorFilterChangeListener(this);