From b0dd9d2d6b50e16e14ae31217859ead6a7097183 Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Mon, 22 Oct 2012 14:07:18 -0500
Subject: [PATCH] Issue #1229 Changes for non-blocking CaveSWTWizardDlg.

Change-Id: I2ce93910b6605e5527c321f594bd0a03b13f321d

Former-commit-id: 9a5a87635a4910ecef5260c5bf43b0fc93de4b8c [formerly ae3fb5eef5e5711819238e719800249ae3730ea4] [formerly 9a5a87635a4910ecef5260c5bf43b0fc93de4b8c [formerly ae3fb5eef5e5711819238e719800249ae3730ea4] [formerly 314af882c6d65662077a35d90349e01db4c1051c [formerly 30b387dc4c5392263ba3e82bca1db64099684ecf]]]
Former-commit-id: 314af882c6d65662077a35d90349e01db4c1051c
Former-commit-id: d7fe430a7e13d073dcfa09a976c519f7e0cb4f53 [formerly 39b1fcbb018b11202f87898fbc64bd8729d2abf4]
Former-commit-id: 729a2b227cc8dc0c1c59d6f61787575452d584cb
---
 .../ui/actions/NewDerivedParameterAction.java        | 12 +++++++++---
 .../raytheon/viz/ui/dialogs/CaveSWTWizardDlg.java    |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/actions/NewDerivedParameterAction.java b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/actions/NewDerivedParameterAction.java
index ccaf452309..22a1b35503 100644
--- a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/actions/NewDerivedParameterAction.java
+++ b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/actions/NewDerivedParameterAction.java
@@ -36,6 +36,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTWizardDlg;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 14, 2010            mschenke     Initial creation
+ * Oct 22, 2012 1229       rferrel     Changes for non-blocking CaveSWTWizardDlg.
  * 
  * </pre>
  * 
@@ -44,6 +45,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTWizardDlg;
  */
 
 public class NewDerivedParameterAction extends Action {
+    private CaveSWTWizardDlg dialog;
 
     /**
      * 
@@ -55,9 +57,13 @@ public class NewDerivedParameterAction extends Action {
     @Override
     public void run() {
         DerivedParamWizard wizard = new DerivedParamWizard();
-        CaveSWTWizardDlg dialog = new CaveSWTWizardDlg(VizWorkbenchManager
-                .getInstance().getCurrentWindow().getShell(), wizard);
-        dialog.open();
+        if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
+            dialog = new CaveSWTWizardDlg(VizWorkbenchManager.getInstance()
+                    .getCurrentWindow().getShell(), wizard);
+            dialog.open();
+        } else {
+            dialog.bringToTop();
+        }
     }
 
 }
diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/CaveSWTWizardDlg.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/CaveSWTWizardDlg.java
index 790c557d9a..2001961a46 100644
--- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/CaveSWTWizardDlg.java
+++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/CaveSWTWizardDlg.java
@@ -46,6 +46,7 @@ import org.eclipse.swt.widgets.Shell;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 19, 2010            lvenable     Initial creation
+ * Oct 22, 2012 1229       rferrel     Dialog changed to non-blocking.
  * 
  * </pre>
  * 
@@ -75,7 +76,7 @@ public class CaveSWTWizardDlg extends CaveSWTDialog {
     private ArrayList<Composite> pageCompArray;
 
     public CaveSWTWizardDlg(Shell parent, CaveSWTWizard swtWizzard) {
-        super(parent, SWT.APPLICATION_MODAL | SWT.MIN);
+        super(parent, SWT.APPLICATION_MODAL | SWT.MIN, CAVE.DO_NOT_BLOCK);
         this.swtWizzard = swtWizzard;
         if (swtWizzard.getTitle() != null) {
             setText(swtWizzard.getTitle());