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

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

View file

@ -29,13 +29,14 @@ import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.dialogs.BreakLockDialog; 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> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jun 17, 2008 Eric Babin Initial Creation * Jun 17, 2008 Eric Babin Initial Creation
* Oct 27, 2012 1287 rferrel Changes for non-blocking BreakLockDialog.
* *
* </pre> * </pre>
* *
@ -44,6 +45,7 @@ import com.raytheon.viz.gfe.dialogs.BreakLockDialog;
*/ */
public class ShowBreakLock extends AbstractHandler { public class ShowBreakLock extends AbstractHandler {
private BreakLockDialog dialog;
/* /*
* (non-Javadoc) * (non-Javadoc)
@ -59,12 +61,16 @@ public class ShowBreakLock extends AbstractHandler {
return null; return null;
} }
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
.getShell(); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
BreakLockDialog dialog = new BreakLockDialog(shell, dm); dialog = new BreakLockDialog(shell, dm);
dialog.setBlockOnOpen(true); dialog.setBlockOnOpen(false);
dialog.open(); dialog.open();
} else {
dialog.bringToTop();
}
return null; return null;
} }