From af887de89ca69eb72dba2f9736df60a6fd5fba6e Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Fri, 26 Oct 2012 15:02:25 -0500 Subject: [PATCH] Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog. Change-Id: I7726f8934351cea98edbf7751f23f42248e5b17c Former-commit-id: a8e412f5d0cd625b6c421b0609bc7149d7386f1a --- ...howTemporalEditorRangeStatisticsDialog.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowTemporalEditorRangeStatisticsDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowTemporalEditorRangeStatisticsDialog.java index f8564885ce..53c4281bb2 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowTemporalEditorRangeStatisticsDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowTemporalEditorRangeStatisticsDialog.java @@ -36,12 +36,15 @@ import com.raytheon.viz.gfe.dialogs.TemporalEditorRangeStatisticsDialog; * ------------ ---------- ------------- -------------------------- * Feb 14, 2008 Eric Babin Initial Creation * Jun 04, 2009 #2159 Richard Peter Moved initialization to Dialog. + * Oct 26, 2012 1287 rferrel Changes for non-blocking TemporalEditorRangeStatisticsDialog. * * * @author ebabin * @version 1.0 */ public class ShowTemporalEditorRangeStatisticsDialog extends AbstractHandler { + private TemporalEditorRangeStatisticsDialog dialog; + /* * (non-Javadoc) * @@ -51,13 +54,16 @@ public class ShowTemporalEditorRangeStatisticsDialog extends AbstractHandler { */ @Override public Object execute(ExecutionEvent arg0) throws ExecutionException { - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getShell(); + if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) { + Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); - TemporalEditorRangeStatisticsDialog dialog = new TemporalEditorRangeStatisticsDialog( - shell); - dialog.setBlockOnOpen(true); - dialog.open(); + dialog = new TemporalEditorRangeStatisticsDialog(shell); + dialog.setBlockOnOpen(false); + dialog.open(); + } else { + dialog.bringToTop(); + } return null; }