Fixes issue 934: Migration Wizard and First Run Wizard

git-svn-id: http://svn.dmdirc.com/trunk@3563 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/swing/SwingController.java

@@ -84,7 +84,7 @@ public final class SwingController implements UIController {
     public synchronized MainFrame getMainWindow() {
         return getMainFrame();
     }
-    
+
     /**
      * Retrieves the main window used by this UI.
      *
@@ -192,22 +192,27 @@ public final class SwingController implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                wizard = new SwingFirstRunWizard(firstRun);
-                wizard.display();
-                wizard.getWizardDialog().addWizardListener(new WizardListener() {
+                final WizardListener listener = new WizardListener() {
 
+                    /** {@inheritDoc} */
+                    @Override
                     public void wizardFinished() {
                         synchronized (SwingController.this) {
                             SwingController.this.notifyAll();
                         }
                     }
 
+                    /** {@inheritDoc} */
+                    @Override
                     public void wizardCancelled() {
                         synchronized (SwingController.this) {
                             SwingController.this.notifyAll();
                         }
                     }
-                });
+                };
+                wizard = new SwingFirstRunWizard(firstRun);
+                wizard.getWizardDialog().addWizardListener(listener);
+                wizard.display();
             }
             });
         try {
@@ -371,7 +376,7 @@ public final class SwingController implements UIController {
             }
         });
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public String getUserInput(final String prompt) {

src/com/dmdirc/ui/swing/components/SwingInputField.java

@@ -31,9 +31,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyListener;
 
-import java.util.Map;
-import javax.swing.ActionMap;
-import javax.swing.InputMap;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
@@ -58,10 +55,6 @@ public class SwingInputField extends JTextComponent implements InputField,
     private JTextField textField;
     /** Line wrap indicator. */
     private JLabel wrapIndicator;
-    /** Action maps. */
-    private Map<Integer, ActionMap> actionsMaps;
-    /** Input maps. */
-    private Map<Integer, InputMap> inputMaps;
 
     /**
      * Instantiates a new swing input field.
@@ -211,6 +204,7 @@ public class SwingInputField extends JTextComponent implements InputField,
      * 
      * @param clipboard Text to replace selection with
      */
+    @Override
     public void replaceSelection(String clipboard) {
         textField.replaceSelection(clipboard);
     }
@@ -220,6 +214,7 @@ public class SwingInputField extends JTextComponent implements InputField,
      * 
      * @param optionColour Colour for the caret
      */
+    @Override
     public void setCaretColor(Color optionColour) {
         textField.setCaretColor(optionColour);
     }
@@ -241,6 +236,7 @@ public class SwingInputField extends JTextComponent implements InputField,
      */
     @Override
     public void setBackground(Color optionColour) {
+        System.out.println(textField);
         textField.setBackground(optionColour);
     }
 

src/com/dmdirc/ui/swing/dialogs/wizard/WizardDialog.java

@@ -134,7 +134,7 @@ public final class WizardDialog extends StandardDialog implements ActionListener
      * @param step Step to add
      */
     public void addStep(final Step step) {
-        wizard.add(step);
+        wizard.addStep(step);
     }
     
     /**

src/com/dmdirc/ui/swing/dialogs/wizard/WizardPanel.java

@@ -124,7 +124,8 @@ public class WizardPanel extends JPanel implements ActionListener,
         titlePanel.setBackground(Color.WHITE);
         titlePanel.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0,
                 Color.BLACK));
-        titlePanel.setBorder(new EtchedLineBorder(EtchedBorder.LOWERED, BorderSide.BOTTOM));
+        titlePanel.setBorder(new EtchedLineBorder(EtchedBorder.LOWERED,
+                BorderSide.BOTTOM));
 
         final JPanel progressPanel = new JPanel(new MigLayout("fill"));
         progressPanel.add(progressLabel, "growx");
@@ -132,7 +133,8 @@ public class WizardPanel extends JPanel implements ActionListener,
         progressPanel.add(next, "sg button");
         progressPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
                 Color.BLACK));
-        progressPanel.setBorder(new EtchedLineBorder(EtchedBorder.LOWERED, BorderSide.TOP));
+        progressPanel.setBorder(new EtchedLineBorder(EtchedBorder.LOWERED,
+                BorderSide.TOP));
 
         setLayout(new MigLayout("fill, wrap 1, ins 0"));
         add(titlePanel, "growx");
@@ -258,7 +260,9 @@ public class WizardPanel extends JPanel implements ActionListener,
      * @param listener
      */
     public void addStepListener(final StepListener listener) {
-        stepListeners.add(StepListener.class, listener);
+        synchronized (stepListeners) {
+            stepListeners.add(StepListener.class, listener);
+        }
     }
 
     /**
@@ -267,7 +271,9 @@ public class WizardPanel extends JPanel implements ActionListener,
      * @param listener
      */
     public void removeStepListener(final StepListener listener) {
-        stepListeners.remove(StepListener.class, listener);
+        synchronized (stepListeners) {
+            stepListeners.remove(StepListener.class, listener);
+        }
     }
 
     /**
@@ -276,7 +282,9 @@ public class WizardPanel extends JPanel implements ActionListener,
      * @param listener
      */
     public void addWizardListener(final WizardListener listener) {
-        stepListeners.add(WizardListener.class, listener);
+        synchronized (stepListeners) {
+            stepListeners.add(WizardListener.class, listener);
+        }
     }
 
     /**
@@ -285,7 +293,9 @@ public class WizardPanel extends JPanel implements ActionListener,
      * @param listener
      */
     public void removeWizardListener(final WizardListener listener) {
-        stepListeners.remove(WizardListener.class, listener);
+        synchronized (stepListeners) {
+            stepListeners.remove(WizardListener.class, listener);
+        }
     }
 
     /**
@@ -294,10 +304,12 @@ public class WizardPanel extends JPanel implements ActionListener,
      * @param step Step to be displayed
      */
     private void fireStepAboutToBeDisplayed(final Step step) {
-        List<StepListener> listeners =
-                stepListeners.get(StepListener.class);
-        for (StepListener listener : listeners) {
-            listener.stepAboutToDisplay(step);
+        synchronized (stepListeners) {
+            List<StepListener> listeners =
+                    stepListeners.get(StepListener.class);
+            for (StepListener listener : listeners) {
+                listener.stepAboutToDisplay(step);
+            }
         }
     }
 
@@ -307,10 +319,12 @@ public class WizardPanel extends JPanel implements ActionListener,
      * @param step step thats been hidden
      */
     private void fireStepHidden(final Step step) {
-        List<StepListener> listeners =
-                stepListeners.get(StepListener.class);
-        for (StepListener listener : listeners) {
-            listener.stepHidden(step);
+        synchronized (stepListeners) {
+            List<StepListener> listeners =
+                    stepListeners.get(StepListener.class);
+            for (StepListener listener : listeners) {
+                listener.stepHidden(step);
+            }
         }
     }
 
@@ -318,10 +332,13 @@ public class WizardPanel extends JPanel implements ActionListener,
      * Fires wizard finished events.
      */
     private void fireWizardFinished() {
-        List<WizardListener> listeners =
-                stepListeners.get(WizardListener.class);
-        for (WizardListener listener : listeners) {
-            listener.wizardFinished();
+        synchronized (stepListeners) {
+            List<WizardListener> listeners =
+                    stepListeners.get(WizardListener.class);
+            for (WizardListener listener : listeners) {
+                System.out.println("finished: " + listener);
+                listener.wizardFinished();
+            }
         }
     }
 
@@ -329,10 +346,13 @@ public class WizardPanel extends JPanel implements ActionListener,
      * Fires wizard cancelled events.
      */
     protected void fireWizardCancelled() {
-        List<WizardListener> listeners =
-                stepListeners.get(WizardListener.class);
-        for (WizardListener listener : listeners) {
-            listener.wizardCancelled();
+        synchronized (stepListeners) {
+            List<WizardListener> listeners =
+                    stepListeners.get(WizardListener.class);
+            for (WizardListener listener : listeners) {
+                System.out.println("cancelled: " + listener);
+                listener.wizardCancelled();
+            }
         }
     }
 }

src/com/dmdirc/ui/swing/dialogs/wizard/firstrun/SwingFirstRunWizard.java

@@ -36,7 +36,6 @@ import com.dmdirc.util.resourcemanager.ResourceManager;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -61,6 +60,11 @@ public final class SwingFirstRunWizard implements WizardListener,
      */
     public SwingFirstRunWizard(final boolean firstRun) {
         this.firstRun = firstRun;
+        
+        wizardDialog =
+                new WizardDialog(firstRun ? "Setup wizard" : "Migration wizard",
+                new ArrayList<Step>(), this, null);
+        wizardDialog.addWizardListener(this);
     }
 
     /** {@inheritDoc} */
@@ -186,21 +190,13 @@ public final class SwingFirstRunWizard implements WizardListener,
     /** {@inheritDoc} */
     @Override
     public void display() {
-        final List<Step> steps =
-                new ArrayList<Step>();
-
         if (firstRun) {
-            steps.add(new FirstRunExtractionStep());
-            steps.add(new CommunicationStep());
-            steps.add(new ProfileStep());
+            wizardDialog.addStep(new FirstRunExtractionStep());
+            wizardDialog.addStep(new CommunicationStep());
+            wizardDialog.addStep(new ProfileStep());
         } else {
-            steps.add(new MigrationExtrationStep());
+            wizardDialog.addStep(new MigrationExtrationStep());
         }
-        
-        wizardDialog =
-                new WizardDialog(firstRun ? "Setup wizard" : "Migration wizard",
-                steps, this, null);
-        wizardDialog.addWizardListener(this);
         wizardDialog.display();
     }