From 6d49470c3631b2ab08b431af3a1db07ee8bb44c2 Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Tue, 30 Oct 2012 12:33:52 -0500 Subject: [PATCH] Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking. Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0 Former-commit-id: 3b96d312cd58e141feed4afbd3a2c0ac5a6a2145 [formerly 8952e1cef870df969b3c388009edfd8bfac02d5d] [formerly 3b96d312cd58e141feed4afbd3a2c0ac5a6a2145 [formerly 8952e1cef870df969b3c388009edfd8bfac02d5d] [formerly e37a097596cf0cc983c52548ce1fcb9c1ffb080c [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]] Former-commit-id: e37a097596cf0cc983c52548ce1fcb9c1ffb080c Former-commit-id: 2cbd0000adac43c5320b80036ca3e510592ded88 [formerly b93dcebdc0c07a5b832b3cf4e329586809164a55] Former-commit-id: 6c9c5a0a5fb806e4769620e8d6e61b10267ddbe4 --- .../src/com/raytheon/viz/gfe/GridManagerView.java | 11 ++++++++++- .../viz/gfe/dialogs/AbstractSaveParameterDialog.java | 5 +++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GridManagerView.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GridManagerView.java index 558661d71c..eadc85eb1e 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GridManagerView.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GridManagerView.java @@ -54,6 +54,7 @@ import com.raytheon.viz.ui.color.IBackgroundColorChangedListener.BGColorMode; * 06/11/2009 #1947 rjpeter Updated to add saving of parms on close, * adding cancel capability and if error on * save then the close is cancelled. + * 10/30/2012 #1298 rferrel Must keep blocking dialogs to work with eclipse plugins. * * * @author dfitch @@ -129,6 +130,11 @@ public class GridManagerView extends ViewPart implements ISaveablePart2 { return view; } + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.ISaveablePart2#promptToSaveOnClose() + */ @Override public int promptToSaveOnClose() { // Check for any running/queued jobs. @@ -137,6 +143,8 @@ public class GridManagerView extends ViewPart implements ISaveablePart2 { .getShell(); KillJobsOnExitDialog dialog = new KillJobsOnExitDialog(shell); + // Must keep modal and blocking in order to work with eclipse + // plugins. dialog.setBlockOnOpen(true); int returnCode = dialog.open(); if (returnCode == IDialogConstants.CANCEL_ID) { @@ -154,7 +162,8 @@ public class GridManagerView extends ViewPart implements ISaveablePart2 { SaveParameterDialog dialog = new SaveParameterDialog(shell, dataManager); - + // Must keep modal and blocking in order to work with eclipse + // plugins. dialog.setBlockOnOpen(true); int returnCode = dialog.open(); diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java index 857d4da0af..7a6660917c 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java @@ -59,6 +59,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Oct 26, 2011 randerso Initial creation + * Oct 30, 2012 1298 rferrel Code clean for non-blocking dialog. * * * @@ -68,10 +69,10 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; public abstract class AbstractSaveParameterDialog extends CaveJFACEDialog implements DisposeListener { - private static final transient IUFStatusHandler statusHandler = UFStatus + private final transient IUFStatusHandler statusHandler = UFStatus .getHandler(AbstractSaveParameterDialog.class); - protected static final int MAX_CONCURRENT_SAVES = 5; + private final int MAX_CONCURRENT_SAVES = 5; protected DataManager dataManager;