First run wizard is now application modal.

Fixes issue 3941

Change-Id: I24555abe550ab6ea477560deb9c19477f4ba37d3
Reviewed-on: http://gerrit.dmdirc.com/1091
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -269,21 +269,23 @@ public final class SwingController extends Plugin implements Serializable,
     /** {@inheritDoc} */
     @Override
     public void showFirstRunWizard() {
-        showFirstRunWizard(true);
+        showFirstRunWizard(me, true);
     }
 
     /** {@inheritDoc} */
     @Override
     public void showMigrationWizard() {
-        showFirstRunWizard(false);
+        showFirstRunWizard(me, false);
     }
 
     /**
      * Shows a first run wizard, or a migration wizard.
      *
+     * @param parentWindow Parent window
      * @param firstRun First run?
      */
-    private synchronized void showFirstRunWizard(final boolean firstRun) {
+    private synchronized void showFirstRunWizard(
+            final java.awt.Window parentWindow, final boolean firstRun) {
         final Semaphore semaphore = new Semaphore(0);
         UIUtilities.invokeLater(new Runnable() {
 
@@ -305,7 +307,7 @@ public final class SwingController extends Plugin implements Serializable,
                     }
                 };
                 final SwingFirstRunWizard wizard =
-                        new SwingFirstRunWizard(firstRun);
+                        new SwingFirstRunWizard(parentWindow, firstRun);
                 wizard.getWizardDialog().addWizardListener(listener);
                 wizard.display();
             }

src/com/dmdirc/addons/ui_swing/wizard/WizardDialog.java

@@ -57,10 +57,12 @@ public final class WizardDialog extends StandardDialog implements ActionListener
      * @param steps Steps for the wizard
      * @param wizard Wizard to inform of changes
      * @param parentWindow Parent component
+     * @param modality Modality
      */
     public WizardDialog(final String title, final List<Step> steps,
-            final WizardListener wizard, final Window parentWindow) {
-        super(parentWindow, ModalityType.MODELESS);
+            final WizardListener wizard, final Window parentWindow,
+            final ModalityType modality) {
+        super(parentWindow, modality);
 
         setTitle(title);
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);

src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -39,8 +39,10 @@ import com.dmdirc.addons.ui_swing.wizard.WizardDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.resourcemanager.ResourceManager;
+import java.awt.Dialog.ModalityType;
 
 import java.awt.Dimension;
+import java.awt.Window;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -56,22 +58,27 @@ public final class SwingFirstRunWizard implements WizardListener,
     /** First run or update. */
     private boolean firstRun = true;
 
-    /** Instatiate the wizard. */
-    public SwingFirstRunWizard() {
-        this(true);
+    /**
+     * Instatiate the wizard.
+     *
+     * @param parentWindow Parent window
+     */
+    public SwingFirstRunWizard(final Window parentWindow) {
+        this(parentWindow, true);
     }
 
     /**
      * Instantiate the wizard.
      *
+     * @param parentWindow Parent window
      * @param firstRun is this the first run or an update?
      */
-    public SwingFirstRunWizard(final boolean firstRun) {
+    public SwingFirstRunWizard(final Window parentWindow, final boolean firstRun) {
         this.firstRun = firstRun;
         
-        wizardDialog =
-                new WizardDialog("DMDirc: " + (firstRun ? "Setup wizard" :
-                    "Migration wizard"), new ArrayList<Step>(), this, null);
+        wizardDialog = new WizardDialog("DMDirc: " + (firstRun ? "Setup wizard" 
+                : "Migration wizard"), new ArrayList<Step>(), this, parentWindow,
+                ModalityType.APPLICATION_MODAL);
         wizardDialog.setIconImage(IconManager.getIconManager().getImage("icon"));
         wizardDialog.addWizardListener(this);
         if(Apple.isAppleUI()) {