fix some unit tests, fix some other things i cant remember

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileDetailPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.IdentValidator;
 import com.dmdirc.config.prefs.validator.NicknameValidator;
@@ -31,7 +32,6 @@ import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 
 import java.awt.Dialog.ModalityType;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -79,19 +79,19 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
     private JButton delButton;
     /** Edit button. */
     private JButton editButton;
-    /** Parent window. */
-    private Window parentWindow;
+    /** Main frame. */
+    private MainFrame mainFrame;
 
     /**
      * Creates a new profile detail panel.
      * 
      * @param model The list model to use to validate names
-     * @param parentWindow Parent window
+     * @param mainFrame Main frame
      */
     public ProfileDetailPanel(final ProfileListModel model,
-            final Window parentWindow) {
+            final MainFrame mainFrame) {
         super();
-        this.parentWindow = parentWindow;
+        this.mainFrame = mainFrame;
 
         this.model = model;
 
@@ -230,7 +230,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addButton) {
-            new StandardInputDialog(ProfileManagerDialog.getProfileManagerDialog(parentWindow),
+            new StandardInputDialog(ProfileManagerDialog.getProfileManagerDialog(mainFrame),
                     ModalityType.DOCUMENT_MODAL, "New Nickname",
                     "Please enter the new nickname", new NicknameValidator()) {
 
@@ -256,7 +256,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
             }.display();
         } else if (e.getSource() == editButton) {
             final StandardInputDialog dialog = new StandardInputDialog(
-                    ProfileManagerDialog.getProfileManagerDialog(parentWindow),
+                    ProfileManagerDialog.getProfileManagerDialog(mainFrame),
                     ModalityType.DOCUMENT_MODAL, "Edit Nickname",
                     "Please enter the new nickname", new NicknameValidator()) {
 

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
@@ -31,7 +32,6 @@ import com.dmdirc.addons.ui_swing.components.renderers.ProfileListCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
 
 import java.awt.Dialog.ModalityType;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -77,17 +77,17 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
     private int selectedIndex;
     /** Deleted profiles. */
     private final List<Profile> deletedProfiles;
-    /** Parent window. */
-    private Window parentWindow;
+    /** main frame. */
+    private MainFrame mainFrame;
 
     /** 
      * Creates a new instance of ProfileEditorDialog. 
      * 
-     * @param parentWindow Parent window
+     * @param parentWindow main frame
      */
-    private ProfileManagerDialog(final Window parentWindow) {
-        super(parentWindow, ModalityType.MODELESS);
-        this.parentWindow = parentWindow;
+    private ProfileManagerDialog(final MainFrame mainFrame) {
+        super(mainFrame, ModalityType.MODELESS);
+        this.mainFrame = mainFrame;
         deletedProfiles = new ArrayList<Profile>();
 
         initComponents();
@@ -106,13 +106,13 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
     /** 
      * Creates the dialog if one doesn't exist, and displays it. 
      * 
-     * @param parentWindow Parent window
+     * @param mainFrame Main frame
      */
-    public static void showProfileManagerDialog(final Window parentWindow) {
-        me = getProfileManagerDialog(parentWindow);
+    public static void showProfileManagerDialog(final MainFrame mainFrame) {
+        me = getProfileManagerDialog(mainFrame);
 
         me.pack();
-        me.setLocationRelativeTo(parentWindow);
+        me.setLocationRelativeTo(mainFrame);
         me.setVisible(true);
         me.requestFocusInWindow();
     }
@@ -120,14 +120,14 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
     /**
      * Returns the current instance of the ProfileManagerDialog.
      * 
-     * @param parentWindow Parent window
+     * @param mainFrame Main frame
      *
      * @return The current ProfileManagerDialog instance
      */
-    public static ProfileManagerDialog getProfileManagerDialog(final Window parentWindow) {
+    public static ProfileManagerDialog getProfileManagerDialog(final MainFrame mainFrame) {
         synchronized (ProfileManagerDialog.class) {
             if (me == null) {
-                me = new ProfileManagerDialog(parentWindow);
+                me = new ProfileManagerDialog(mainFrame);
             }
         }
 
@@ -144,7 +144,7 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
 
         model = new ProfileListModel();
         profileList = new JList(model);
-        details = new ProfileDetailPanel(model, parentWindow);
+        details = new ProfileDetailPanel(model, mainFrame);
         addButton = new JButton("Add");
         deleteButton = new JButton("Delete");
         infoLabel =
@@ -217,7 +217,7 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
             dispose();
         }
         if (NewServerDialog.isNewServerDialogShowing()) {
-            NewServerDialog.getNewServerDialog(parentWindow).populateProfiles();
+            NewServerDialog.getNewServerDialog(mainFrame).populateProfiles();
         }
     }
 

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

@@ -26,6 +26,7 @@ import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -103,7 +104,7 @@ public final class SwingFirstRunWizard implements WizardListener,
                 @Override
                 public void processEvent(final ActionType type,
                         final StringBuffer format, final Object... arguments) {
-                    ProfileManagerDialog.showProfileManagerDialog(wizardDialog);
+                    ProfileManagerDialog.showProfileManagerDialog((MainFrame) Main.getUI().getMainWindow());
                 }
             }, CoreActionType.CLIENT_OPENED);
             

test/com/dmdirc/addons/ui_swing/MainFrameTest.java

@@ -63,7 +63,7 @@ public class MainFrameTest implements UITestIface {
     @Before
     public void setUp() {
         if (window == null) {
-            window = new FrameFixture(SwingController.getMainFrame());
+            window = new FrameFixture((MainFrame) Main.getUI().getMainWindow());
             window.show();
         }
     }

test/com/dmdirc/addons/ui_swing/components/frames/InputTextFrameTest.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.addons.ui_swing.components.*;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
@@ -147,11 +148,12 @@ public class InputTextFrameTest implements UITestIface {
     protected void setupWindow(final ConfigManager configManager) {
         UIUtilities.initUISettings();
 
-        mainframe = new FrameFixture(SwingController.getMainFrame());
+        mainframe = new FrameFixture((MainFrame) Main.getUI().getMainWindow());
         mainframe.robot.settings().eventMode(EventMode.AWT);
 
         final CustomInputFrame titf = new CustomInputFrame(owner,
-                GlobalCommandParser.getGlobalCommandParser());
+                GlobalCommandParser.getGlobalCommandParser(), 
+                (SwingController) Main.getUI());
 
         titf.setTitle("testing123");
 

test/com/dmdirc/harness/TestCommandParser.java

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 public class TestCommandParser extends CommandParser {
+    private static final long serialVersionUID = 7073002401375438532L;
 
     public String nonCommandLine;
 

test/com/dmdirc/harness/TestConfigManagerMap.java

@@ -27,6 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class TestConfigManagerMap extends ConfigManager {
+    private static final long serialVersionUID = 3604727894041756961L;
 
     public final Map<String, String> settings =
             new HashMap<String, String>();

test/com/dmdirc/harness/TestConfigManagerOptionToggle.java

@@ -25,6 +25,7 @@ package com.dmdirc.harness;
 import com.dmdirc.config.ConfigManager;
 
 public class TestConfigManagerOptionToggle extends ConfigManager {
+    private static final long serialVersionUID = 8078917248288638755L;
 
     public TestConfigManagerOptionToggle() {
         super(null, null, null);