From 34b84bcf2a6e30b457067ef8ab103feacbfa0d31 Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Wed, 24 Oct 2012 10:52:51 -0500
Subject: [PATCH] Issue #1287 Changes for non-blocking CreateFromScratchDialog.

Change-Id: I8a2152d834966992f8d4bbe8e4b72f7d9c7c3da0

Former-commit-id: 58ada46176b737940d09fd843d95ee0ce8d8e063 [formerly 50d65fefcb9a8d46fc48369c84916c1e00bf1f9c] [formerly 9fa924aecb9b093cccdf5213a35a5d40fd8d778d [formerly 1cf83fa5e226f551c5d4cad3b5fa9f97b3203733]]
Former-commit-id: 9fa924aecb9b093cccdf5213a35a5d40fd8d778d
Former-commit-id: c6752668e4e0c0ba11affa25b8c2c4babbb78494
---
 .../actions/ShowCreateFromScratchDialog.java  | 16 +++++++++++-----
 .../gfe/dialogs/CreateFromScratchDialog.java  | 19 +++++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowCreateFromScratchDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowCreateFromScratchDialog.java
index 56f999a2ca..454abd7345 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowCreateFromScratchDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowCreateFromScratchDialog.java
@@ -36,6 +36,7 @@ import com.raytheon.viz.gfe.dialogs.CreateFromScratchDialog;
  * ------------ ---------- ----------- --------------------------
  * 	Feb 27, 2008					Eric Babin Initial Creation
  * 04/18/08     #857       bphillip    Implemented interaction with server
+ * Oct 24, 2012 #1287      rferrel     Changes for non-blocking CreateFromScratchDialog.
  * 
  * </pre>
  * 
@@ -44,6 +45,7 @@ import com.raytheon.viz.gfe.dialogs.CreateFromScratchDialog;
  */
 
 public class ShowCreateFromScratchDialog extends AbstractHandler {
+    private CreateFromScratchDialog dialog;
 
     /*
      * (non-Javadoc)
@@ -54,12 +56,16 @@ public class ShowCreateFromScratchDialog extends AbstractHandler {
      */
     @Override
     public Object execute(ExecutionEvent arg0) throws ExecutionException {
-        Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getShell();
+        if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
+            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+                    .getShell();
 
-        CreateFromScratchDialog dialog = new CreateFromScratchDialog(shell);
-        dialog.setBlockOnOpen(true);
-        dialog.open();
+            dialog = new CreateFromScratchDialog(shell);
+            dialog.setBlockOnOpen(false);
+            dialog.open();
+        } else {
+            dialog.bringToTop();
+        }
 
         return null;
     }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java
index 151221aef4..6bb169e0b2 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java
@@ -46,6 +46,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 	Feb 26, 2008					Eric Babin Initial Creation
+ * Oct 24, 2012 1287       rferrel     Changes for non-blocking dialog.
  * 
  * </pre>
  * 
@@ -75,7 +76,7 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
 
     public CreateFromScratchDialog(Shell parent) {
         super(parent);
-        this.setShellStyle(SWT.TITLE | SWT.MODELESS | SWT.CLOSE);
+        this.setShellStyle(SWT.DIALOG_TRIM | SWT.MODELESS);
 
     }
 
@@ -130,8 +131,8 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
             intervalLabel = new Label(top, SWT.NONE);
             data = new GridData(30, SWT.DEFAULT);
             intervalLabel.setLayoutData(data);
-            intervalLabel.setText(Integer
-                    .toString(intervalScale.getSelection()));
+            intervalLabel
+                    .setText(Integer.toString(intervalScale.getSelection()));
 
         }
 
@@ -157,8 +158,8 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
             durationLabel = new Label(top, SWT.NONE);
             data = new GridData(30, SWT.DEFAULT);
             durationLabel.setLayoutData(data);
-            durationLabel.setText(Integer
-                    .toString(durationScale.getSelection()));
+            durationLabel
+                    .setText(Integer.toString(durationScale.getSelection()));
         }
     }
 
@@ -167,8 +168,8 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
 
         if (displayDuration) {
             durationScale.setSelection(intervalScale.getSelection());
-            durationLabel.setText(Integer
-                    .toString(durationScale.getSelection()));
+            durationLabel
+                    .setText(Integer.toString(durationScale.getSelection()));
         }
     }
 
@@ -272,7 +273,9 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
                 createDuration = durationScale.getSelection();
             }
 
-            DataManager.getCurrentInstance().getParmOp()
+            DataManager
+                    .getCurrentInstance()
+                    .getParmOp()
                     .createFromScratchSelected(mode, createInterval * 3600,
                             createDuration * 3600);