From e99ed8f50783822fd12a7561ab53d257ae6f1fba Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Tue, 23 Oct 2012 14:54:47 -0500 Subject: [PATCH] Issue #1287 Changes for non-blocking BreakLockDialog. Change-Id: Ie2626e8960d69a200bc1b5c6ee28c6aa361f30ca Former-commit-id: 90590f7ae2fe50ce73107a3ef447d5dac76c66aa [formerly 9e2496dd0bbb900db40cff91309f40d659754416] [formerly a9dbaae595e064ed72f6350730bdda1bf593b949] [formerly d33179f00907368cb144dd22b4dbb5498d8e3975 [formerly a9dbaae595e064ed72f6350730bdda1bf593b949 [formerly 2dc320c31ceed44bba70d6738ce40d703858be68]]] Former-commit-id: d33179f00907368cb144dd22b4dbb5498d8e3975 Former-commit-id: 43001b8a191ed5fa33014d973b0b9693520ab7c9 [formerly 9f0586231ffa40f831d4c2280f783f42d20f9b36] Former-commit-id: 3790b5d9c44e2c7d61232ed89d70fe9a166b51cc --- .../viz/gfe/actions/ShowBreakLock.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowBreakLock.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowBreakLock.java index f01e90d7f5..18e14eb625 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowBreakLock.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowBreakLock.java @@ -29,13 +29,14 @@ import com.raytheon.viz.gfe.core.DataManager; import com.raytheon.viz.gfe.dialogs.BreakLockDialog; /** - * TODO Add Description ShowBreakLock.java Jun 17, 2008 + * Action class to bring up the break locck dialog. * *
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 	Jun 17, 2008					Eric Babin Initial Creation
+ * Oct 27, 2012 1287       rferrel     Changes for non-blocking BreakLockDialog.
  * 
  * 
* @@ -44,6 +45,7 @@ import com.raytheon.viz.gfe.dialogs.BreakLockDialog; */ public class ShowBreakLock extends AbstractHandler { + private BreakLockDialog dialog; /* * (non-Javadoc) @@ -59,12 +61,16 @@ public class ShowBreakLock extends AbstractHandler { return null; } - Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getShell(); + if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) { + Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(); - BreakLockDialog dialog = new BreakLockDialog(shell, dm); - dialog.setBlockOnOpen(true); - dialog.open(); + dialog = new BreakLockDialog(shell, dm); + dialog.setBlockOnOpen(false); + dialog.open(); + } else { + dialog.bringToTop(); + } return null; }