Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development

Former-commit-id: e51783c2e1 [formerly 20548994dd] [formerly 0c936a3f8c] [formerly d935fff585 [formerly 0c936a3f8c [formerly f037a61c9fd0c0d85a7596b95cdd35072f7bafe0]]]
Former-commit-id: d935fff585
Former-commit-id: 22affce710d4ea47f88e06aa55fe36b47d206fda [formerly a78cdc9ee4]
Former-commit-id: 69888e4517

cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/CaveJFACEDialog.java

@@ -53,6 +53,8 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
  *                                       of removing the dialog blocking capability.
  * 09/20/12     1196        rferrel      Changes to setBlockOnOpen.
  * 09/27/12     1196        rferrel      Added bringToTop
+ * 11/13/12     1298        rferrel      Override open to work in a similar manner
+ *                                        to CaveSWTDialogBase's open.
  * 
  * </pre>
  * 
@@ -279,4 +281,19 @@ public class CaveJFACEDialog extends Dialog implements
         super.setBlockOnOpen(blockOnOpen);
         // blockedOnOpen = blockOnOpen;
     }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.window.Window#open()
+     */
+    @Override
+    public int open() {
+        if (isOpen()) {
+            bringToTop();
+            return getReturnCode();
+        }
+
+        return super.open();
+    }
 }