From a0b2cdcf0cd535c3fe174a232c0931cca666ccc4 Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Fri, 12 Oct 2012 07:17:09 -0500
Subject: [PATCH] Issue #1229 Changes for non-blocking FindReplaceDlg.

Change-Id: I9bb97051cb15f84fde8540056a78f29420d2c665

Former-commit-id: eacd9d817c770624ed455cbb547a9492f33a6d38 [formerly 03b8991ec06849b90e1463c579ec9fa050f116a5] [formerly eacd9d817c770624ed455cbb547a9492f33a6d38 [formerly 03b8991ec06849b90e1463c579ec9fa050f116a5] [formerly bfbca13dc9df57c503095619a9403b5a18f98da7 [formerly 91a283a721f55dfe00f9bd0d2f57def122eb6be4]]]
Former-commit-id: bfbca13dc9df57c503095619a9403b5a18f98da7
Former-commit-id: f86ef0dec35d8340933e640cab346e2b52588b78 [formerly 71b1beece81cd97e7f828729d9e5ebdb747028b2]
Former-commit-id: 1d3257d7efcc2a75f618f2b92280bb9cacafa977
---
 .../viz/aviation/editor/TafViewerEditorDlg.java     | 13 ++++++++++---
 .../com/raytheon/viz/avnconfig/FindReplaceDlg.java  |  4 +++-
 .../raytheon/viz/avnconfig/TextEditorSetupDlg.java  | 11 +++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
index 441aa7edde..9c72edd381 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
@@ -219,6 +219,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * 09OCT2012    1229        rferrel     Changes for non-blocking QcDialog.
  * 09OCT2012    1229        rferrel     Changes for non-blocking SendDialog.
  * 11OCT2012    1229        rferrel     Converted to a subclass of CaveSWTDialog and
+ * 12OCT2012    1229        rferrel     Changes for non-blocking FindReplaceDlg.
  *                                       made non-blocking.
  * 
  * </pre>
@@ -450,6 +451,8 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
      */
     private boolean pythonModifiedTAF = false;
 
+    private FindReplaceDlg findDlg;
+
     /**
      * TAF editor enumeration
      */
@@ -1261,9 +1264,13 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
         findMI.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-                FindReplaceDlg findDlg = new FindReplaceDlg(shell,
-                        editorTafTabComp.getTextEditorControl());
-                findDlg.open();
+                if (mustCreate(findDlg)) {
+                    findDlg = new FindReplaceDlg(shell, editorTafTabComp
+                            .getTextEditorControl());
+                    findDlg.open();
+                } else {
+                    findDlg.bringToTop();
+                }
             }
         });
 
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/FindReplaceDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/FindReplaceDlg.java
index dd5fde579e..65fe30ad9e 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/FindReplaceDlg.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/FindReplaceDlg.java
@@ -46,6 +46,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * ------------ ---------- ----------- --------------------------
  * 28 FEB 2008  938        lvenable    Initial creation.
  * 6/19/2008    937        grichard    Implemented 'replace all'.
+ * 10/11/2012   1229       rferrel     Made dialog non-blocking.
  * 
  * </pre>
  * 
@@ -119,7 +120,8 @@ public class FindReplaceDlg extends CaveSWTDialog {
      *            Text editor containing the text to be searched.
      */
     public FindReplaceDlg(Shell parent, StyledText textEditor) {
-        super(parent, CAVE.PERSPECTIVE_INDEPENDENT);
+        super(parent, SWT.NONE, CAVE.PERSPECTIVE_INDEPENDENT
+                | CAVE.DO_NOT_BLOCK);
         setText("Find and Replace");
 
         this.textEditor = textEditor;
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java
index 962848b611..ccb21803f2 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java
@@ -75,6 +75,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  *  7 DEC 2010  7621       rferrel     Modified constructor to take a
  *                                     LocalizedFile and added preOpen() to
  *                                     open the LocalizedFile.
+ * 11 OCT 2012  1229       rferrel     Changes for non-blocking FindReplaceDlg.
  * 
  * </pre>
  * 
@@ -141,6 +142,8 @@ public class TextEditorSetupDlg extends CaveSWTDialog {
 
     private String template;
 
+    private FindReplaceDlg findDlg;
+
     /**
      * Constructor.
      * 
@@ -323,8 +326,12 @@ public class TextEditorSetupDlg extends CaveSWTDialog {
             @Override
             public void widgetSelected(SelectionEvent event) {
                 // Use the AvnFPS Find/Replace dialog
-                FindReplaceDlg findDlg = new FindReplaceDlg(shell, editorStTxt);
-                findDlg.open();
+                if (mustCreate(findDlg)) {
+                    findDlg = new FindReplaceDlg(shell, editorStTxt);
+                    findDlg.open();
+                } else {
+                    findDlg.bringToTop();
+                }
             }
         });