Add ability pass owner to display and focus method.

This should enable propery hierachies to be build in with/in
dialogs.

Change-Id: I5889941371ab2d83da79e809fd1493589a5fd91d
Fixes-Issue: CLIENT-431
Reviewed-on: http://gerrit.dmdirc.com/3146
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java

@@ -151,7 +151,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         final DurationEditor editor = new DurationEditor(window, duration);
-        editor.display(this);
+        editor.display(window);
         editor.addDurationListener(this);
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -316,7 +316,7 @@ public class NewServerDialog extends StandardDialog implements
         if (e.getSource() == getOkButton()) {
             save();
         } else if (e.getSource() == editProfileButton) {
-            profileDialogProvider.displayOrRequestFocus();
+            profileDialogProvider.displayOrRequestFocus(this);
         } else if (e.getSource() == getCancelButton()) {
             dispose();
         }

src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java

@@ -44,7 +44,7 @@ public class StandardDialog extends JDialog {
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Parent window. */
-    private final Window owner;
+    private Window owner;
     /** The OK button for this frame. */
     private JButton okButton;
     /** The cancel button for this frame. */
@@ -84,20 +84,23 @@ public class StandardDialog extends JDialog {
     }
 
     /**
-     * Displays the dialog centering on the parent window.
+     * Displays the dialog if it is not visible, otherwise requests focus.
      */
-    public void display() {
-        display(owner);
+    public void displayOrRequestFocus() {
+        displayOrRequestFocus(owner);
     }
 
     /**
-     * Displays the dialog if it is not visible, otherwise requests focus.
+     * Displays the dialog if it is not visible, otherwise requests focus.  The parent window will
+     * only be changed if the dialog has not been displayed.
+     *
+     * @param parent Parent window
      */
-    public void displayOrRequestFocus() {
+    public void displayOrRequestFocus(final Window parent) {
         if (isVisible()) {
             requestFocus();
         } else {
-            display();
+            display(parent);
         }
     }
 
@@ -106,7 +109,15 @@ public class StandardDialog extends JDialog {
      *
      * @param owner Window to center on
      */
-    public void display(final Component owner) {
+    public void display(final Window owner) {
+        this.owner = owner;
+        display();
+    }
+
+    /**
+     * Displays the dialog centering on the parent window.
+     */
+    public void display() {
         if (isVisible()) {
             return;
         }
@@ -146,7 +157,7 @@ public class StandardDialog extends JDialog {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                display(owner);
+                display();
                 addWindowListener(new WindowAdapter() {
                     @Override
                     public void windowClosed(final WindowEvent e) {
@@ -174,7 +185,7 @@ public class StandardDialog extends JDialog {
      *
      * @return Parent window or null
      */
-    public Window getParentWindow() {
+    public Component getParentWindow() {
         return owner;
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -183,7 +183,7 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
                         public void cancelled() {
                             //Ignore
                         }
-                    }.display(getOwner());
+                    }.display();
         } else {
             closeAndSave();
         }

src/com/dmdirc/addons/ui_swing/injection/DialogProvider.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.injection;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
+import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
@@ -90,6 +91,24 @@ public class DialogProvider<T extends StandardDialog> {
         get().displayOrRequestFocus();
     }
 
+    /**
+     * Ensures the dialog is visible to the user.
+     *
+     * <p>The parent will only change if the dialog has not been made visible to the user.
+     *
+     * <p>If no dialog currently exists, a new one will be created and displayed to the user. If a
+     * dialog existed prior to this method being invoked, it will request focus to bring it to the
+     * user's attention.
+     *
+     * <p>This method <em>must</em> be called on the Event Despatch Thread.
+     *
+     * @param parent Parent window for the dialog
+     */
+    public void displayOrRequestFocus(final Window parent) {
+        checkOnEDT();
+        get().displayOrRequestFocus(parent);
+    }
+
     /**
      * Listens to window closing events to remove the cached instance of the dialog.
      */