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

Former-commit-id: d264ed526a [formerly 1d0d352716] [formerly d264ed526a [formerly 1d0d352716] [formerly 9f3b0417cf [formerly cbcc82dff2b686c9b9f136563f473f5c41c15c8a]]]
Former-commit-id: 9f3b0417cf
Former-commit-id: a9dcf2ed3c [formerly 2554830cce]
Former-commit-id: f2303ba0f6
This commit is contained in:
Lee Venable 2012-10-23 17:02:51 -05:00 committed by Gerrit Code Review
commit 5ae1d62e6b

View file

@ -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.
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 17, 2008 Eric Babin Initial Creation
* Oct 27, 2012 1287 rferrel Changes for non-blocking BreakLockDialog.
*
* </pre>
*
@ -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;
}