xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development

Browse source 
Former-commit-id: 3bb9ad3e1fb050dba420fc634b742a73b4443ba2
This commit is contained in:
Lee Venable 2012-10-30 16:44:56 -05:00 • committed by Gerrit Code Review
commit 0bc4ec2135
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GridManagerView.java
View file

@ -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.
* </pre>
*
* @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();

5
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java
View file

@ -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.
*
* </pre>
*
@ -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;