Mass singleton removal spree. Minor tidying in edited classes.

This tidying introduces a DialogManager class which ensures only a
single instance of a dialog can exist at any one time.  This will be
expanded in the future to support management of all dialogs.

Change-Id: I506d7dde623628e38fddcd5f81221d9f2cc832ca
Reviewed-on: http://gerrit.dmdirc.com/2246
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/activewindow/ActiveCommand.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;

src/com/dmdirc/addons/contactlist/ContactListCommand.java

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
-import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -68,7 +68,7 @@ public class PlaceholderContainer extends FrameContainer {
         if (dccs > 0) {
             new StandardQuestionDialog(((SwingController) PluginManager
                     .getPluginManager().getPluginInfoByName("ui_swing")
-                    .getPlugin()).getMainFrame(), ModalityType.MODELESS,
+                    .getPlugin()), ModalityType.MODELESS,
                     "Close confirmation",
                     "Closing this window will cause all existing DCCs "
                     + "to terminate, are you sure you want to do this?") {

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -61,10 +61,12 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
      * @param parent The {@link JPanel} to use for positioning
      */
     public ServerInfoDialog(final LagDisplayPlugin ldp, final StatusbarPanel parent) {
-        super(parent, ((SwingController) PluginManager.getPluginManager()
+        super(((SwingController) PluginManager.getPluginManager()
+                .getPluginInfoByName("ui_swing").getPlugin()), parent,
+                ((SwingController) PluginManager.getPluginManager()
                 .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame());
 
-        this.plugin = ldp;
+        plugin = ldp;
     }
 
     /** {@inheritDoc} */
@@ -80,7 +82,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
                 panel.add(new JSeparator(), "span, grow, wrap");
             }
 
-            for (Server server : servers) {
+            for (final Server server : servers) {
                 panel.add(new JLabel(server.getName()));
                 panel.add(new JLabel(server.getState() == ServerState.CONNECTED
                         ? server.getNetwork() : "---", JLabel.CENTER), "grow");

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -52,7 +52,7 @@ public class NickColourInputDialog extends StandardDialog
     /** Whether or not this is a new entry (as opposed to editing an old one). */
     private boolean isnew;
     /** The row we're editing, if this isn't a new entry. */
-    private int row;
+    private final int row;
     /** The NickColourPanel we're reporting to. */
     private final NickColourPanel panel;
     /** nickname textfield. */
@@ -78,7 +78,7 @@ public class NickColourInputDialog extends StandardDialog
             final String nickname, final String network,
             final String textcolour, final String nickcolour) {
         super(((SwingController) PluginManager.getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
+                .getPluginInfoByName("ui_swing").getPlugin()), false);
 
         this.panel = panel;
         this.row = row;
@@ -119,8 +119,10 @@ public class NickColourInputDialog extends StandardDialog
 
         nickname = new JTextField(defaultNickname);
         network = new JTextField(defaultNetwork);
-        textColour = new ColourChooser(defaultTextColour, true, true);
-        nicklistColour = new ColourChooser(defaultNickColour, true, true);
+        textColour = new ColourChooser(getController().getIconManager(),
+                defaultTextColour, true, true);
+        nicklistColour = new ColourChooser(getController().getIconManager(),
+                defaultNickColour, true, true);
     }
 
     /** Initialises the listeners. */

src/com/dmdirc/addons/serverlistdialog/AddEntryInputDialog.java

@@ -71,8 +71,6 @@ public class AddEntryInputDialog extends StandardDialog {
     private final JTree items;
     /** Parent model. */
     private final ServerListModel model;
-    /** Swing controller. */
-    private final SwingController controller;
 
     /**
      * Instantiates a new standard input dialog.
@@ -85,9 +83,8 @@ public class AddEntryInputDialog extends StandardDialog {
     public AddEntryInputDialog(final SwingController controller,
             final Window owner, final JTree items,
             final ServerListModel model) {
-        super(owner, ModalityType.MODELESS);
+        super(controller, owner, ModalityType.MODELESS);
 
-        this.controller = controller;
         this.items = items;
         this.model = model;
         this.entryValidator = new NotEmptyValidator();
@@ -123,8 +120,8 @@ public class AddEntryInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        entryName = new ValidatingJTextField(controller.getIconManager(), entryValidator);
-        uri = new ValidatingJTextField(controller.getIconManager(), new URIJTextField(), uriValidator);
+        entryName = new ValidatingJTextField(getIconManager(), entryValidator);
+        uri = new ValidatingJTextField(getIconManager(), new URIJTextField(), uriValidator);
         blurb = new TextLabel(message);
         validateText();
     }

src/com/dmdirc/addons/serverlistdialog/AddGroupInputDialog.java

@@ -68,8 +68,6 @@ public class AddGroupInputDialog extends StandardDialog {
     private final JTree tree;
     /** Parent model. */
     private final ServerListModel serverListModel;
-    /** Swing controller. */
-    private final SwingController controller;
 
     /**
      * Instantiates a new standard input dialog.
@@ -82,9 +80,8 @@ public class AddGroupInputDialog extends StandardDialog {
     public AddGroupInputDialog(final SwingController controller,
             final Window owner, final JTree items,
             final ServerListModel model) {
-        super(owner, ModalityType.MODELESS);
+        super(controller, owner, ModalityType.MODELESS);
 
-        this.controller = controller;
         this.tree = items;
         this.serverListModel = model;
         this.validator = new NotEmptyValidator();
@@ -132,7 +129,7 @@ public class AddGroupInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        groupName = new ValidatingJTextField(controller.getIconManager(), validator);
+        groupName = new ValidatingJTextField(getIconManager(), validator);
         networkName = new JTextField();
         blurb = new TextLabel(message);
         validateText();

src/com/dmdirc/addons/serverlistdialog/Perform.java

@@ -22,8 +22,9 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
-import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -37,11 +38,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class Perform extends JPanel implements ServerListListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Perform panel. */
     private final PerformPanel performPanel;
@@ -53,13 +50,14 @@ public class Perform extends JPanel implements ServerListListener {
     /**
      * Creates a new perform panel backed by the specified model.
      *
+     * @param controller Swing controller
      * @param model Backing model
      */
-    public Perform(final ServerListModel model) {
+    public Perform(final SwingController controller, final ServerListModel model) {
         super();
 
         this.model = model;
-        performPanel = new PerformPanel();
+        performPanel = new PerformPanel(controller);
 
         addListeners();
         if (model.getSelectedItemPerformDescription() != null) {

src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -80,7 +80,7 @@ public final class ServerListDialog extends StandardDialog implements
      */
     public ServerListDialog(final SwingController controller,
             final URLHandler urlHandler) {
-        super(controller.getMainFrame(), ModalityType.MODELESS);
+        super(controller, controller.getMainFrame(), ModalityType.MODELESS);
 
         setTitle("Server List");
         model = new ServerListModel();
@@ -102,7 +102,8 @@ public final class ServerListDialog extends StandardDialog implements
                 null)));
         profileLayer = new JXLayer<Profiles>(new Profiles(model, controller),
                 profileLock);
-        performLayer = new JXLayer<Perform>(new Perform(model), performLock);
+        performLayer = new JXLayer<Perform>(new Perform(controller, model),
+                performLock);
         settingsLayer = new JXLayer<Settings>(new Settings(controller, model),
                 settingsLock);
         infoLayer = new JXLayer<Info>(new Info(model, urlHandler), infoLock);

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

@@ -25,11 +25,11 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.commandparser.commands.global.NewServer;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -57,7 +57,8 @@ public final class Apple implements InvocationHandler, ActionListener {
     /**
      * Dummy interface for ApplicationEvent from the Apple UI on non-Apple
      * platforms.
-     * http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/ApplicationEvent.html
+     * http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/
+     * api/com/apple/eawt/ApplicationEvent.html
      */
     public interface ApplicationEvent {
 
@@ -98,53 +99,44 @@ public final class Apple implements InvocationHandler, ActionListener {
         String toString();
     }
 
-    /** The singleton instance of Apple. */
-    private static Apple me;
+    /** Store any addresses that are opened before CLIENT_OPENED. */
+    private final List<URI> addresses = new ArrayList<URI>();
+    /** Config manager used to read settings. */
+    private final ConfigManager configManager;
     /** The "Application" object used to do stuff on OS X. */
-    private static Object application;
+    private Object application;
     /** The "NSApplication" object used to do cocoa stuff on OS X. */
-    private static Object nsApplication;
+    private Object nsApplication;
     /** Are we listening? */
     private boolean isListener = false;
     /** The MenuBar for the application. */
     private MenuBar menuBar = null;
     /** Has the CLIENT_OPENED action been called? */
     private boolean clientOpened = false;
-    /** Store any addresses that are opened before CLIENT_OPENED. */
-    private final List<URI> addresses = new ArrayList<URI>();
-
-    /**
-     * Get the "Apple" instance.
-     *
-     * @return Apple instance.
-     */
-    public static Apple getApple() {
-        synchronized (Apple.class) {
-            if (me == null) {
-                me = new Apple();
-            }
-            return me;
-        }
-    }
 
     /**
      * Create the Apple class.
-     * <p>This attempts to:</p>
+     * <p>
+     * This attempts to:
+     * </p>
      *
      * <ul>
-     *  <li>load the JNI library</li>
-     *  <li>register the callback</li>
-     *  <li>register a CLIENT_OPENED listener</li>
+     * <li>load the JNI library</li>
+     * <li>register the callback</li>
+     * <li>register a CLIENT_OPENED listener</li>
      * </ul>
+     *
+     * @param configManager Config manager
      */
-    private Apple() {
+    public Apple(final ConfigManager configManager) {
+        this.configManager = configManager;
         if (isApple()) {
             try {
-                System.loadLibrary("DMDirc-Apple"); //NOPMD
+                System.loadLibrary("DMDirc-Apple"); // NOPMD
                 registerOpenURLCallback();
                 ActionManager.getActionManager().registerListener(this,
                         CoreActionType.CLIENT_OPENED);
-            } catch (UnsatisfiedLinkError ule) {
+            } catch (final UnsatisfiedLinkError ule) {
                 Logger.userError(ErrorLevel.MEDIUM,
                         "Unable to load JNI library.", ule);
             }
@@ -156,7 +148,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      *
      * @return Object that on OSX will be an "Application"
      */
-    public static Object getApplication() {
+    public Object getApplication() {
         synchronized (Apple.class) {
             if (isApple() && application == null) {
                 try {
@@ -165,17 +157,17 @@ public final class Apple implements InvocationHandler, ActionListener {
                     final Method method = app.getMethod("getApplication",
                             new Class[0]);
                     application = method.invoke(null, new Object[0]);
-                } catch (ClassNotFoundException ex) {
+                } catch (final ClassNotFoundException ex) {
                     application = null;
-                } catch (NoSuchMethodException ex) {
+                } catch (final NoSuchMethodException ex) {
                     application = null;
-                } catch (SecurityException ex) {
+                } catch (final SecurityException ex) {
                     application = null;
-                } catch (IllegalAccessException ex) {
+                } catch (final IllegalAccessException ex) {
                     application = null;
-                } catch (IllegalArgumentException ex) {
+                } catch (final IllegalArgumentException ex) {
                     application = null;
-                } catch (InvocationTargetException ex) {
+                } catch (final InvocationTargetException ex) {
                     application = null;
                 }
             }
@@ -188,26 +180,26 @@ public final class Apple implements InvocationHandler, ActionListener {
      *
      * @return Object that on OSX will be an "NSApplication"
      */
-    public static Object getNSApplication() {
+    public Object getNSApplication() {
         synchronized (Apple.class) {
-           if (isApple() && nsApplication == null) {
-               try {
+            if (isApple() && nsApplication == null) {
+                try {
                     final Class<?> app = Class.forName(
                             "com.apple.cocoa.application.NSApplication");
                     final Method method = app.getMethod("sharedApplication",
                             new Class[0]);
                     nsApplication = method.invoke(null, new Object[0]);
-               } catch (ClassNotFoundException ex) {
-                   nsApplication = null;
-               } catch (NoSuchMethodException ex) {
+                } catch (final ClassNotFoundException ex) {
                     nsApplication = null;
-                } catch (IllegalAccessException ex) {
+                } catch (final NoSuchMethodException ex) {
                     nsApplication = null;
-               } catch (InvocationTargetException ex) {
-                  nsApplication = null;
-               }
-          }
-         return nsApplication;
+                } catch (final IllegalAccessException ex) {
+                    nsApplication = null;
+                } catch (final InvocationTargetException ex) {
+                    nsApplication = null;
+                }
+            }
+            return nsApplication;
         }
     }
 
@@ -239,8 +231,8 @@ public final class Apple implements InvocationHandler, ActionListener {
         }
 
         // Set some Apple OS X related stuff from http://tinyurl.com/6xwuld
-        final String aaText = IdentityManager.getGlobalConfig().getOptionBool(
-                "ui", "antialias") ? "on" : "off";
+        final String aaText = configManager
+                .getOptionBool("ui", "antialias") ? "on" : "off";
 
         System.setProperty("apple.awt.antialiasing", aaText);
         System.setProperty("apple.awt.textantialiasing", aaText);
@@ -257,7 +249,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * Request user attention (Bounce the dock).
      *
      * @param isCritical If this is false, the dock icon only bounces once,
-     *                   otherwise it will bounce until clicked on.
+     *            otherwise it will bounce until clicked on.
      */
     public void requestUserAttention(final boolean isCritical) {
         if (!isApple()) {
@@ -266,18 +258,19 @@ public final class Apple implements InvocationHandler, ActionListener {
 
         try {
             final Field type = isCritical ? getNSApplication().getClass().
-                    getField("UserAttentionRequestCritical") : getNSApplication().
-                    getClass().getField("Informational");
+                    getField("UserAttentionRequestCritical")
+                    : getNSApplication().
+                            getClass().getField("Informational");
             final Method method = getNSApplication().getClass().getMethod(
-                    "requestUserAttention", new Class[]{Integer.TYPE});
-            method.invoke(getNSApplication(), new Object[]{type.get(null)});
-        } catch (NoSuchFieldException ex) {
+                    "requestUserAttention", new Class[] { Integer.TYPE });
+            method.invoke(getNSApplication(), new Object[] { type.get(null) });
+        } catch (final NoSuchFieldException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
-        } catch (NoSuchMethodException ex) {
+        } catch (final NoSuchMethodException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
-        } catch (IllegalAccessException ex) {
+        } catch (final IllegalAccessException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
-        } catch (InvocationTargetException ex) {
+        } catch (final InvocationTargetException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
         }
     }
@@ -293,33 +286,34 @@ public final class Apple implements InvocationHandler, ActionListener {
         }
 
         try {
-            final Class listenerClass = Class.forName(
+            final Class<?> listenerClass = Class.forName(
                     "com.apple.eawt.ApplicationListener");
             final Object listener = Proxy.newProxyInstance(getClass().
-                    getClassLoader(), new Class[]{listenerClass}, this);
+                    getClassLoader(), new Class[] { listenerClass }, this);
 
             Method method = getApplication().getClass().getMethod(
-                    "addApplicationListener", new Class[]{listenerClass});
+                    "addApplicationListener", new Class[] { listenerClass });
             method.invoke(getApplication(), listener);
 
             isListener = true;
 
             method = getApplication().getClass().getMethod(
-                    "setEnabledPreferencesMenu", new Class[]{Boolean.TYPE});
-            method.invoke(getApplication(), new Object[]{Boolean.TRUE});
+                    "setEnabledPreferencesMenu", new Class[] { Boolean.TYPE });
+            method.invoke(getApplication(), new Object[] { Boolean.TRUE });
 
             method =
-                    getApplication().getClass().getMethod("setEnabledAboutMenu",
-                    new Class[]{Boolean.TYPE});
-            method.invoke(getApplication(), new Object[]{Boolean.TRUE});
+                    getApplication().getClass().getMethod(
+                            "setEnabledAboutMenu",
+                            new Class[] { Boolean.TYPE });
+            method.invoke(getApplication(), new Object[] { Boolean.TRUE });
             return true;
-        } catch (ClassNotFoundException ex) {
+        } catch (final ClassNotFoundException ex) {
             return false;
-        } catch (NoSuchMethodException ex) {
+        } catch (final NoSuchMethodException ex) {
             return false;
-        } catch (IllegalAccessException ex) {
+        } catch (final IllegalAccessException ex) {
             return false;
-        } catch (InvocationTargetException ex) {
+        } catch (final InvocationTargetException ex) {
             return false;
         }
     }
@@ -338,21 +332,24 @@ public final class Apple implements InvocationHandler, ActionListener {
 
         try {
             final ApplicationEvent event = (ApplicationEvent) Proxy.
-                    newProxyInstance(getClass().getClassLoader(), new Class[]{
-                        ApplicationEvent.class}, new InvocationHandler() {
-
-                /** {@inheritDoc} */
-                @Override
-                public Object invoke(final Object p, final Method m,
-                        final Object[] a) throws Throwable {
-                    return args[0].getClass().getMethod(m.getName(), m.
-                            getParameterTypes()).invoke(args[0], a);
-                }
-            });
+                    newProxyInstance(getClass().getClassLoader(), new Class[] {
+                            ApplicationEvent.class }, new InvocationHandler() {
+
+                                /** {@inheritDoc} */
+                                @Override
+                                public Object invoke(final Object p,
+                                        final Method m,
+                                        final Object[] a) throws Throwable {
+                                    return args[0].getClass()
+                                            .getMethod(m.getName(), m.
+                                                    getParameterTypes())
+                                            .invoke(args[0], a);
+                                }
+                            });
             final Method thisMethod = this.getClass().getMethod(
-                    method.getName(), new Class[]{ApplicationEvent.class});
+                    method.getName(), new Class[] { ApplicationEvent.class });
             return thisMethod.invoke(this, event);
-        } catch (NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             if (method.getName().equals("equals") && args.length == 1) {
                 return Boolean.valueOf(proxy == args[0]);
             }
@@ -368,7 +365,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param newMenuBar MenuBar to use to send events to,
      */
     public void setMenuBar(final MenuBar newMenuBar) {
-        this.menuBar = newMenuBar;
+        menuBar = newMenuBar;
         if (!isAppleUI()) {
             return;
         }
@@ -439,7 +436,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handleOpenApplication(final ApplicationEvent event) {
-        //We don't currently support this
+        // We don't currently support this
     }
 
     /**
@@ -448,7 +445,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handleOpenFile(final ApplicationEvent event) {
-        //We don't currently support this
+        // We don't currently support this
     }
 
     /**
@@ -457,7 +454,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handlePrintFile(final ApplicationEvent event) {
-        //We don't currently support this
+        // We don't currently support this
     }
 
     /**
@@ -466,7 +463,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      * @param event an ApplicationEvent object
      */
     public void handleReopenApplication(final ApplicationEvent event) {
-        //We don't currently support this
+        // We don't currently support this
     }
 
     /** {@inheritDoc} */
@@ -476,7 +473,7 @@ public final class Apple implements InvocationHandler, ActionListener {
         if (type == CoreActionType.CLIENT_OPENED) {
             synchronized (addresses) {
                 clientOpened = true;
-                for (URI addr : addresses) {
+                for (final URI addr : addresses) {
                     ServerManager.getServerManager().connectToAddress(addr);
                 }
                 addresses.clear();
@@ -504,7 +501,7 @@ public final class Apple implements InvocationHandler, ActionListener {
                     // ContextClassLoader set, which causes an NPE in
                     // IconManager if no servers have been connected to yet.
                     if (Thread.currentThread().getContextClassLoader()
-                            == null) {
+                    == null) {
                         Thread.currentThread().setContextClassLoader(
                                 ClassLoader.getSystemClassLoader());
                     }
@@ -512,8 +509,8 @@ public final class Apple implements InvocationHandler, ActionListener {
                 } else {
                     addresses.add(addr);
                 }
-            } catch (URISyntaxException iae) {
-                //Do nothing
+            } catch (final URISyntaxException iae) {
+                // Do nothing
             }
         }
     }

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

@@ -46,9 +46,9 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
-import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;
@@ -334,28 +334,28 @@ public final class MainFrame extends JFrame implements WindowListener,
                 try {
                     mainFrameManager = (FrameManager) Class.forName(manager)
                             .getConstructor().newInstance();
-                } catch (InvocationTargetException ex) {
+                } catch (final InvocationTargetException ex) {
                     Logger.appError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
-                } catch (InstantiationException ex) {
+                } catch (final InstantiationException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
-                } catch (NoSuchMethodException ex) {
+                } catch (final NoSuchMethodException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
-                } catch (SecurityException ex) {
+                } catch (final SecurityException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
-                } catch (IllegalAccessException ex) {
+                } catch (final IllegalAccessException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
-                } catch (IllegalArgumentException ex) {
+                } catch (final IllegalArgumentException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
-                } catch (ClassNotFoundException ex) {
+                } catch (final ClassNotFoundException ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
-                } catch (LinkageError ex) {
+                } catch (final LinkageError ex) {
                     Logger.userError(ErrorLevel.MEDIUM, "Unable to load frame "
                             + "manager, falling back to default.", ex);
                 } finally {
@@ -384,7 +384,7 @@ public final class MainFrame extends JFrame implements WindowListener,
         mainSplitPane = initSplitPane();
 
         final MenuBar menu = new MenuBar(controller, this);
-        Apple.getApple().setMenuBar(menu);
+        controller.getApple().setMenuBar(menu);
         setJMenuBar(menu);
 
         setPreferredSize(new Dimension(800, 600));
@@ -492,14 +492,9 @@ public final class MainFrame extends JFrame implements WindowListener,
     public void quit(final int exitCode) {
         if (exitCode == 0 && controller.getGlobalConfig().getOptionBool(
                 "ui", "confirmQuit")) {
-            final StandardQuestionDialog dialog = new ConfirmQuitDialog(this) {
-
-                /**
-                 * A version number for this class. It should be changed
-                 * whenever the class structure is changed (or anything else
-                 * that would prevent serialized objects being unserialized
-                 * with the new class).
-                 */
+            final StandardQuestionDialog dialog = new ConfirmQuitDialog(controller) {
+
+                /** Serial version UID. */
                 private static final long serialVersionUID = 9;
 
                 /** {@inheritDoc} */
@@ -623,7 +618,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                     activeFrame.activateFrame();
                 }
 
-                for (SelectionListener listener : listeners.get(
+                for (final SelectionListener listener : listeners.get(
                         SelectionListener.class)) {
                     listener.selectionChanged(activeFrame);
                 }

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

@@ -199,7 +199,7 @@ public final class PrefsComponentFactory {
         option.setRenderer(new MapEntryRenderer());
         option.setEditable(false);
 
-        for (Map.Entry<String, String> entry : setting.getComboOptions()
+        for (final Map.Entry<String, String> entry : setting.getComboOptions()
                 .entrySet()) {
             if (entry.getKey().equals(setting.getValue())) {
                 option.setSelectedItem(entry);
@@ -211,11 +211,12 @@ public final class PrefsComponentFactory {
 
             /** {@inheritDoc} */
             @Override
+            @SuppressWarnings("unchecked")
             public void actionPerformed(final ActionEvent e) {
                 final Object selected = ((JComboBox) e.getSource())
                         .getSelectedItem();
                 if (selected != null) {
-                    setting.setValue((String) ((Map.Entry) selected).getKey());
+                    setting.setValue(((Map.Entry<String, String>) selected).getKey());
                 }
             }
         });
@@ -252,7 +253,7 @@ public final class PrefsComponentFactory {
                 option = new JSpinner(new SpinnerNumberModel());
                 option.setValue(Integer.parseInt(setting.getValue()));
             }
-        } catch (NumberFormatException ex) {
+        } catch (final NumberFormatException ex) {
             option = new JSpinner(new SpinnerNumberModel());
         }
 
@@ -283,8 +284,8 @@ public final class PrefsComponentFactory {
                 .getValue().substring(1 + setting.getValue().indexOf(':'));
 
         OptionalJSpinner option;
-        final Validator optionalValidator = setting.getValidator();
-        Validator numericalValidator = null;
+        final Validator<?> optionalValidator = setting.getValidator();
+        Validator<?> numericalValidator = null;
         if (optionalValidator instanceof OptionalValidator) {
             numericalValidator = ((OptionalValidator) setting.getValidator()).
                     getValidator();
@@ -305,7 +306,7 @@ public final class PrefsComponentFactory {
                         ((NumericalValidator) numericalValidator).getMax(),
                         1), state);
             }
-        } catch (NumberFormatException ex) {
+        } catch (final NumberFormatException ex) {
             option = new OptionalJSpinner(new SpinnerNumberModel(), state);
         }
 
@@ -334,9 +335,10 @@ public final class PrefsComponentFactory {
         DurationDisplay option;
 
         try {
-            option = new DurationDisplay(Integer.parseInt(setting.getValue()));
-        } catch (NumberFormatException ex) {
-            option = new DurationDisplay();
+            option = new DurationDisplay(controller, Integer.parseInt(
+                    setting.getValue()));
+        } catch (final NumberFormatException ex) {
+            option = new DurationDisplay(controller);
         }
 
         option.addDurationListener(new DurationListener() {
@@ -360,7 +362,7 @@ public final class PrefsComponentFactory {
     private JComponent getColourOption(
             final PreferencesSetting setting) {
         final OptionalColourChooser option = new OptionalColourChooser(
-                setting.getValue(), true, true, true);
+                controller.getIconManager(), setting.getValue(), true, true, true);
 
         option.addActionListener(new ActionListener() {
 
@@ -391,8 +393,8 @@ public final class PrefsComponentFactory {
         final String colour = setting.getValue() == null ? "0" : setting
                 .getValue().substring(1 + setting.getValue().indexOf(':'));
 
-        final OptionalColourChooser option = new OptionalColourChooser(colour,
-                state, true, true);
+        final OptionalColourChooser option = new OptionalColourChooser(
+                controller.getIconManager(), colour, state, true, true);
 
         option.addActionListener(new ActionListener() {
 

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

@@ -25,11 +25,17 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.addons.ui_swing.commands.*; //NOPMD
+import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
+import com.dmdirc.addons.ui_swing.commands.Input;
+import com.dmdirc.addons.ui_swing.commands.PopInCommand;
+import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
+import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
+import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardMessageDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
@@ -46,7 +52,6 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
@@ -81,7 +86,6 @@ import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.UnsupportedLookAndFeelException;
 
 import lombok.Getter;
-
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
@@ -89,14 +93,6 @@ import net.miginfocom.layout.PlatformDefaults;
  */
 @SuppressWarnings("PMD.UnusedPrivateField")
 public class SwingController extends BasePlugin implements UIController {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
     /** Window factory. */
     @Getter
     private final SwingWindowFactory windowFactory =
@@ -140,6 +136,12 @@ public class SwingController extends BasePlugin implements UIController {
     /** Prefs component factory instance. */
     @Getter
     private final PrefsComponentFactory prefsComponentFactory;
+    /** Dialog manager. */
+    @Getter
+    private final DialogManager dialogManager;
+    /** Apple handler, deals with Mac specific code. */
+    @Getter
+    private final Apple apple;
 
     /**
      * Instantiates a new SwingController.
@@ -151,11 +153,13 @@ public class SwingController extends BasePlugin implements UIController {
         super();
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;
+        apple = new Apple(getGlobalConfig());
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getGlobalConfigIdentity();
         addonIdentity = identityManager.getGlobalAddonIdentity();
         iconManager = new IconManager(globalConfig);
         prefsComponentFactory = new PrefsComponentFactory(this);
+        dialogManager = new DialogManager(this);
         setAntiAlias();
         windows = new ArrayList<java.awt.Window>();
         registerCommand(new ServerSettings(), ServerSettings.INFO);
@@ -226,9 +230,8 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                ChannelSettingsDialog.showChannelSettingsDialog(
-                        SwingController.this, channel, getMainFrame(),
-                        (InputWindow) getWindowFactory().getSwingWindow(channel));
+                showDialog(ChannelSettingsDialog.class, channel,
+                        getWindowFactory().getSwingWindow(channel));
             }
         });
     }
@@ -241,12 +244,27 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                ServerSettingsDialog.showServerSettingsDialog(
-                        SwingController.this, server, getMainFrame());
+                showDialog(ServerSettingsDialog.class,
+                        server, getWindowFactory().getSwingWindow(server));
             }
         });
     }
 
+    /**
+     * Proxy method to {@link DialogManager} that shows a dialog in the client.
+     * For more details on what parameters might be required see
+     * {@link DialogManager#getDialog(Class, Object...)}
+     *
+     * @see DialogManager#getDialog(Class, Object...) getDialog
+     *
+     * @param klass The class of the dialog to show
+     * @param params Any non standard parameters required
+     */
+    public <T extends StandardDialog> void showDialog(final Class<T> klass,
+            final Object... params) {
+        dialogManager.showDialog(klass, params);
+    }
+
     /**
      * Updates the look and feel to the current config setting.
      */
@@ -292,16 +310,16 @@ public class SwingController extends BasePlugin implements UIController {
                     getMainFrame().setExtendedState(state);
                 }
             });
-        } catch (ClassNotFoundException ex) {
+        } catch (final ClassNotFoundException ex) {
             Logger.userError(ErrorLevel.LOW,
                     "Unable to change Look and Feel: " + ex.getMessage());
-        } catch (InstantiationException ex) {
+        } catch (final InstantiationException ex) {
             Logger.userError(ErrorLevel.LOW,
                     "Unable to change Look and Feel: " + ex.getMessage());
-        } catch (IllegalAccessException ex) {
+        } catch (final IllegalAccessException ex) {
             Logger.userError(ErrorLevel.LOW,
                     "Unable to change Look and Feel: " + ex.getMessage());
-        } catch (UnsupportedLookAndFeelException ex) {
+        } catch (final UnsupportedLookAndFeelException ex) {
             Logger.userError(ErrorLevel.LOW,
                     "Unable to change Look and Feel: " + ex.getMessage());
         }
@@ -313,8 +331,6 @@ public class SwingController extends BasePlugin implements UIController {
     private void initUISettings() {
         // This will do nothing on non OS X Systems
         if (Apple.isApple()) {
-            final Apple apple = Apple.getApple();
-
             apple.setUISettings();
             apple.setListener();
         }
@@ -331,15 +347,15 @@ public class SwingController extends BasePlugin implements UIController {
             UIUtilities.initUISettings();
             UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(
                     getGlobalConfig().getOption("ui", "lookandfeel")));
-        } catch (UnsupportedOperationException ex) {
+        } catch (final UnsupportedOperationException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
-        } catch (UnsupportedLookAndFeelException ex) {
+        } catch (final UnsupportedLookAndFeelException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
-        } catch (IllegalAccessException ex) {
+        } catch (final IllegalAccessException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
-        } catch (InstantiationException ex) {
+        } catch (final InstantiationException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
-        } catch (ClassNotFoundException ex) {
+        } catch (final ClassNotFoundException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
         }
 
@@ -357,8 +373,7 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                URLDialog.showURLDialog(url, getMainFrame(), getURLHandler());
-
+                showDialog(URLDialog.class, url, getURLHandler());
             }
         });
     }
@@ -384,8 +399,8 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                new StandardMessageDialog(getMainFrame(), ModalityType.MODELESS,
-                        title, message).display();
+                new StandardMessageDialog(SwingController.this, getMainFrame(),
+                        ModalityType.MODELESS, title, message).display();
             }
         });
     }
@@ -444,7 +459,7 @@ public class SwingController extends BasePlugin implements UIController {
                 getMainFrame().setVisible(true);
                 mainFrameCreated.set(true);
                 swingStatusBar = getMainFrame().getStatusBar();
-                errorDialog = new ErrorListDialog(getMainFrame());
+                errorDialog = new ErrorListDialog(SwingController.this);
                 StatusBarManager.getStatusBarManager().registerStatusBar(
                         getSwingStatusBar());
             }
@@ -471,7 +486,7 @@ public class SwingController extends BasePlugin implements UIController {
         eventQueue.pop();
         KeyboardFocusManager.getCurrentKeyboardFocusManager().
                 removeKeyEventDispatcher(keyListener);
-        for (java.awt.Window window : getTopLevelWindows()) {
+        for (final java.awt.Window window : getTopLevelWindows()) {
             window.dispose();
         }
         super.onUnload();
@@ -492,7 +507,7 @@ public class SwingController extends BasePlugin implements UIController {
      * @return Swing prefs dialog
      */
     public SwingPreferencesDialog getPrefsDialog() {
-        return SwingPreferencesDialog.getSwingPreferencesDialog(this);
+        return getDialogManager().getDialog(SwingPreferencesDialog.class);
     }
 
     /** {@inheritDoc} */
@@ -530,7 +545,7 @@ public class SwingController extends BasePlugin implements UIController {
         final LookAndFeelInfo[] plaf = UIManager.getInstalledLookAndFeels();
 
         lafs.put("Native", "Native");
-        for (LookAndFeelInfo laf : plaf) {
+        for (final LookAndFeelInfo laf : plaf) {
             lafs.put(laf.getName(), laf.getName());
         }
 

src/com/dmdirc/addons/ui_swing/cinch/ConfirmAction.java

@@ -139,7 +139,7 @@ public @interface ConfirmAction {
                 /** {@inheritDoc} */
                 @Override
                 public void actionPerformed(final ActionEvent e) {
-                    new StandardQuestionDialog(
+                    new StandardQuestionDialog(null,
                             (Window) ((AbstractButton) actionObject)
                             .getTopLevelAncestor(), ModalityType.DOCUMENT_MODAL,
                             "Confirmaton", message) {

src/com/dmdirc/addons/ui_swing/cinch/InputAction.java

@@ -27,7 +27,6 @@ import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.Validator;
 
 import com.google.common.collect.ImmutableList;
-
 import com.palantir.ptoss.cinch.core.Bindable;
 import com.palantir.ptoss.cinch.core.BindableModel;
 import com.palantir.ptoss.cinch.core.Binding;
@@ -116,12 +115,12 @@ public @interface InputAction {
         @Override
         public Collection<Binding> wire(final BindingContext context) {
             final List<Field> actions = context.getAnnotatedFields(InputAction.class);
-            for (Field field : actions) {
+            for (final Field field : actions) {
                 final InputAction action = field.getAnnotation(InputAction.class);
                 try {
                     wire(action.call(), action.message(), action.content(),
                             action.validator(), field, context);
-                } catch (Exception e) {
+                } catch (final Exception e) {
                     Throwables.throwUncheckedException(e);
                     throw new BindingException("could not wire up "
                             + "@InputAction on " + field.getName(), e);
@@ -180,7 +179,7 @@ public @interface InputAction {
             final Validator<String> validatorInstance;
             final Constructor<?> ctor = validator.getConstructor(
                     BindableModel.class);
-            validatorInstance = (Validator) ctor.newInstance(
+            validatorInstance = (Validator<String>) ctor.newInstance(
                     context.getBindableModels().toArray()[0]);
             aalMethod.invoke(actionObject, new ActionListener() {
 
@@ -208,10 +207,10 @@ public @interface InputAction {
                                 ofm.getMethod().setAccessible(true);
                                 ofm.getMethod().invoke(ofm.getObject(), getText());
                                 ofm.getMethod().setAccessible(accessible);
-                            } catch (InvocationTargetException itex) {
+                            } catch (final InvocationTargetException itex) {
                                 LOGGER.error("exception during action firing",
                                         itex.getCause());
-                            } catch (Exception ex) {
+                            } catch (final Exception ex) {
                                 LOGGER.error("exception during action firing", ex);
                             }
                             return true;
@@ -232,7 +231,7 @@ public @interface InputAction {
                                             .invoke(existingMethod.getObject());
                                     existingMethod.getMethod()
                                             .setAccessible(accessible);
-                                } catch (Exception e) {
+                                } catch (final Exception e) {
                                     content = "";
                                 }
                             } else {

src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -28,9 +28,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -75,13 +73,12 @@ public class MDIBar extends JPanel implements SwingWindowListener,
         super();
 
         this.mainFrame = mainFrame;
-        this.config = IdentityManager.getGlobalConfig();
-        this.configDomain = controller.getDomain();
+        config = controller.getGlobalConfig();
+        configDomain = controller.getDomain();
         visibility = config.getOptionBool(configDomain, "mdiBarVisibility");
 
-        closeButton = new NoFocusButton(new IconManager(IdentityManager
-                .getGlobalConfig()).getScaledIcon("close-12", ICON_SIZE,
-                ICON_SIZE));
+        closeButton = new NoFocusButton(controller.getIconManager()
+                .getScaledIcon("close-12", ICON_SIZE,ICON_SIZE));
 
         setOpaque(false);
         setLayout(new MigLayout("hmax 17, ins 1 0 0 0, fill"));

src/com/dmdirc/addons/ui_swing/components/SearchValidator.java

@@ -29,12 +29,6 @@ import com.dmdirc.util.validators.Validator;
  */
 public class SearchValidator implements Validator<String> {
 
-    /**
-     * A version number for this class. It should be changed whenever the
-     * class structure is changed (or anything else that would prevent
-     * serialized objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
     /** Validates. */
     private boolean validates = true;
 

src/com/dmdirc/addons/ui_swing/components/SendWorker.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.util.io.Downloader;
 
 import java.io.IOException;
@@ -35,22 +34,22 @@ import java.util.Map;
 /**
  * Sends feedback worker thread.
  */
-public class SendWorker extends LoggingSwingWorker {
+public class SendWorker extends LoggingSwingWorker<Object, Void> {
 
     /** Parent feedback dialog. */
-    private FeedbackDialog dialog;
+    private final FeedbackDialog dialog;
     /** Name. */
-    private String name;
+    private final String name;
     /** Email. */
-    private String email;
+    private final String email;
     /** Feedback. */
-    private String feedback;
+    private final String feedback;
     /** Server name. */
-    private String serverInfo;
+    private final String serverInfo;
     /** DMDirc Info. */
-    private String dmdircInfo;
+    private final String dmdircInfo;
     /** Error/Success message. */
-    private StringBuilder error;
+    private final StringBuilder error;
 
     /**
      * Creates a new send worker to send feedback.
@@ -105,8 +104,8 @@ public class SendWorker extends LoggingSwingWorker {
         if (!feedback.isEmpty()) {
             postData.put("feedback", feedback);
         }
-        postData.put("version", IdentityManager.getGlobalConfig().getOption(
-                "version", "version"));
+        postData.put("version", dialog.getController().getGlobalConfig()
+                .getOption("version", "version"));
         if (!serverInfo.isEmpty()) {
             postData.put("serverInfo", serverInfo);
         }
@@ -131,15 +130,15 @@ public class SendWorker extends LoggingSwingWorker {
                     Downloader.getPage("http://www.dmdirc.com/feedback.php",
                     postData);
             if (response.size() >= 1) {
-                for (String responseLine : response) {
+                for (final String responseLine : response) {
                     error.append(responseLine).append("\n");
                 }
             } else {
                 error.append("Failure: Unknown response from the server.");
             }
-        } catch (MalformedURLException ex) {
+        } catch (final MalformedURLException ex) {
             error.append("Malformed feedback URL.");
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             error.append("Failure: ").append(ex.getMessage());
         }
     }

src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.SearchBar;
-import com.dmdirc.interfaces.ui.SearchBar.Direction;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCDocumentSearcher;
 import com.dmdirc.ui.messages.LinePosition;

src/com/dmdirc/addons/ui_swing/components/ToolTipPanel.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Color;
@@ -51,11 +50,7 @@ import org.jdesktop.jxlayer.plaf.LayerUI;
  */
 public class ToolTipPanel extends JPanel implements MouseListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the
-     * class structure is changed (or anything else that would prevent
-     * serialized objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = -8929794537312606692L;
     /** Default tool tip. */
     private final String defaultHelp;
@@ -71,15 +66,15 @@ public class ToolTipPanel extends JPanel implements MouseListener {
     /**
      * Instantiates a new tool tip panel.
      *
+     * @param iconManager Icon Manager
      * @param helpText Default help message when idle
      */
-    public ToolTipPanel(final String helpText) {
+    public ToolTipPanel(final IconManager iconManager, final String helpText) {
         super(new MigLayout("hidemode 3"));
 
         defaultHelp = helpText;
-        this.tooltips = new HashMap<JComponent, String>();
-        this.icon = new JLabel(new IconManager(IdentityManager
-                .getGlobalConfig()).getIcon("warning"));
+        tooltips = new HashMap<JComponent, String>();
+        icon = new JLabel(iconManager.getIcon("warning"));
 
         setBackground(Color.WHITE);
         setForeground(Color.BLACK);
@@ -241,7 +236,7 @@ public class ToolTipPanel extends JPanel implements MouseListener {
     @Override
     public void mouseEntered(final MouseEvent e) {
         if (e.getSource() instanceof JComponent) {
-            setText(tooltips.get((JComponent) e.getSource()));
+            setText(tooltips.get(e.getSource()));
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -28,10 +28,9 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.ReplacePasteAction;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
-import com.dmdirc.addons.ui_swing.components.inputfields.TextPaneInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
+import com.dmdirc.addons.ui_swing.components.inputfields.TextPaneInputField;
 import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
@@ -69,11 +68,7 @@ public class TopicBar extends JComponent implements ActionListener,
         ConfigChangeListener, HyperlinkListener, MouseListener,
         DocumentListener, TopicChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Topic text. */
     private final TextPaneInputField topicText;
@@ -106,9 +101,10 @@ public class TopicBar extends JComponent implements ActionListener,
             final ChannelFrame channelFrame) {
         super();
 
-        this.channel = (Channel) channelFrame.getContainer();
+        channel = (Channel) channelFrame.getContainer();
         controller = channelFrame.getController();
-        topicText = new TextPaneInputField(parentWindow);
+        topicText = new TextPaneInputField(channelFrame.getController(),
+                parentWindow);
         topicLengthMax = channel.getMaxTopicLength();
         errorIcon = new JLabel(channelFrame.getIconManager()
                 .getIcon("input-error"));
@@ -119,10 +115,10 @@ public class TopicBar extends JComponent implements ActionListener,
 
         topicText.getActionMap().put("paste-from-clipboard",
                 new ReplacePasteAction("(\r\n|\n|\r)", " "));
-        topicEdit = new ImageButton("edit",
+        topicEdit = new ImageButton<Object>("edit",
                 channelFrame.getIconManager().getIcon("edit-inactive"),
                 channelFrame.getContainer().getIconManager().getIcon("edit"));
-        topicCancel = new ImageButton("cancel",
+        topicCancel = new ImageButton<Object>("cancel",
                 channelFrame.getIconManager().getIcon("close"),
                 channelFrame.getIconManager().getIcon("close-active"));
 
@@ -184,17 +180,17 @@ public class TopicBar extends JComponent implements ActionListener,
         topicText.addHyperlinkListener(this);
         topicText.addMouseListener(this);
         topicText.getDocument().addDocumentListener(this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 "ui", "backgroundcolour", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 "ui", "foregroundcolour", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 "ui", "inputbackgroundcolour", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 "ui", "inputforegroundcolour", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 controller.getDomain(), "showfulltopic", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 controller.getDomain(), "hideEmptyTopicBar", this);
 
         topicText.setFocusable(false);

src/com/dmdirc/addons/ui_swing/components/URLProtocolPanel.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLSubsitutionsPanel;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.event.ActionEvent;
@@ -51,12 +51,14 @@ import net.miginfocom.swing.MigLayout;
 public class URLProtocolPanel extends JPanel implements ActionListener,
         DocumentListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
+    /** Swing controller. */
+    private final SwingController controller;
+    /** URL. */
+    private final URI uri;
+    /** Show insets? */
+    private final boolean useInsets;
     /** Show file chooser. */
     private JButton showFileChooser;
     /** Command text field. */
@@ -75,23 +77,22 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
     private JLabel subsLabel;
     /** example label. */
     private JLabel exampleLabel;
-    /** URL. */
-    private final URI uri;
-    /** Show insets? */
-    private final boolean useInsets;
     /** Substitutions panel. */
     private URLSubsitutionsPanel subsPanel;
 
     /**
      * Instantiates the URLDialog.
      *
+     * @param controller Swing controller
      * @param url URL to open once added
      * @param useInsets Show insets?
      */
-    public URLProtocolPanel(final URI url, final boolean useInsets) {
+    public URLProtocolPanel(final SwingController controller, final URI url,
+            final boolean useInsets) {
         super();
 
-        this.uri = url;
+        this.controller = controller;
+        uri = url;
         this.useInsets = useInsets;
 
         initComponents();
@@ -123,9 +124,11 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
         optionType.add(mail);
         optionType.add(custom);
 
-        subsPanel = new URLSubsitutionsPanel(Arrays.asList(new String[]{"url",
-            "fragment", "host", "path", "port", "query", "protocol", "username",
-            "password"
+        subsPanel = new URLSubsitutionsPanel(Arrays.asList(new String[] {
+                "url",
+                "fragment", "host", "path", "port", "query", "protocol",
+                "username",
+                "password"
         }));
         subsPanel.setVisible(custom.isSelected());
 
@@ -163,7 +166,7 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
 
     /** Saves the settings. */
     public void save() {
-        IdentityManager.getConfigIdentity().setOption("protocol",
+        controller.getGlobalIdentity().setOption("protocol",
                 uri.getScheme().toLowerCase(), getSelection());
     }
 
@@ -203,11 +206,11 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
      * Updates the selection.
      */
     public void updateSelection() {
-        if (uri != null && IdentityManager.getGlobalConfig().hasOptionString(
+        if (uri != null && controller.getGlobalConfig().hasOptionString(
                 "protocol", uri.getScheme())) {
             final String option =
-                    IdentityManager.getGlobalConfig().getOption("protocol",
-                    uri.getScheme());
+                    controller.getGlobalConfig().getOption("protocol",
+                            uri.getScheme());
 
             if ("DMDIRC".equals(option)) {
                 optionType.setSelected(dmdirc.getModel(), true);
@@ -250,7 +253,7 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
             fileChooser.addChoosableFileFilter(new ExecutableFileFilter());
             fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
             if (fileChooser.showDialog(this, "Select")
-                    == JFileChooser.APPROVE_OPTION) {
+                == JFileChooser.APPROVE_OPTION) {
                 commandPath.setText(fileChooser.getSelectedFile().toString());
             }
         } else {
@@ -285,6 +288,6 @@ public class URLProtocolPanel extends JPanel implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void changedUpdate(final DocumentEvent e) {
-        //Ignore
+        // Ignore
     }
 }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonFilter.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.components.addonbrowser;
 import javax.swing.ButtonModel;
 import javax.swing.JTextField;
 import javax.swing.RowFilter;
-import javax.swing.RowFilter.Entry;
 import javax.swing.table.DefaultTableModel;
 
 /**

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java

@@ -22,7 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
@@ -33,22 +34,60 @@ import java.util.Map;
 
 import javax.swing.ImageIcon;
 
+import lombok.Getter;
+
 /**
  * Describes an addon.
  */
+@SuppressWarnings("PMD.UnusedPrivateField")
 public class AddonInfo {
+    /** Addon site ID. */
+    @Getter
     private final int id;
+    /**
+     * Stable download name. This should be prepended with
+     * http://addons.dmdirc.com/addondownload/ to get a full URL.
+     */
+    @Getter
     private final String stableDownload;
+    /**
+     * Stable download name. This should be prepended with
+     * http://addons.dmdirc.com/addondownload/ to get a full URL.
+     */
+    @Getter
     private final String unstableDownload;
+    /**
+     * Stable download name. This should be prepended with
+     * http://addons.dmdirc.com/addondownload/ to get a full URL.
+     */
+    @Getter
     private final String nightlyDownload;
+    /** Addon title. */
+    @Getter
     private final String title;
+    /** Addon author and email. */
+    @Getter
     private final String author;
+    /** Addon rating from 0-10. */
+    @Getter
     private final int rating;
+    /** Full text description. */
+    @Getter
     private final String description;
+    /** Addon type, {@link ActionType}. */
+    @Getter
     private final AddonType type;
+    /** Has this addon been verified by the developers? */
+    @Getter
     private final boolean verified;
+    /** Date this addon was updated. */
+    @Getter
     private final int date;
+    /** Screenshot image. */
+    @Getter
     private final ImageIcon screenshot;
+    /** Current client update channel. */
+    @Getter
     private UpdateChannel channel;
 
     /**
@@ -56,152 +95,47 @@ public class AddonInfo {
      *
      * @param entry List of entries
      */
-    public AddonInfo(final Map<String, String> entry) {
-        this.id = Integer.parseInt(entry.get("id"));
-        this.title = entry.get("title");
-        this.author = entry.get("user");
-        this.rating = Integer.parseInt(entry.get("rating"));
-        this.type = entry.get("type").equals("plugin") ?
-            AddonType.TYPE_PLUGIN : entry.get("type").equals("theme") ?
-                AddonType.TYPE_THEME : AddonType.TYPE_ACTION_PACK;
-        this.stableDownload = entry.containsKey("stable") ? entry.get("stable") : "";
-        this.unstableDownload = entry.containsKey("unstable") ? entry.get("unstable") : "";
-        this.nightlyDownload = entry.containsKey("nightly") ? entry.get("nightly") : "";
-        this.description = entry.get("description");
-        this.verified = entry.get("verified").equals("yes");
-        this.date = Integer.parseInt(entry.get("date"));
+    public AddonInfo(final ConfigManager configManager,
+            final Map<String, String> entry) {
+        id = Integer.parseInt(entry.get("id"));
+        title = entry.get("title");
+        author = entry.get("user");
+        rating = Integer.parseInt(entry.get("rating"));
+        type = entry.get("type").equals("plugin") ?
+                AddonType.TYPE_PLUGIN : entry.get("type").equals("theme") ?
+                        AddonType.TYPE_THEME : AddonType.TYPE_ACTION_PACK;
+        stableDownload = entry.containsKey("stable") ? entry.get("stable") : "";
+        unstableDownload = entry.containsKey("unstable") ? entry
+                .get("unstable") : "";
+        nightlyDownload = entry.containsKey("nightly") ? entry.get("nightly")
+                : "";
+        description = entry.get("description");
+        verified = entry.get("verified").equals("yes");
+        date = Integer.parseInt(entry.get("date"));
         if (entry.get("screenshot").equals("yes")) {
-            this.screenshot = new ImageIcon(URLBuilder.buildURL(
+            screenshot = new ImageIcon(URLBuilder.buildURL(
                     "http://addons.dmdirc.com/addonimg/" + id));
-            this.screenshot.setImage(this.screenshot.getImage().
-                   getScaledInstance(150, 150, Image.SCALE_SMOOTH));
+            screenshot.setImage(screenshot.getImage().
+                    getScaledInstance(150, 150, Image.SCALE_SMOOTH));
         } else {
-            this.screenshot = new ImageIcon(URLBuilder.buildURL(
+            screenshot = new ImageIcon(URLBuilder.buildURL(
                     "dmdirc://com/dmdirc/res/logo.png"));
         }
         try {
-            channel = UpdateChannel.valueOf(IdentityManager.getGlobalConfig()
-                    .getOption("updater", "channel"));
-        } catch (IllegalArgumentException ex) {
+            channel = UpdateChannel.valueOf(configManager.getOption(
+                    "updater", "channel"));
+        } catch (final IllegalArgumentException ex) {
             channel = UpdateChannel.NONE;
         }
     }
 
-    /**
-     * Returns the addon author.
-     *
-     * @return Addon author
-     */
-    public String getAuthor() {
-        return author;
-    }
-
-    /**
-     * Returns the addon date.
-     *
-     * @return Addon date
-     */
-    public int getDate() {
-        return date;
-    }
-
-    /**
-     * Returns the addon description.
-     *
-     * @return Addon description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Returns the addon ID.
-     *
-     * @return Addon ID
-     */
-    public int getId() {
-        return id;
-    }
-
-    /**
-     * Returns the addon rating.
-     *
-     * @return Addon rating
-     */
-    public int getRating() {
-        return rating;
-    }
-
-    /**
-     * Returns the stable download location.
-     *
-     * @return Stable download location
-     */
-    public String getStableDownload() {
-        return stableDownload;
-    }
-
-    /**
-     * Returns the addon title.
-     *
-     * @return Addon title
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * Returns the addon type.
-     *
-     * @return Addon type
-     */
-    public AddonType getType() {
-        return type;
-    }
-
-    /**
-     * Returns the unstable download location.
-     *
-     * @return Unstable download location
-     */
-    public String getUnstableDownload() {
-        return unstableDownload;
-    }
-
-    /**
-     * Returns the nightly download location.
-     *
-     * @return Nightly download location
-     */
-    public String getNightlyDownload() {
-        return nightlyDownload;
-    }
-
-    /**
-     * Returns whether the addon is verified.
-     *
-     * @return true iff the addon is verified
-     */
-    public boolean isVerified() {
-        return verified;
-    }
-
-    /**
-     * Returns the screen shot for the addon.
-     *
-     * @return Addon screenshot
-     */
-    public ImageIcon getScreenshot() {
-        return screenshot;
-    }
-
     /**
      * Is the plugin installed?
      *
      * @return true iff installed
      */
     public boolean isInstalled() {
-        for (UpdateComponent comp : UpdateChecker.getComponents()) {
+        for (final UpdateComponent comp : UpdateChecker.getComponents()) {
             if (comp.getName().equals("addon-" + getId())) {
                 return true;
             }
@@ -226,19 +160,19 @@ public class AddonInfo {
      */
     @SuppressWarnings("fallthrough")
     public String getDownload() {
-        switch (channel) { //NOPMD
+        switch (channel) { // NOPMD
             case NONE:
-                //fallthrough
+                // fallthrough
             case NIGHTLY:
                 if (!nightlyDownload.isEmpty()) {
                     return nightlyDownload;
                 }
-                //fallthrough
+                // fallthrough
             case UNSTABLE:
                 if (!unstableDownload.isEmpty()) {
                     return unstableDownload;
                 }
-                //fallthrough
+                // fallthrough
             case STABLE:
                 if (!stableDownload.isEmpty()) {
                     return stableDownload;

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoCellRenderer.java

@@ -36,13 +36,6 @@ import javax.swing.table.TableCellRenderer;
  */
 public class AddonInfoCellRenderer implements TableCellRenderer {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
     /**
      * {@inheritDoc}
      *

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoLabel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Color;
@@ -50,17 +51,21 @@ public class AddonInfoLabel extends JPanel {
     private final AddonInfo addonInfo;
     /** Parent window. */
     private final BrowserWindow parentWindow;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new addon info label to describe the specified addon info.
      *
+     * @param controller Swing controller
      * @param addonInfo Addon to describe
      * @param parentWindow Parent window
      */
-    public AddonInfoLabel(final AddonInfo addonInfo,
-            final BrowserWindow parentWindow) {
+    public AddonInfoLabel(final SwingController controller,
+            final AddonInfo addonInfo, final BrowserWindow parentWindow) {
         super();
 
+        this.controller = controller;
         this.addonInfo = addonInfo;
         this.parentWindow = parentWindow;
 
@@ -90,7 +95,8 @@ public class AddonInfoLabel extends JPanel {
                 "wmax 100%-170, hmax 150, growy, wrap, pushy, gapleft 5");
 
         final JButton button = new JButton("Install");
-        button.addActionListener(new InstallListener(addonInfo, parentWindow));
+        button.addActionListener(new InstallListener(controller, addonInfo,
+                parentWindow));
         final boolean installed = addonInfo.isInstalled();
         add(button, "split, gapleft 5");
 

src/com/dmdirc/addons/ui_swing/components/addonbrowser/BrowserWindow.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
+import com.dmdirc.addons.ui_swing.SwingController;
+
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -83,14 +85,19 @@ public class BrowserWindow extends JDialog implements ActionListener {
     private final JRadioButton statusButton = new JRadioButton("Status", false);
     /** Row sorter. */
     private final AddonSorter sorter;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates and displays a new browser window.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window
      */
-    public BrowserWindow(final Window parentWindow) {
+    public BrowserWindow(final SwingController controller,
+            final Window parentWindow) {
         super(parentWindow, "DMDirc Addon Browser", ModalityType.MODELESS);
+        this.controller = controller;
         setIconImages(parentWindow.getIconImages());
         setResizable(false);
         setLayout(new MigLayout("fill, wmin 650, hmin 600"));
@@ -188,7 +195,7 @@ public class BrowserWindow extends JDialog implements ActionListener {
      * @param download Download new addon feed?
      */
     public final void loadData(final boolean download) {
-        new DataLoaderWorker(list, download, this, scrollPane)
+        new DataLoaderWorker(controller, list, download, this, scrollPane)
                 .executeInExecutor();
     }
 

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -67,19 +68,24 @@ public class DataLoaderWorker
     private final JProgressBar jpb = new JProgressBar(0, 100);
     /** Refresh addons feed? */
     private final boolean download;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new data loader worker.
      *
+     * @param controller Swing controller
      * @param table Table to load data into
      * @param download Download new addons feed?
      * @param browserWindow Browser window to pass to table objects
      * @param scrollPane Table's parent scrollpane
      */
-    public DataLoaderWorker(final AddonTable table, final boolean download,
+    public DataLoaderWorker(final SwingController controller,
+            final AddonTable table, final boolean download,
             final BrowserWindow browserWindow, final JScrollPane scrollPane) {
         super();
 
+        this.controller = controller;
         this.download = download;
         this.table = table;
         this.browserWindow = browserWindow;
@@ -104,7 +110,7 @@ public class DataLoaderWorker
                 Downloader.downloadPage("http://addons.dmdirc.com/feed",
                         Main.getConfigDir() + File.separator + "addons.feed",
                         this);
-            } catch (IOException ex) {
+            } catch (final IOException ex) {
                 loadingPanel.removeAll();
                 loadingPanel.add(new TextLabel("Unable to download feeds."));
                 return Collections.<AddonInfo>emptyList();
@@ -117,15 +123,15 @@ public class DataLoaderWorker
                 + File.separator + "addons.feed");
         try {
             data.read();
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             return Collections.<AddonInfo>emptyList();
-        } catch (InvalidConfigFileException ex) {
+        } catch (final InvalidConfigFileException ex) {
             return Collections.<AddonInfo>emptyList();
         }
 
         final List<AddonInfo> list = new ArrayList<AddonInfo>();
-        for (Map<String, String> entry : data.getKeyDomains().values()) {
-            list.add(new AddonInfo(entry));
+        for (final Map<String, String> entry : data.getKeyDomains().values()) {
+            list.add(new AddonInfo(controller.getGlobalConfig(), entry));
         }
         return list;
     }
@@ -140,9 +146,9 @@ public class DataLoaderWorker
         Collection<AddonInfo> data;
         try {
             data = get();
-        } catch (InterruptedException ex) {
+        } catch (final InterruptedException ex) {
             data = Collections.<AddonInfo>emptyList();
-        } catch (ExecutionException ex) {
+        } catch (final ExecutionException ex) {
             Logger.appError(ErrorLevel.MEDIUM, ex.getMessage(), ex);
             data = Collections.<AddonInfo>emptyList();
         }
@@ -153,9 +159,9 @@ public class DataLoaderWorker
             selectedRow = 0;
         }
         table.getModel().setRowCount(0);
-        for (AddonInfo info : data) {
+        for (final AddonInfo info : data) {
             table.getModel().addRow(new Object[]{
-                new AddonInfoLabel(info, browserWindow),
+                new AddonInfoLabel(controller, info, browserWindow),
             });
         }
         table.getSelectionModel().setSelectionInterval(selectedRow, selectedRow);

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallListener.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
+import com.dmdirc.addons.ui_swing.SwingController;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -34,17 +36,21 @@ public class InstallListener implements ActionListener {
     private final AddonInfo info;
     /** Parent window. */
     private final BrowserWindow parentWindow;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Instantiates a new install listener.
      *
+     * @param controller Swing controller
      * @param info Addoninfo to install
      * @param parentWindow Parent window
      */
-    public InstallListener(final AddonInfo info,
-            final BrowserWindow parentWindow) {
+    public InstallListener(final SwingController controller,
+            final AddonInfo info, final BrowserWindow parentWindow) {
         super();
 
+        this.controller = controller;
         this.info = info;
         this.parentWindow = parentWindow;
     }
@@ -56,8 +62,8 @@ public class InstallListener implements ActionListener {
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final InstallerWindow installer = new InstallerWindow(parentWindow,
-                info);
+        final InstallerWindow installer = new InstallerWindow(controller,
+                parentWindow, info);
         installer.display(parentWindow);
         new InstallWorker(info, installer).executeInExecutor();
     }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallerWindow.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
-import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -57,12 +57,13 @@ public class InstallerWindow extends StandardDialog implements ActionListener {
     /**
      * Instantiates a new installer window.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window
-     * @param info Assocaited addon info
+     * @param info Associated addon info
      */
-    public InstallerWindow(final BrowserWindow parentWindow,
-            final AddonInfo info) {
-        super(parentWindow, ModalityType.MODELESS);
+    public InstallerWindow(final SwingController controller,
+            final BrowserWindow parentWindow, final AddonInfo info) {
+        super(controller, parentWindow, ModalityType.MODELESS);
         this.info = info;
         this.parentWindow = parentWindow;
         setTitle("Installing addon...");

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.BrowserWindow;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.IconManager;
 
@@ -56,16 +55,12 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
 
     /** List of addons. */
     protected JTable addonList;
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Swing Controller. */
+    protected final SwingController controller;
+    /** Serial version UID. */
     private static final long serialVersionUID = 3;
     /** Parent Window. */
     private final Window parentWindow;
-    /** Swing Controller. */
-    private final SwingController controller;
     /** The icon manager used to retrieve icons. */
     private final IconManager iconManager;
     /** Addon list scroll pane. */
@@ -91,7 +86,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
 
         this.parentWindow = parentWindow;
         this.controller = controller;
-        this.iconManager = new IconManager(IdentityManager.getGlobalConfig());
+        iconManager = controller.getIconManager();
 
         initComponents();
         layoutComponents();
@@ -212,7 +207,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
     @Override
     public void hyperlinkUpdate(final HyperlinkEvent e) {
         if (e.getEventType() == EventType.ACTIVATED) {
-            new BrowserWindow(parentWindow);
+            new BrowserWindow(controller, parentWindow);
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

@@ -19,9 +19,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.Identity;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.Theme;
@@ -48,6 +49,8 @@ public final class AddonToggle {
     private boolean updateState;
     /** Listener list. */
     private final ListenerList listeners;
+    /** Identity to change update settings in. */
+    private final Identity identity;
 
     /**
      * Creates a new instance of AddonToggle to wrap the specified
@@ -56,11 +59,13 @@ public final class AddonToggle {
      * @param pi The PluginInfo to be wrapped can be null
      * @param theme The Theme to be wrapped can be null
      */
-    public AddonToggle(final PluginInfo pi, final Theme theme) {
+    public AddonToggle(final Identity identity, final PluginInfo pi,
+            final Theme theme) {
         if ((pi == null) == (theme == null)) {
             throw new IllegalArgumentException("You must wrap a plugin or "
                     + "a theme.");
         }
+        this.identity = identity;
         this.pi = pi;
         this.theme = theme;
         listeners = new ListenerList();
@@ -154,11 +159,11 @@ public final class AddonToggle {
                     PluginManager.getPluginManager().updateAutoLoad(pi);
                     if (getID() != -1) {
                         if (getUpdateState()) {
-                            IdentityManager.getConfigIdentity().unsetOption(
-                                    "updater", "enable-addon-" + getID());
+                            identity.unsetOption("updater", "enable-addon-"
+                                    + getID());
                         } else {
-                            IdentityManager.getConfigIdentity().setOption(
-                                   "updater", "enable-addon-" + getID(), false);
+                            identity.setOption("updater", "enable-addon-"
+                                    + getID(), false);
                         }
                     }
                 }

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -24,10 +24,10 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
@@ -74,11 +74,11 @@ public class PluginPanel extends AddonPanel implements ActionListener {
         final List<PluginInfo> sortedList = new ArrayList<PluginInfo>();
         list.addAll(PluginManager.getPluginManager().getPluginInfos());
         Collections.sort(list);
-        for (PluginInfo plugin : list) {
+        for (final PluginInfo plugin : list) {
             if (plugin.getMetaData().getParents().length == 0) {
                 final List<PluginInfo> childList = new ArrayList<PluginInfo>();
                 sortedList.add(plugin);
-                for (PluginInfo child : plugin.getChildren()) {
+                for (final PluginInfo child : plugin.getChildren()) {
                     childList.add(child);
                 }
                 Collections.sort(childList);
@@ -93,10 +93,11 @@ public class PluginPanel extends AddonPanel implements ActionListener {
             @Override
             public void run() {
                 ((DefaultTableModel) table.getModel()).setNumRows(0);
-                for (PluginInfo plugin : sortedList) {
+                for (final PluginInfo plugin : sortedList) {
                     ((DefaultTableModel) table.getModel()).addRow(
                             new AddonCell[]{ new AddonCell(new AddonToggle(
-                            plugin, null), getIconManager()), });
+                                    controller.getGlobalIdentity(), plugin,
+                                    null), getIconManager()), });
                 }
                 table.repaint();
             }

src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -72,10 +72,11 @@ public class ThemePanel extends AddonPanel {
             @Override
             public void run() {
                 ((DefaultTableModel) addonList.getModel()).setRowCount(0);
-                for (Theme theme : list) {
+                for (final Theme theme : list) {
                     ((DefaultTableModel) addonList.getModel()).addRow(
                     new AddonCell[]{ new AddonCell(new AddonToggle(
-                            null, theme), getIconManager()), });
+                            controller.getGlobalIdentity(), null, theme),
+                            getIconManager()), });
                 }
 
                 addonList.repaint();

src/com/dmdirc/addons/ui_swing/components/colours/ColourChooser.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -44,62 +45,68 @@ import net.miginfocom.swing.MigLayout;
  */
 public final class ColourChooser extends JPanel implements ActionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Edit button. */
-    private JButton editButton;
+    private final JButton editButton;
     /** Panel to show the colour preview. */
-    private JPanel previewPanel;
+    private final JPanel previewPanel;
+    /** Event listeners. */
+    private final EventListenerList listeners;
+    /** Icon manager. */
+    private final IconManager iconManager;
     /** Colours picking dialog. */
     private ColourPickerDialog cpd;
     /** show irc colours. */
-    private boolean showIRC;
+    private final boolean showIRC;
     /** show hex colours. */
-    private boolean showHex;
+    private final boolean showHex;
     /** The value of this component. */
     private String value;
-    /** Event listeners. */
-    private final EventListenerList listeners;
     /** Action command. */
     private String command;
     /** Parent window. */
     private Window window;
 
-    /** Creates a new instance of ColourChooser. */
-    public ColourChooser() {
-        this("ffffff", true, true);
+    /**
+     * Creates a new instance of ColourChooser.
+     *
+     * @param iconManager Icon manager
+     * */
+    public ColourChooser(final IconManager iconManager) {
+        this(iconManager, "ffffff", true, true);
     }
 
     /**
      * Creates a new instance of ColourChooser.
      *
+     * @param iconManager Icon Manager
      * @param window Parent window
      *
      * @since 0.6
      */
-    public ColourChooser(final Window window) {
-        this("ffffff", true, true, window);
+    public ColourChooser(final IconManager iconManager, final Window window) {
+        this(iconManager, "ffffff", true, true, window);
     }
 
     /**
      * Creates a new instance of ColourChooser.
      *
+     * @param iconManager Icon manager
      * @param initialColour Snitial colour
      * @param ircColours Show irc colours
      * @param hexColours Show hex colours
      */
-    public ColourChooser(final String initialColour, final boolean ircColours,
+    public ColourChooser(final IconManager iconManager,
+            final String initialColour, final boolean ircColours,
             final boolean hexColours) {
-        this(initialColour, ircColours, hexColours, null);
+        this(iconManager, initialColour, ircColours, hexColours, null);
     }
 
     /**
      * Creates a new instance of ColourChooser.
      *
+     * @param iconManager Icon manager
      * @param initialColour initial colour
      * @param ircColours show irc colours
      * @param hexColours show hex colours
@@ -107,10 +114,12 @@ public final class ColourChooser extends JPanel implements ActionListener {
      *
      * @since 0.6
      */
-    public ColourChooser(final String initialColour, final boolean ircColours,
+    public ColourChooser(final IconManager iconManager,
+            final String initialColour, final boolean ircColours,
             final boolean hexColours, final Window window) {
         super();
 
+        this.iconManager = iconManager;
         this.window = window;
         showIRC = ircColours;
         showHex = hexColours;
@@ -142,6 +151,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
 
     /**
      * Returns the selected colour from this component.
+     *
      * @return This components colour, as a string
      */
     public String getColour() {
@@ -150,6 +160,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
 
     /**
      * Sets the selected colour for this component.
+     *
      * @param newValue New colour
      */
     public void setColour(final String newValue) {
@@ -166,6 +177,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
 
     /**
      * Updates the colour panel.
+     *
      * @param newColour The new colour to use.
      */
     private void updateColour(final String newColour) {
@@ -187,7 +199,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == editButton) {
-            cpd = new ColourPickerDialog(showIRC, showHex, window);
+            cpd = new ColourPickerDialog(iconManager, showIRC, showHex, window);
             cpd.addActionListener(this);
             cpd.display(editButton);
         } else {
@@ -239,7 +251,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
             if (localListenerList[i] == ActionListener.class) {
                 ((ActionListener) localListenerList[i + 1]).actionPerformed(
                         new ActionEvent(this,
-                        ActionEvent.ACTION_PERFORMED, command));
+                                ActionEvent.ACTION_PERFORMED, command));
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerDialog.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Window;
@@ -38,59 +37,61 @@ import javax.swing.JDialog;
  */
 public final class ColourPickerDialog extends StandardDialog {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Colour chooser panel. */
-    private ColourPickerPanel colourChooser;
+    private final ColourPickerPanel colourChooser;
 
     /**
      * Creates a new instance of ColourPickerDialog.
      *
+     * @param iconManager Icon manager
+     *
      * @since 0.6
      */
-    public ColourPickerDialog() {
-        this(true, true);
+    public ColourPickerDialog(final IconManager iconManager) {
+        this(iconManager, true, true);
     }
 
     /**
      * Creates a new instance of ColourPickerDialog.
      *
+     * @param iconManager Icon manager
      * @param window Parent window
      *
      * @since 0.6
      */
-    public ColourPickerDialog(final Window window) {
-        this(true, true, window);
+    public ColourPickerDialog(final IconManager iconManager,
+            final Window window) {
+        this(iconManager, true, true, window);
     }
 
     /**
      * Creates a new instance of ColourPickerDialog.
      *
+     * @param iconManager Icon manager
      * @param showIRC show irc colours
      * @param showHex show hex colours
      */
-    public ColourPickerDialog(final boolean showIRC, final boolean showHex) {
-        this(showIRC, showHex, null);
-        setIconImage(new IconManager(IdentityManager.getGlobalConfig())
-                .getImage("icon"));
+    public ColourPickerDialog(final IconManager iconManager,
+            final boolean showIRC, final boolean showHex) {
+        this(iconManager, showIRC, showHex, null);
     }
 
     /**
      * Creates a new instance of ColourPickerDialog.
      *
+     * @param iconManager Icon manager
      * @param showIRC show irc colours
      * @param showHex show hex colours
      * @param window Parent window
      *
      * @since 0.6
      */
-    public ColourPickerDialog(final boolean showIRC, final boolean showHex,
-            final Window window) {
-        super(window, ModalityType.MODELESS);
+    public ColourPickerDialog(final IconManager iconManager,
+            final boolean showIRC, final boolean showHex, final Window window) {
+        super(null, window, ModalityType.MODELESS);
+        setIconImage(iconManager.getImage("icon"));
 
         colourChooser = new ColourPickerPanel(showIRC, showHex);
 
@@ -102,27 +103,6 @@ public final class ColourPickerDialog extends StandardDialog {
         setWindow(window);
     }
 
-    /**
-     * Creates and shows a new Colour picker dialog.
-     * @return Colour picker dialog
-     */
-    public static ColourPickerDialog showColourPicker() {
-        return showColourPicker(true, true);
-    }
-
-    /**
-     * Creates and shows a new Colour picker dialog.
-     * @return Colour picker dialog
-     * @param showIRC show irc colours
-     * @param showHex show hex colours
-     */
-    public static ColourPickerDialog showColourPicker(final boolean showIRC,
-            final boolean showHex) {
-        final ColourPickerDialog cpd = new ColourPickerDialog(showIRC, showHex);
-        cpd.display();
-        return cpd;
-    }
-
     /**
      * Adds an actions listener to this dialog.
      *

src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerPanel.java

@@ -45,16 +45,11 @@ import javax.swing.JPanel;
 /**
  * The ColourPickerPanel allows users to pick either an IRC colour or a hex
  * colour visually.
- * @author chris
  */
 public final class ColourPickerPanel extends JPanel implements MouseListener,
         MouseMotionListener, MouseWheelListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** ActionEvent ID for when a hex colour is selected. */
     public static final int ACTION_HEX = 10001;
@@ -103,8 +98,8 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
             final boolean newShowHex) {
         super();
 
-        this.showIrc = newShowIrc;
-        this.showHex = newShowHex;
+        showIrc = newShowIrc;
+        showHex = newShowHex;
 
         final int height = 110 + (showIrc ? 15 : 0) + (showHex ? 125 : 0);
 
@@ -282,7 +277,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
     private void throwAction(final int id, final String message) {
         final ActionEvent event = new ActionEvent(this, id, message);
 
-        for (ActionListener listener : listeners) {
+        for (final ActionListener listener : listeners) {
             listener.actionPerformed(event);
         }
     }

src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -43,36 +44,39 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Colour chooser widget.
  */
-public final class OptionalColourChooser extends JPanel implements ActionListener {
+public final class OptionalColourChooser extends JPanel implements
+        ActionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
+    private String value;
+    /** Our listeners. */
+    private final ListenerList listeners = new ListenerList();
+    /** Icon manager. */
+    private final IconManager iconManager;
     /** Enabled checkbox. */
-    private JCheckBox enabled;
+    private final JCheckBox enabled;
     /** Edit button. */
-    private JButton editButton;
+    private final JButton editButton;
     /** Panel to show the colour preview. */
-    private JPanel previewPanel;
+    private final JPanel previewPanel;
     /** Colours picking dialog. */
     private ColourPickerDialog cpd;
     /** show irc colours. */
-    private boolean showIRC;
+    private final boolean showIRC;
     /** show hex colours. */
-    private boolean showHex;
+    private final boolean showHex;
     /** The value of this component. */
-    private String value;
-    /** Our listeners. */
-    private final ListenerList listeners = new ListenerList();
     /** Parent window. */
     private Window window;
 
-    /** Creates a new instance of ColourChooser. */
-    public OptionalColourChooser() {
-        this("", false, true, true);
+    /**
+     * Creates a new instance of ColourChooser.
+     *
+     * @param iconManager Icon manager
+     */
+    public OptionalColourChooser(final IconManager iconManager) {
+        this(iconManager, "", false, true, true);
     }
 
     /**
@@ -82,27 +86,32 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
      *
      * @since 0.6
      */
-    public OptionalColourChooser(final Window window) {
-        this("", false, true, true, window);
+    public OptionalColourChooser(final IconManager iconManager,
+            final Window window) {
+        this(iconManager, "", false, true, true, window);
     }
 
     /**
      * Creates a new instance of ColourChooser.
      *
+     * @param iconManager Icon manager
      * @param initialColour Snitial colour
      * @param initialState Initial state
      * @param ircColours Show irc colours
      * @param hexColours Show hex colours
      */
-    public OptionalColourChooser(final String initialColour,
+    public OptionalColourChooser(final IconManager iconManager,
+            final String initialColour,
             final boolean initialState, final boolean ircColours,
             final boolean hexColours) {
-        this(initialColour, initialState, ircColours, hexColours, null);
+        this(iconManager, initialColour, initialState, ircColours, hexColours,
+                null);
     }
 
     /**
      * Creates a new instance of ColourChooser.
      *
+     * @param iconManager Icon manager
      * @param initialColour Snitial colour
      * @param initialState Initial state
      * @param ircColours Show irc colours
@@ -111,11 +120,13 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
      *
      * @since 0.6
      */
-    public OptionalColourChooser(final String initialColour,
+    public OptionalColourChooser(final IconManager iconManager,
+            final String initialColour,
             final boolean initialState, final boolean ircColours,
             final boolean hexColours, final Window window) {
         super();
 
+        this.iconManager = iconManager;
         this.window = window;
         showIRC = ircColours;
         showHex = hexColours;
@@ -180,6 +191,7 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
 
     /**
      * Updates the colour panel.
+     *
      * @param newColour The new colour to use.
      */
     private void updateColour(final String newColour) {
@@ -201,7 +213,7 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == editButton) {
-            cpd = new ColourPickerDialog(showIRC, showHex, window);
+            cpd = new ColourPickerDialog(iconManager, showIRC, showHex, window);
             cpd.addActionListener(this);
             cpd.display(editButton);
         } else if (e.getSource() == enabled) {
@@ -229,7 +241,8 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
      * Informs all action listeners that an action has occured.
      */
     protected void fireActionEvent() {
-        for (ActionListener listener : listeners.get(ActionListener.class)) {
+        for (final ActionListener listener : listeners
+                .get(ActionListener.class)) {
             listener.actionPerformed(new ActionEvent(this, 1, "stuffChanged"));
         }
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.DateUtils;
 import com.dmdirc.util.collections.ListenerList;
@@ -49,22 +50,24 @@ public class DurationDisplay extends JPanel implements ActionListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Listener list. */
+    private final ListenerList listeners;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Current duration. */
     private int duration;
     /** Duration label. */
     private JLabel durationLabel;
     /** Edit button. */
     private JButton button;
-    /** Listener list. */
-    private final ListenerList listeners;
     /** Parent window. */
     private Window window;
 
     /**
      * Initialises a new duration display of 0 milliseconds.
      */
-    public DurationDisplay() {
-        this(0);
+    public DurationDisplay(final SwingController controller) {
+        this(controller, 0);
     }
 
     /**
@@ -74,8 +77,9 @@ public class DurationDisplay extends JPanel implements ActionListener,
      *
      * @since 0.6
      */
-    public DurationDisplay(final Window window) {
-        this(window, 0);
+    public DurationDisplay(final SwingController controller,
+            final Window window) {
+        this(controller, window, 0);
     }
 
     /**
@@ -83,8 +87,9 @@ public class DurationDisplay extends JPanel implements ActionListener,
      *
      * @param duration Starting duration
      */
-    public DurationDisplay(final long duration) {
-        this(null, duration);
+    public DurationDisplay(final SwingController controller,
+            final long duration) {
+        this(controller, null, duration);
     }
 
     /**
@@ -95,9 +100,11 @@ public class DurationDisplay extends JPanel implements ActionListener,
      *
      * @since 0.6
      */
-    public DurationDisplay(final Window window, final long duration) {
+    public DurationDisplay(final SwingController controller,
+            final Window window, final long duration) {
         super();
 
+        this.controller = controller;
         this.window = window;
         this.duration = (int) (duration / 1000);
         listeners = new ListenerList();
@@ -150,7 +157,8 @@ public class DurationDisplay extends JPanel implements ActionListener,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final DurationEditor editor = new DurationEditor(window, duration);
+        final DurationEditor editor = new DurationEditor(controller, window,
+                duration);
         editor.display(this);
         editor.addDurationListener(this);
     }
@@ -206,7 +214,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
      * @param newDuration New duration
      */
     protected void fireDurationListener(final int newDuration) {
-        for (DurationListener listener : listeners.get(DurationListener.class)) {
+        for (final DurationListener listener : listeners.get(DurationListener.class)) {
             listener.durationUpdated(newDuration);
         }
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -75,8 +76,8 @@ public class DurationEditor extends StandardDialog implements ActionListener {
     /**
      * Instantiates a new duration editor.
      */
-    public DurationEditor() {
-        this(0);
+    public DurationEditor(final SwingController controller) {
+        this(controller, 0);
     }
 
     /**
@@ -86,8 +87,9 @@ public class DurationEditor extends StandardDialog implements ActionListener {
      *
      * @since 0.6
      */
-    public DurationEditor(final Window window) {
-        this(window, 0);
+    public DurationEditor(final SwingController controller,
+            final Window window) {
+        this(controller, window, 0);
     }
 
     /**
@@ -95,20 +97,23 @@ public class DurationEditor extends StandardDialog implements ActionListener {
      *
      * @param duration Starting duration
      */
-    public DurationEditor(final long duration) {
-        this(null, duration);
+    public DurationEditor(final SwingController controller,
+            final long duration) {
+        this(controller, controller.getMainFrame(), duration);
     }
 
     /**
      * Instantiates a new duration editor.
      *
+     * @param controller Swing controller
      * @param window Parent window.
      * @param duration Starting duration
      *
      * @since 0.6
      */
-    public DurationEditor(final Window window, final long duration) {
-        super(window, ModalityType.MODELESS);
+    public DurationEditor(final SwingController controller,
+            final Window window, final long duration) {
+        super(controller, window, ModalityType.MODELESS);
 
         this.window = window;
 
@@ -234,7 +239,7 @@ public class DurationEditor extends StandardDialog implements ActionListener {
      * @param newDuration New duration
      */
     protected void fireDurationListener(final int newDuration) {
-        for (DurationListener listener : listeners.get(DurationListener.class)) {
+        for (final DurationListener listener : listeners.get(DurationListener.class)) {
             listener.durationUpdated(newDuration);
         }
     }

src/com/dmdirc/addons/ui_swing/components/expandingsettings/CurrentOptionsPanel.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
@@ -44,28 +43,29 @@ import net.miginfocom.swing.MigLayout;
 public final class CurrentOptionsPanel extends JPanel implements
         ActionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Parent settings panel. */
     private final SettingsPanel parent;
     /** Curent options to display. */
     private final List<JComponent> settings;
+    /** Icon manager. */
+    private final IconManager iconManager;
 
     /**
      * Creates a new instance of CurrentOptionsPanel.
      *
+     * @param iconManager IconManager
      * @param parent Parent settings panel.
      */
-    protected CurrentOptionsPanel(final SettingsPanel parent) {
+    protected CurrentOptionsPanel(final IconManager iconManager,
+            final SettingsPanel parent) {
         super();
 
+        this.iconManager = iconManager;
         this.parent = parent;
 
-        this.setOpaque(UIUtilities.getTabbedPaneOpaque());
+        setOpaque(UIUtilities.getTabbedPaneOpaque());
         settings = new ArrayList<JComponent>();
     }
 
@@ -107,10 +107,8 @@ public final class CurrentOptionsPanel extends JPanel implements
     private void addCurrentOption(final JComponent component) {
         final JLabel label = new JLabel();
         final ImageButton<JComponent> button = new ImageButton<JComponent>(
-                component.getName(),
-                new IconManager(IdentityManager.getGlobalConfig())
-                .getIcon("close-inactive"), new IconManager(IdentityManager
-                .getGlobalConfig()).getIcon("close-active"));
+                component.getName(), iconManager.getIcon("close-inactive"),
+                iconManager.getIcon("close-active"));
         button.setObject(component);
 
         label.setText(component.getName() + ": ");
@@ -132,7 +130,7 @@ public final class CurrentOptionsPanel extends JPanel implements
 
         removeAll();
 
-        for (JComponent setting : settings) {
+        for (final JComponent setting : settings) {
             addCurrentOption(setting);
         }
 

src/com/dmdirc/addons/ui_swing/components/expandingsettings/SettingsPanel.java

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
-
 import com.dmdirc.util.collections.DoubleMap;
 
 import javax.swing.BorderFactory;
@@ -43,11 +42,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class SettingsPanel extends JPanel {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 3;
     /** Current Settings. */
     private final DoubleMap<PreferencesSetting, JComponent> settings;
@@ -92,7 +87,7 @@ public class SettingsPanel extends JPanel {
 
         settings = new DoubleMap<PreferencesSetting, JComponent>();
 
-        this.setOpaque(UIUtilities.getTabbedPaneOpaque());
+        setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.padding = padding;
 
         initComponents(infoText);
@@ -109,7 +104,8 @@ public class SettingsPanel extends JPanel {
         infoLabel.setVisible(!infoText.isEmpty());
 
         addOptionPanel = new AddOptionPanel(this);
-        currentOptionsPanel = new CurrentOptionsPanel(this);
+        currentOptionsPanel = new CurrentOptionsPanel(controller
+                .getIconManager(), this);
         scrollPane = new JScrollPane(currentOptionsPanel);
 
         scrollPane.setBorder(BorderFactory.createTitledBorder(UIManager.
@@ -141,7 +137,7 @@ public class SettingsPanel extends JPanel {
     public void addOption(final PreferencesCategory category) {
         this.category = category;
 
-        for (PreferencesSetting setting : category.getSettings()) {
+        for (final PreferencesSetting setting : category.getSettings()) {
             if (settings.get(setting) == null) {
                 final JComponent component = controller
                         .getPrefsComponentFactory().getComponent(setting);
@@ -161,7 +157,7 @@ public class SettingsPanel extends JPanel {
         addOptionPanel.clearOptions();
         currentOptionsPanel.clearOptions();
 
-        for (PreferencesSetting setting : category.getSettings()) {
+        for (final PreferencesSetting setting : category.getSettings()) {
             if (setting.isSet()) {
                 addCurrentOption(settings.get(setting));
             } else {

src/com/dmdirc/addons/ui_swing/components/frames/AppleJFrame.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
@@ -32,15 +31,10 @@ import javax.swing.JFrame;
 /**
  * Haxy JFrame to allow Apple to show the MenuBar in otherwise parent-less
  * dialogs.
- *
- * @author shane
  */
 public class AppleJFrame extends JFrame {
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
 
     /**
@@ -48,10 +42,11 @@ public class AppleJFrame extends JFrame {
      *
      * @param parentWindow Main Window
      */
-    public AppleJFrame(final MainFrame parentWindow, final SwingController controller) {
+    public AppleJFrame(final MainFrame parentWindow,
+            final SwingController controller) {
         super();
         final MenuBar menu = new MenuBar(controller, parentWindow);
-        Apple.getApple().setMenuBar(menu);
+        controller.getApple().setMenuBar(menu);
         setJMenuBar(menu);
     }
 }

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -33,11 +33,8 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.NickList;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
-import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -96,8 +93,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_CLOSING);
 
-        identity = IdentityManager.getChannelConfig(owner.getServer().
-                getNetwork(), owner.getChannelInfo().getName());
+        identity = controller.getIdentityManager().createChannelConfig(
+                owner.getServer().getNetwork(), owner.getChannelInfo().getName());
     }
 
     /**
@@ -159,10 +156,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            ChannelSettingsDialog.showChannelSettingsDialog(controller,
-                    (Channel) getContainer(), getController().getMainFrame(),
-                    (InputWindow) getController().getWindowFactory()
-                    .getSwingWindow(frameParent));
+            getController().showChannelSettingsDialog((Channel) getContainer());
         }
     }
 
@@ -281,7 +275,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     @Override
     public void dispose() {
         ActionManager.getActionManager().unregisterListener(this);
-        IdentityManager.getGlobalConfig().removeListener(this);
+        controller.getGlobalConfig().removeListener(this);
         super.dispose();
     }
 }

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -35,10 +35,10 @@ import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialog;
 import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.BorderLayout;
 import java.awt.Point;
@@ -62,12 +62,10 @@ import net.miginfocom.layout.PlatformDefaults;
 public abstract class InputTextFrame extends TextFrame implements InputWindow,
         MouseListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 3;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Input field panel. */
     protected JPanel inputPanel;
     /** The InputHandler for our input field. */
@@ -86,6 +84,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     /**
      * Creates a new instance of InputFrame.
      *
+     * @param controller Swing controller
      * @param owner WritableFrameContainer owning this frame.
      * @param controller Swing controller
      */
@@ -93,6 +92,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             final WritableFrameContainer owner) {
         super(owner, controller);
 
+        this.controller = controller;
         initComponents();
 
         final ConfigManager config = owner.getConfigManager();
@@ -293,7 +293,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                     isDataFlavorAvailable(DataFlavor.stringFlavor)) {
                 return;
             }
-        } catch (IllegalStateException ex) {
+        } catch (final IllegalStateException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to paste from clipboard.");
             return;
         }
@@ -304,10 +304,10 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             clipboard = (String) Toolkit.getDefaultToolkit().
                     getSystemClipboard().getData(DataFlavor.stringFlavor);
             doPaste(clipboard);
-        } catch (IOException ex) {
+        } catch (final IOException ex) {
             Logger.userError(ErrorLevel.LOW,
                     "Unable to get clipboard contents: " + ex.getMessage());
-        } catch (UnsupportedFlavorException ex) {
+        } catch (final UnsupportedFlavorException ex) {
             Logger.userError(ErrorLevel.LOW, "Unsupported clipboard type", ex);
         }
     }
@@ -336,11 +336,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             if (pasteTrigger != null && getContainer().getNumLines(text)
                     > pasteTrigger) {
                 //show the multi line paste dialog
-                new PasteDialog(this, text, getController().getMainFrame()).
-                        display();
+                new PasteDialog(controller, this, text, getController()
+                        .getMainFrame()).display();
             } else {
                 //send the lines
-                for (String clipboardLine : clipboardLines) {
+                for (final String clipboardLine : clipboardLines) {
                     getContainer().sendLine(clipboardLine);
                 }
             }

src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -50,11 +50,7 @@ import net.miginfocom.swing.MigLayout;
 public final class ServerFrame extends InputTextFrame implements
         ActionListener, CertificateProblemListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 9;
     /** Swing controller. */
     private final SwingController controller;
@@ -99,8 +95,7 @@ public final class ServerFrame extends InputTextFrame implements
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            ServerSettingsDialog.showServerSettingsDialog(controller,
-                    getContainer().getServer(), getController().getMainFrame());
+            controller.showDialog(ServerSettingsDialog.class);
         }
     }
 
@@ -149,7 +144,7 @@ public final class ServerFrame extends InputTextFrame implements
     public void certificateProblemEncountered(final X509Certificate[] chain,
             final Collection<CertificateException> problems,
             final CertificateManager certificateManager) {
-        sslDialog = new SSLCertificateDialog(getController().getMainFrame(),
+        sslDialog = new SSLCertificateDialog(getController(), getController().getMainFrame(),
                 new SSLCertificateDialogModel(chain, problems, certificateManager));
         sslDialog.display();
     }
@@ -165,12 +160,7 @@ public final class ServerFrame extends InputTextFrame implements
     /** {@inheritDoc} */
     @Override
     public void windowClosing(final FrameContainer window) {
-        if (ServerSettingsDialog.hasServerSettingsDialog()) {
-            ServerSettingsDialog.getServerSettingsDialog(controller,
-                    getContainer().getServer(),
-                    getController().getMainFrame()).dispose();
-        }
-
+        controller.getDialogManager().dispose(ServerSettingsDialog.class);
         super.windowClosing(window);
     }
 

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -53,10 +53,10 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameCloseListener;
-import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.Point;
 import java.awt.event.KeyEvent;
@@ -115,7 +115,7 @@ public abstract class TextFrame extends JPanel implements Window,
             final SwingController controller) {
         super();
         this.controller = controller;
-        this.frameParent = owner;
+        frameParent = owner;
 
         final ConfigManager config = owner.getConfigManager();
 
@@ -310,7 +310,7 @@ public abstract class TextFrame extends JPanel implements Window,
      * @param newTextPane new text pane to use
      */
     protected final void setTextPane(final TextPane newTextPane) {
-        this.textPane = newTextPane;
+        textPane = newTextPane;
     }
 
     /** {@inheritDoc} */
@@ -413,7 +413,7 @@ public abstract class TextFrame extends JPanel implements Window,
         final Object[][] arguments = new Object[parts.length][1];
 
         int i = 0;
-        for (String part : parts) {
+        for (final String part : parts) {
             arguments[i++][0] = part;
         }
 
@@ -500,7 +500,7 @@ public abstract class TextFrame extends JPanel implements Window,
     private JComponent populatePopupMenu(final JComponent menu,
             final PopupMenu popup,
             final Object[][] arguments) {
-        for (PopupMenuItem menuItem : popup.getItems()) {
+        for (final PopupMenuItem menuItem : popup.getItems()) {
             if (menuItem.isDivider()) {
                 menu.add(new JSeparator());
             } else if (menuItem.isSubMenu()) {

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
-import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.ReturnableThread;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.Color;
 import java.awt.FontMetrics;
@@ -54,11 +54,7 @@ import net.miginfocom.swing.MigLayout;
 public class SwingInputField extends JComponent implements InputField,
         KeyListener, InputValidationListener, PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Colour picker. */
     private ColourPickerDialog colourPicker;
@@ -72,6 +68,8 @@ public class SwingInputField extends JComponent implements InputField,
     private final ListenerList listeners;
     /** Parent Window. */
     private final Window parentWindow;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Instantiates a new swing input field.
@@ -83,6 +81,7 @@ public class SwingInputField extends JComponent implements InputField,
             final Window parentWindow) {
         super();
 
+        controller = textFrame.getController();
         this.parentWindow = parentWindow;
 
         listeners = new ListenerList();
@@ -151,9 +150,10 @@ public class SwingInputField extends JComponent implements InputField,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                if (IdentityManager.getGlobalConfig().getOptionBool("general",
+                if (controller.getGlobalConfig().getOptionBool("general",
                         "showcolourdialog")) {
-                    colourPicker = new ColourPickerDialog(irc, hex, parentWindow);
+                    colourPicker = new ColourPickerDialog(controller
+                            .getIconManager(), irc, hex, parentWindow);
                     colourPicker.addActionListener(new ActionListener() {
 
                         @Override
@@ -162,7 +162,7 @@ public class SwingInputField extends JComponent implements InputField,
                                 textField.getDocument().
                                         insertString(textField.getCaretPosition(),
                                         actionEvent.getActionCommand(), null);
-                            } catch (BadLocationException ex) {
+                            } catch (final BadLocationException ex) {
                             //Ignore, wont happen
                             }
                             colourPicker.dispose();
@@ -483,7 +483,7 @@ public class SwingInputField extends JComponent implements InputField,
      */
     @Override
     public void keyTyped(final KeyEvent e) {
-        for (KeyListener listener : listeners.get(KeyListener.class)) {
+        for (final KeyListener listener : listeners.get(KeyListener.class)) {
             listener.keyTyped(e);
         }
     }
@@ -495,7 +495,7 @@ public class SwingInputField extends JComponent implements InputField,
      */
     @Override
     public void keyPressed(final KeyEvent e) {
-        for (KeyListener listener : listeners.get(KeyListener.class)) {
+        for (final KeyListener listener : listeners.get(KeyListener.class)) {
             listener.keyPressed(e);
         }
     }
@@ -507,7 +507,7 @@ public class SwingInputField extends JComponent implements InputField,
      */
     @Override
     public void keyReleased(final KeyEvent e) {
-        for (KeyListener listener : listeners.get(KeyListener.class)) {
+        for (final KeyListener listener : listeners.get(KeyListener.class)) {
             listener.keyReleased(e);
         }
     }

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -27,10 +27,10 @@ import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -76,12 +76,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
         localTarget.getActionMap().put("upArrow", new AbstractAction() {
 
-            /**
-             * A version number for this class. It should be changed whenever
-             * the class structure is changed (or anything else that would
-             * prevent serialized objects being unserialized with the new
-             * class).
-             */
+            /** Serial version UID. */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
@@ -114,12 +109,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
         localTarget.getActionMap().put("downArrow", new AbstractAction() {
 
-            /**
-             * A version number for this class. It should be changed whenever
-             * the class structure is changed (or anything else that would
-             * prevent serialized objects being unserialized with the new
-             * class).
-             */
+            /** Serial version UID. */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
@@ -154,18 +144,13 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
         localTarget.getActionMap().put("insert-tab", new AbstractAction() {
 
-            /**
-             * A version number for this class. It should be changed whenever
-             * the class structure is changed (or anything else that would
-             * prevent serialized objects being unserialized with the new
-             * class).
-             */
+            /** Serial version UID. */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
             @Override
             public void actionPerformed(final ActionEvent e) {
-                new LoggingSwingWorker() {
+                new LoggingSwingWorker<Object, Void>() {
 
                     /** {@inheritDoc} */
                     @Override
@@ -186,18 +171,13 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
         localTarget.getActionMap().put("insert-shift-tab",
                 new AbstractAction() {
 
-            /**
-             * A version number for this class. It should be changed whenever
-             * the class structure is changed (or anything else that would
-             * prevent serialized objects being unserialized with the new
-             * class).
-             */
+            /** Serial version UID. */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
             @Override
             public void actionPerformed(final ActionEvent e) {
-                new LoggingSwingWorker() {
+                new LoggingSwingWorker<Object, Void>() {
 
                     /** {@inheritDoc} */
                     @Override
@@ -236,12 +216,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
         localTarget.getActionMap().put("enterButton", new AbstractAction() {
 
-            /**
-             * A version number for this class. It should be changed whenever
-             * the class structure is changed (or anything else that would
-             * prevent serialized objects being unserialized with the new
-             * class).
-             */
+            /** Serial version UID. */
             private static final long serialVersionUID = 1;
 
             /** {@inheritDoc} */
@@ -267,7 +242,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                             return;
                         }
                         if (source.isEditable()) {
-                            new LoggingSwingWorker() {
+                            new LoggingSwingWorker<Object, Void>() {
 
                                 /** {@inheritDoc} */
                                 @Override

src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.KeyboardFocusManager;
@@ -41,24 +41,24 @@ import javax.swing.text.BadLocationException;
 public class TextAreaInputField extends JTextArea implements InputField,
         PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
-
     /** Colour picker. */
     protected ColourPickerDialog colourPicker;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new text area with the specified number of rows and columns.
      *
+     * @param controller Swing controller
      * @param rows The number of rows to use
      * @param columns The number of columns to use
      */
-    public TextAreaInputField(final int rows, final int columns) {
+    public TextAreaInputField(final SwingController controller, final int rows,
+            final int columns) {
         super(rows, columns);
+        this.controller = controller;
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener(this);
     }
@@ -66,10 +66,13 @@ public class TextAreaInputField extends JTextArea implements InputField,
     /**
      * Creates a new text area containing the specified text.
      *
+     * @param controller Swing controller
      * @param text The text to contain initially
      */
-    public TextAreaInputField(final String text) {
+    public TextAreaInputField(final SwingController controller,
+            final String text) {
         super(text);
+        this.controller = controller;
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener(this);
     }
@@ -89,9 +92,10 @@ public class TextAreaInputField extends JTextArea implements InputField,
     /** {@inheritDoc} */
     @Override
     public void showColourPicker(final boolean irc, final boolean hex) {
-        if (IdentityManager.getGlobalConfig().getOptionBool("general",
+        if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(irc, hex);
+            colourPicker = new ColourPickerDialog(controller.getIconManager(),
+                    irc, hex);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override
@@ -99,7 +103,7 @@ public class TextAreaInputField extends JTextArea implements InputField,
                     try {
                         getDocument().insertString(getCaretPosition(),
                                 actionEvent.getActionCommand(), null);
-                    } catch (BadLocationException ex) {
+                    } catch (final BadLocationException ex) {
                         //Ignore, wont happen
                     }
                     colourPicker.dispose();

src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.KeyboardFocusManager;
@@ -41,21 +41,22 @@ import javax.swing.text.BadLocationException;
 public class TextFieldInputField extends JTextField implements InputField,
         PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Colour picker. */
     protected ColourPickerDialog colourPicker;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new text field input field.
+     *
+     * @param controller Swing controller
      */
-    public TextFieldInputField() {
+    public TextFieldInputField(final SwingController controller) {
         super();
 
+        this.controller = controller;
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener(this);
     }
@@ -63,9 +64,10 @@ public class TextFieldInputField extends JTextField implements InputField,
     /** {@inheritDoc} */
     @Override
     public void showColourPicker(final boolean irc, final boolean hex) {
-        if (IdentityManager.getGlobalConfig().getOptionBool("general",
+        if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(irc, hex);
+            colourPicker = new ColourPickerDialog(controller.getIconManager(),
+                    irc, hex);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override
@@ -73,7 +75,7 @@ public class TextFieldInputField extends JTextField implements InputField,
                     try {
                         getDocument().insertString(getCaretPosition(),
                                 actionEvent.getActionCommand(), null);
-                    } catch (BadLocationException ex) {
+                    } catch (final BadLocationException ex) {
                         //Ignore, wont happen
                     }
                     colourPicker.dispose();

src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.InputField;
 
 import java.awt.KeyboardFocusManager;
@@ -45,24 +45,25 @@ import javax.swing.text.BadLocationException;
 public class TextPaneInputField extends JEditorPane implements InputField,
         PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Parent window. */
     private final Window parentWindow;
     /** Colour picker. */
     protected ColourPickerDialog colourPicker;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new text pane input field.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window, can be null
      */
-    public TextPaneInputField(final Window parentWindow) {
+    public TextPaneInputField(final SwingController controller,
+            final Window parentWindow) {
         super();
+        this.controller = controller;
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener(this);
         this.parentWindow = parentWindow;
@@ -71,9 +72,10 @@ public class TextPaneInputField extends JEditorPane implements InputField,
     /** {@inheritDoc} */
     @Override
     public void showColourPicker(final boolean irc, final boolean hex) {
-        if (IdentityManager.getGlobalConfig().getOptionBool("general",
+        if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(irc, hex, parentWindow);
+            colourPicker = new ColourPickerDialog(controller.getIconManager(),
+                    irc, hex, parentWindow);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override
@@ -81,7 +83,7 @@ public class TextPaneInputField extends JEditorPane implements InputField,
                     try {
                         getDocument().insertString(getCaretPosition(),
                                 actionEvent.getActionCommand(), null);
-                    } catch (BadLocationException ex) {
+                    } catch (final BadLocationException ex) {
                         //Ignore, wont happen
                     }
                     colourPicker.dispose();

src/com/dmdirc/addons/ui_swing/components/inputfields/ValidatingTextFieldInputField.java

@@ -40,11 +40,7 @@ import javax.swing.text.BadLocationException;
 public class ValidatingTextFieldInputField extends ValidatingJTextField
         implements InputField {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** Colour picker. */
     private ColourPickerDialog colourPicker;
@@ -92,7 +88,8 @@ public class ValidatingTextFieldInputField extends ValidatingJTextField
     public void showColourPicker(final boolean irc, final boolean hex) {
         if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(irc, hex);
+            colourPicker = new ColourPickerDialog(controller.getIconManager(),
+                    irc, hex);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override
@@ -100,7 +97,7 @@ public class ValidatingTextFieldInputField extends ValidatingJTextField
                     try {
                         getDocument().insertString(getCaretPosition(),
                                 actionEvent.getActionCommand(), null);
-                    } catch (BadLocationException ex) {
+                    } catch (final BadLocationException ex) {
                         //Ignore, wont happen
                     }
                     colourPicker.dispose();

src/com/dmdirc/addons/ui_swing/components/menubar/HelpMenu.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
@@ -40,28 +39,19 @@ import javax.swing.JMenuItem;
  */
 public class HelpMenu extends JMenu implements ActionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Swing controller. */
     private final SwingController controller;
-    /** Main frame. */
-    private final MainFrame mainFrame;
 
     /**
      * Instantiates a new help menu.
      *
      * @param controller Swing controller
-     * @param mainFrame Main frame
      */
-    public HelpMenu(final SwingController controller,
-            final MainFrame mainFrame) {
+    public HelpMenu(final SwingController controller) {
         super("Help");
         this.controller = controller;
-        this.mainFrame = mainFrame;
         setMnemonic('h');
         initHelpMenu();
     }
@@ -104,11 +94,11 @@ public class HelpMenu extends JMenu implements ActionListener {
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getActionCommand().equals("About")) {
-            AboutDialog.showAboutDialog(controller);
+            controller.showDialog(AboutDialog.class);
         } else if (e.getActionCommand().equals("JoinDevChat")) {
             ServerManager.getServerManager().joinDevChat();
         } else if (e.getActionCommand().equals("feedback")) {
-            FeedbackDialog.showFeedbackDialog(mainFrame);
+            controller.showDialog(FeedbackDialog.class);
         }
     }
 }

src/com/dmdirc/addons/ui_swing/components/menubar/MenuBar.java

@@ -65,9 +65,9 @@ public class MenuBar extends JMenuBar {
 
         add(new ServerMenu(controller, mainFrame));
         add(new ChannelMenu(controller, mainFrame));
-        add(new SettingsMenu(controller, mainFrame));
+        add(new SettingsMenu(controller));
         add(new WindowMenuFrameManager(controller, mainFrame));
-        add(new HelpMenu(controller, mainFrame));
+        add(new HelpMenu(controller));
         final int tempCount = getComponentCount();
         add(Box.createHorizontalGlue(), "growx, pushx");
         add(new MDIBar(controller, mainFrame));
@@ -106,6 +106,6 @@ public class MenuBar extends JMenuBar {
             add(menu);
         }
 
-        menu.add(menuItem);
+        menu.add(menuItem, 0);
     }
 }

src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -116,7 +116,7 @@ public class ServerMenu extends JMenu implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if ("NewServer".equals(e.getActionCommand())) {
-            NewServerDialog.showNewServerDialog(controller);
+            controller.showDialog(NewServerDialog.class);
         } else if (e.getActionCommand().equals("Exit")) {
             mainFrame.quit();
         } else if (e.getActionCommand().equals("ServerSettings")) {

src/com/dmdirc/addons/ui_swing/components/menubar/SettingsMenu.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
@@ -41,22 +40,14 @@ import javax.swing.JMenuItem;
  */
 public class SettingsMenu extends JMenu implements ActionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Swing controller. */
     private final SwingController controller;
-    /** Main frame. */
-    private final MainFrame mainFrame;
 
-    public SettingsMenu(final SwingController controller,
-            final MainFrame mainFrame) {
+    public SettingsMenu(final SwingController controller) {
         super("Settings");
         this.controller = controller;
-        this.mainFrame = mainFrame;
         setMnemonic('e');
         initSettingsMenu();
     }
@@ -102,14 +93,13 @@ public class SettingsMenu extends JMenu implements ActionListener {
     @Override
     public void actionPerformed(final ActionEvent e) {
         if ("Preferences".equals(e.getActionCommand())) {
-            SwingPreferencesDialog.showSwingPreferencesDialog(controller);
+            controller.showDialog(SwingPreferencesDialog.class);
         } else if (e.getActionCommand().equals("Profile")) {
-            ProfileManagerDialog.showProfileManagerDialog(controller);
+            controller.showDialog(ProfileManagerDialog.class);
         }  else if (e.getActionCommand().equals("Actions")) {
-            ActionsManagerDialog.showActionsManagerDialog(mainFrame,
-                    controller);
+            controller.showDialog(ActionsManagerDialog.class);
         } else if (e.getActionCommand().equals("Aliases")) {
-            AliasManagerDialog.showAliasManagerDialog(controller, mainFrame);
+            controller.showDialog(AliasManagerDialog.class);
         }
     }
 }

src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java

@@ -29,11 +29,7 @@ import com.dmdirc.parser.interfaces.Parser;
 /** Non list mode panel. */
 public final class ChannelModesPane extends ModesPane {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Parent channel. */
     private final Channel channel;

src/com/dmdirc/addons/ui_swing/components/modes/ModesComparator.java

@@ -30,11 +30,7 @@ import java.util.Comparator;
  */
 class ModesComparator implements Comparator<String>, Serializable {
 
-    /**
-     * A version number for this class. It should be changed whenever the
-     * class structure is changed (or anything else that would prevent
-     * serialized objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/modes/ModesPane.java

@@ -44,6 +44,8 @@ import net.miginfocom.swing.MigLayout;
  */
 public abstract class ModesPane extends JPanel {
 
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1;
     /** The checkboxes used for boolean modes. */
     private final Map<String, JCheckBox> modeCheckBoxes;
     /** The ParamModePanels used for parameter-requiring modes. */

src/com/dmdirc/addons/ui_swing/components/performpanel/PerformPanel.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.performpanel;
 
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 
 import java.util.Collection;
@@ -42,19 +43,14 @@ import net.miginfocom.swing.MigLayout;
  * Creates a text area that fills whatever space it has available. This panel
  * facilitates modification of performs.
  *
- * @author Simon Mott
  * @since 0.6.4
  */
 public class PerformPanel extends JPanel {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Text area that the perform is displayed in. */
-    private JTextArea performSpace;
+    private final JTextArea performSpace;
     /** Map of performs this panel can display. */
     private final Map<PerformDescription, String[]> performs = new
             HashMap<PerformDescription, String[]>();
@@ -66,9 +62,11 @@ public class PerformPanel extends JPanel {
      * performs at the time of creation.
      *
      * By default this panel displays a blank text area.
+     *
+     * @param controller Swing controller
      */
-    public PerformPanel() {
-        this(Collections.<PerformDescription>emptyList());
+    public PerformPanel(final SwingController controller) {
+        this(controller, Collections.<PerformDescription>emptyList());
     }
 
     /**
@@ -77,16 +75,18 @@ public class PerformPanel extends JPanel {
      *
      * By default this panel displays a blank text area.
      *
+     * @param controller Swing controller
      * @param performs Collection of PerformDescriptions to initialise
      */
-    public PerformPanel(final Collection<PerformDescription> performs) {
+    public PerformPanel(final SwingController controller,
+            final Collection<PerformDescription> performs) {
         super();
 
-        for (PerformDescription perform : performs) {
+        for (final PerformDescription perform : performs) {
             addPerform(perform);
         }
         setLayout(new MigLayout("ins 0, fill"));
-        performSpace = new TextAreaInputField("");
+        performSpace = new TextAreaInputField(controller, "");
         add(new JScrollPane(performSpace), "grow, push");
     }
 
@@ -118,7 +118,7 @@ public class PerformPanel extends JPanel {
         if (visiblePerform != null) {
             performs.put(visiblePerform, performSpace.getText().split("\n"));
         }
-        for (Entry<PerformDescription, String[]> perform
+        for (final Entry<PerformDescription, String[]> perform
                 : performs.entrySet()) {
             PerformWrapper.getPerformWrapper().setPerform(perform.getKey(),
                     perform.getValue());
@@ -158,7 +158,7 @@ public class PerformPanel extends JPanel {
     private String implode(final String[] lines) {
         final StringBuilder res = new StringBuilder();
 
-        for (String line : lines) {
+        for (final String line : lines) {
             res.append('\n');
             res.append(line);
         }

src/com/dmdirc/addons/ui_swing/components/renderers/AddonCellRenderer.java

@@ -36,13 +36,6 @@ import javax.swing.table.TableCellRenderer;
  */
 public class AddonCellRenderer implements TableCellRenderer {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
     /** {@inheritDoc} */
     @Override
     public Component getTableCellRendererComponent(final JTable table,

src/com/dmdirc/addons/ui_swing/components/renderers/CertificateChainEntryCellRenderer.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateChainEntry;
 
@@ -37,21 +36,25 @@ import javax.swing.JList;
  */
 public class CertificateChainEntryCellRenderer extends DefaultListCellRenderer {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Icon to use for invalid entries. */
-    private final Icon invalidIcon = new IconManager(IdentityManager
-            .getGlobalConfig()).getIcon("cross");
+    private final Icon invalidIcon;
     /** Icon to use for trusted entries. */
-    private final Icon trustedIcon = new IconManager(IdentityManager
-            .getGlobalConfig()).getIcon("tick");
+    private final Icon trustedIcon;
     /** Icon to use for other entries. */
-    private final Icon icon = new IconManager(IdentityManager
-            .getGlobalConfig()).getIcon("nothing");
+    private final Icon icon;
+
+    /**
+     * Creates a new renderer.
+     *
+     * @param iconManager Icon manager
+     */
+    public CertificateChainEntryCellRenderer(final IconManager iconManager) {
+        icon = iconManager.getIcon("nothing");
+        trustedIcon = iconManager.getIcon("tick");
+        invalidIcon = iconManager.getIcon("cross");
+    }
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/ui_swing/components/renderers/ErrorLevelIconCellRenderer.java

@@ -22,26 +22,28 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.IconManager;
 
 import javax.swing.JLabel;
-
 import javax.swing.table.DefaultTableCellRenderer;
 
 /** List cell renderer for dates. */
 public final class ErrorLevelIconCellRenderer extends DefaultTableCellRenderer {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Icon manager to get icons from. */
-    private final IconManager iconManager = new IconManager(IdentityManager
-            .getGlobalConfig());
+    private final IconManager iconManager;
+
+    /**
+     * Creates a new renderer.
+     *
+     * @param iconManager Icon manager
+     */
+    public ErrorLevelIconCellRenderer(final IconManager iconManager) {
+        this.iconManager = iconManager;
+    }
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/ui_swing/components/renderers/MapEntryRenderer.java

@@ -50,7 +50,7 @@ public final class MapEntryRenderer extends DefaultListCellRenderer {
         if (value == null) {
             setText("Any");
         } else if (value instanceof Entry) {
-            setText((String) ((Entry) value).getValue());
+            setText((String) ((Entry<?, ?>) value).getValue());
         } else {
             setText(value.toString());
         }

src/com/dmdirc/addons/ui_swing/components/renderers/NicklistRenderer.java

@@ -91,7 +91,7 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
             setBackground(altBackgroundColour);
         }
 
-        final Map map = ((ChannelClientInfo) value).getMap();
+        final Map<?, ?> map = ((ChannelClientInfo) value).getMap();
 
         if (showColours && map != null) {
             if (map.containsKey(ChannelClientProperty.NICKLIST_FOREGROUND)) {

src/com/dmdirc/addons/ui_swing/components/renderers/ReorderableJListCellRenderer.java

@@ -40,13 +40,6 @@ import net.miginfocom.swing.MigLayout;
  */
 public class ReorderableJListCellRenderer implements ListCellRenderer {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
     /** Parent list. */
     private final ReorderableJList parent;
 

src/com/dmdirc/addons/ui_swing/components/renderers/TopicCellRenderer.java

@@ -39,13 +39,6 @@ import net.miginfocom.swing.MigLayout;
  */
 public class TopicCellRenderer implements TableCellRenderer {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
     /**
      * {@inheritDoc}
      *

src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPanel.java

@@ -50,11 +50,7 @@ import javax.swing.SwingUtilities;
 public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
         ErrorListener, ActionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 2;
     /** non error state image icon. */
     private final Icon DEFAULT_ICON;
@@ -109,7 +105,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new ErrorPopup(this, mainFrame);
+        return new ErrorPopup(controller, this, mainFrame);
     }
 
     /** Clears the error. */
@@ -149,7 +145,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
                 if (errors.isEmpty()) {
                     setVisible(false);
                 } else {
-                    for (ProgramError error : errors) {
+                    for (final ProgramError error : errors) {
                         if (errorLevel == null ||
                                 !error.getLevel().moreImportant(errorLevel)) {
                             errorLevel = error.getLevel();
@@ -251,7 +247,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
         } else {
             final Collection<ProgramError> errors =
                     ErrorManager.getErrorManager().getErrors();
-            for (ProgramError error : errors) {
+            for (final ProgramError error : errors) {
                 ErrorManager.getErrorManager().deleteError(error);
             }
         }

src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPopup.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
@@ -39,27 +39,28 @@ import javax.swing.JPanel;
 import javax.swing.JSeparator;
 
 /**
- * Shows a breakdown of errors that have occured.
+ * Shows a breakdown of errors that have occurred.
  *
  * @since 0.6.3m1
  */
 public class ErrorPopup extends StatusbarPopupWindow {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
+    /** Icon manager. */
+    private final IconManager iconManager;
 
     /**
      * Creates a new error popup.
      *
+     * @param controller Swing controller
      * @param parent Parent panel
      * @param parentWindow Parent window
      */
-    public ErrorPopup(final JPanel parent, final Window parentWindow) {
-        super(parent, parentWindow);
+    public ErrorPopup(final SwingController controller, final JPanel parent,
+            final Window parentWindow) {
+        super(controller, parent, parentWindow);
+        iconManager = controller.getIconManager();
     }
 
     /** {@inheritDoc} */
@@ -72,7 +73,7 @@ public class ErrorPopup extends StatusbarPopupWindow {
         final MapList<ErrorReportStatus, ProgramError> statuses
                 = new MapList<ErrorReportStatus, ProgramError>();
 
-        for (ProgramError error : errors) {
+        for (final ProgramError error : errors) {
             buckets.add(error.getLevel(), error);
             statuses.add(error.getReportStatus(), error);
         }
@@ -85,13 +86,12 @@ public class ErrorPopup extends StatusbarPopupWindow {
         header.setFont(header.getFont().deriveFont(Font.BOLD));
         panel.add(header, "growx, pushx, wrap");
 
-        for (ErrorLevel level : ErrorLevel.values()) {
+        for (final ErrorLevel level : ErrorLevel.values()) {
             if (buckets.containsKey(level)) {
                 final int count = buckets.values(level).size();
 
-                panel.add(new JLabel(level.toString(),
-                        new IconManager(IdentityManager.getGlobalConfig())
-                        .getIcon(level.getIcon()), JLabel.LEFT));
+                panel.add(new JLabel(level.toString(), iconManager.getIcon(
+                        level.getIcon()), JLabel.LEFT));
                 panel.add(new JLabel(String.valueOf(count), JLabel.RIGHT),
                         "growx, pushx, wrap");
             }
@@ -107,7 +107,7 @@ public class ErrorPopup extends StatusbarPopupWindow {
         header.setFont(header.getFont().deriveFont(Font.BOLD));
         panel.add(header, "growx, pushx, wrap");
 
-        for (ErrorReportStatus status : ErrorReportStatus.values()) {
+        for (final ErrorReportStatus status : ErrorReportStatus.values()) {
             if (statuses.containsKey(status)) {
                 final int count = statuses.values(status).size();
 

src/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java

@@ -24,8 +24,6 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
@@ -69,8 +67,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
         show = new JMenuItem("Open");
         final JMenuItem dismiss = new JMenuItem("Dismiss");
 
-        setIcon(new IconManager(IdentityManager.getGlobalConfig()).getIcon(
-                "feedback"));
+        setIcon(controller.getIconManager().getIcon("feedback"));
         setBorder(BorderFactory.createEtchedBorder());
         setToolTipText("We would appreciate any feedback you may have about "
                 + "DMDirc.");
@@ -112,7 +109,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     @Override
     public void mouseReleased(final MouseEvent e) {
         if (e.getButton() == 1) {
-            FeedbackDialog.showFeedbackDialog(controller.getMainFrame());
+            controller.showDialog(FeedbackDialog.class);
             controller.getSwingStatusBar().removeComponent(this);
         }
         checkMouseEvent(e);
@@ -157,7 +154,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == show) {
-            FeedbackDialog.showFeedbackDialog(controller.getMainFrame());
+            controller.showDialog(FeedbackDialog.class);
         }
         controller.getSwingStatusBar().removeComponent(this);
     }

src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -70,6 +70,8 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     private final JMenuItem accept;
     /** Main frame. */
     private final MainFrame mainFrame;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Active server. */
     private Server activeServer;
 
@@ -83,6 +85,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
             final MainFrame mainFrame) {
         super(new JLabel());
 
+        this.controller = controller;
         this.mainFrame = mainFrame;
 
         setBorder(BorderFactory.createEtchedBorder());
@@ -97,7 +100,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         accept.setActionCommand("acceptAll");
         accept.addActionListener(this);
 
-        for (Server server : ServerManager.getServerManager().getServers()) {
+        for (final Server server : ServerManager.getServerManager().getServers()) {
             server.addInviteListener(this);
         }
 
@@ -115,7 +118,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new InvitePopup(this, activeServer, mainFrame);
+        return new InvitePopup(controller, this, activeServer, mainFrame);
     }
 
     /**
@@ -125,7 +128,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         menu.removeAll();
 
         final Collection<Invite> invites = activeServer.getInvites();
-        for (Invite invite : invites) {
+        for (final Invite invite : invites) {
             menu.add(new JMenuItem(new InviteAction(invite)));
         }
         menu.add(new JSeparator());

src/com/dmdirc/addons/ui_swing/components/statusbar/InvitePopup.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.Invite;
 import com.dmdirc.Server;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.util.DateUtils;
 
 import java.awt.Window;
@@ -50,20 +51,21 @@ public class InvitePopup extends StatusbarPopupWindow {
     /**
      * Creates a new InvitePopup for the specified panel and server.
      *
+     * @param controller Swing controller
      * @param parent The parent of this popup
      * @param server The server to show invites for
      * @param parentWindow Parent window
      */
-    public InvitePopup(final JPanel parent, final Server server,
-            final Window parentWindow) {
-        super(parent, parentWindow);
+    public InvitePopup(final SwingController controller, final JPanel parent,
+            final Server server, final Window parentWindow) {
+        super(controller, parent, parentWindow);
         this.server = server;
     }
 
     /** {@inheritDoc} */
     @Override
     protected void initContent(final JPanel panel) {
-        for (Invite invite : server.getInvites()) {
+        for (final Invite invite : server.getInvites()) {
             panel.add(new JLabel(invite.getChannel()), "growx, pushx");
             panel.add(new JLabel(invite.getSource()[0], JLabel.CENTER),
                     "growx, pushx, al center");

src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

@@ -22,11 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.ui.StatusMessage;
 
 import java.awt.Window;
 import java.awt.event.MouseEvent;
@@ -67,23 +66,25 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
     private StatusMessage currentMessage;
     /** Timer to clear the message. */
     private transient TimerTask messageTimer;
-    /** Config manager to read settings from. */
-    private ConfigManager config;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Instantiates a new message label.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window
-     * @param config Config manager to read settings from
      */
-    public MessageLabel(final Window parentWindow, final ConfigManager config) {
+    public MessageLabel(final SwingController controller,
+            final Window parentWindow) {
         super(new MigLayout("fill, ins 0, gap 0  0"));
-        this.config = config;
+        this.controller = controller;
         queue = new ConcurrentLinkedQueue<StatusMessage>();
-        defaultMessage = new StatusMessage(null, "Ready.", null, -1, config);
+        defaultMessage = new StatusMessage(null, "Ready.", null, -1,
+                controller.getGlobalConfig());
         currentMessage = defaultMessage;
         label = new JLabel();
-        historyLabel = new MessagePopup(this, parentWindow, config);
+        historyLabel = new MessagePopup(this, parentWindow, controller);
         label.setText("Ready.");
         label.setBorder(new SidelessEtchedBorder(
                 SidelessEtchedBorder.Side.RIGHT));
@@ -117,7 +118,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
                 if (currentMessage.getIconType() == null) {
                     label.setIcon(null);
                 } else {
-                    label.setIcon(new IconManager(config).getIcon(
+                    label.setIcon(controller.getIconManager().getIcon(
                             currentMessage.getIconType()));
                 }
                 label.setText(UIUtilities.clipStringifNeeded(MessageLabel.this,

src/com/dmdirc/addons/ui_swing/components/statusbar/MessagePopup.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.ui.StatusMessage;
 
 import java.awt.Color;
@@ -57,31 +56,31 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
     private final List<StatusMessage> messages;
     /** Parent panel. */
     private final JPanel parent;
-    /** Config manager. */
-    private final ConfigManager configManager;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new message history popup.
      *
      * @param parent Parent to size against
      * @param parentWindow Parent window
-     * @param configManager Config manager
+     * @param controller Swing controller
      */
     public MessagePopup(final JPanel parent, final Window parentWindow,
-            final ConfigManager configManager) {
+            final SwingController controller) {
         super(new JLabel("^"),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.LEFT),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.TOP));
         this.parentWindow = parentWindow;
         this.parent = parent;
-        this.configManager = configManager;
+        this.controller = controller;
         messages = new ArrayList<StatusMessage>();
     }
 
     /* {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new MessageHistoryPanel(this);
+        return new MessageHistoryPanel(controller, this);
     }
 
     /* {@inheritDoc} */
@@ -144,8 +143,9 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
          *
          * @param window Parent window
          */
-        public MessageHistoryPanel(final JPanel parent) {
-            super(parent, parentWindow);
+        public MessageHistoryPanel(final SwingController controller,
+                final JPanel parent) {
+            super(controller, parent, parentWindow);
         }
 
         /* {@inheritDoc} */
@@ -167,9 +167,9 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
                 return;
             }
 
-            for (StatusMessage message : messages) {
+            for (final StatusMessage message : messages) {
                 panel.add(new JLabel(message.getMessage(), message.getIconType()
-                        == null ? null : new IconManager(configManager)
+                        == null ? null : controller.getIconManager()
                         .getIcon(message.getIconType()), SwingConstants.LEFT),
                         "grow, push, wrap");
             }

src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPopupWindow.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.Point;
@@ -55,11 +56,13 @@ public abstract class StatusbarPopupWindow extends StandardDialog {
     /**
      * Creates a new status bar popup window.
      *
+     * @param controller Swing controller
      * @param parent The {@link JPanel} to use for positioning
      * @param parentWindow Parent window
      */
-    public StatusbarPopupWindow(final JPanel parent, final Window parentWindow) {
-        super(parentWindow, ModalityType.MODELESS);
+    public StatusbarPopupWindow(final SwingController controller,
+            final JPanel parent, final Window parentWindow) {
+        super(controller, parentWindow, ModalityType.MODELESS);
 
         this.parent = parent;
         this.parentWindow = parentWindow;
@@ -97,8 +100,8 @@ public abstract class StatusbarPopupWindow extends StandardDialog {
      */
     protected Point getPopupLocation() {
         final Point point = parent.getLocationOnScreen();
-        point.translate(parent.getWidth() / 2 - this.getWidth() / 2,
-                - this.getHeight());
+        point.translate(parent.getWidth() / 2 - getWidth() / 2,
+                - getHeight());
         final int maxX = Math.max(parentWindow.getLocationOnScreen().x
                 + parentWindow.getWidth() - 10 - getWidth(),
                 parent.getLocationOnScreen().x + parent.getWidth() - 1

src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java

@@ -24,11 +24,11 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.interfaces.ui.StatusBar;
+import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.interfaces.ui.StatusBar;
-import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.Component;
 import java.util.Arrays;
@@ -69,8 +69,7 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
             final MainFrame mainFrame) {
         super();
 
-        messageLabel = new MessageLabel(mainFrame,
-                controller.getGlobalConfig());
+        messageLabel = new MessageLabel(controller, mainFrame);
         errorPanel = new ErrorPanel(controller, mainFrame, this);
         updateLabel = new UpdaterLabel(controller);
         inviteLabel = new InviteLabel(controller, mainFrame);
@@ -104,7 +103,7 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
                     "instance of java.awt.component"));
             return;
         }
-        if (!Arrays.asList(getComponents()).contains((Component) component)) {
+        if (!Arrays.asList(getComponents()).contains(component)) {
             SwingUtilities.invokeLater(new Runnable() {
 
                 /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java

@@ -31,14 +31,11 @@ import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateChecker.STATE;
 import com.dmdirc.updater.UpdateCheckerListener;
 
-import java.awt.Dialog.ModalityType;
 import java.awt.event.MouseEvent;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 
-import lombok.Getter;
-
 /**
  * Updater label is responsible for handling the display of updates in the
  * status bar.
@@ -53,7 +50,6 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
      */
     private static final long serialVersionUID = 1;
     /** Swing controller. */
-    @Getter
     private final SwingController controller;
 
     /**
@@ -84,12 +80,11 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
             if (UpdateChecker.getStatus().equals(
                     UpdateChecker.STATE.RESTART_REQUIRED)) {
-                SwingRestartDialog.showSwingRestartDialog(controller
-                        .getMainFrame(), ModalityType.MODELESS);
+                controller.showDialog(SwingRestartDialog.class);
             } else if (!UpdateChecker.getStatus().equals(
                     UpdateChecker.STATE.CHECKING)) {
-                SwingUpdaterDialog.showSwingUpdaterDialog(UpdateChecker
-                        .getAvailableUpdates(), controller.getMainFrame());
+                controller.showDialog(SwingUpdaterDialog.class, UpdateChecker
+                        .getAvailableUpdates());
             }
         }
     }
@@ -118,6 +113,6 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new UpdaterPopup(this, controller.getMainFrame());
+        return new UpdaterPopup(controller, this, controller.getMainFrame());
     }
 }

src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterPopup.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.updater.Update;
 import com.dmdirc.updater.UpdateChecker;
 
@@ -49,11 +50,13 @@ public class UpdaterPopup extends StatusbarPopupWindow {
     /**
      * Creates a new popup window for the specified panel and window.
      *
+     * @param controller Swing controller
      * @param parent The panel that owns this popup
      * @param parentWindow The Window that owns this popup
      */
-    public UpdaterPopup(final JPanel parent, final Window parentWindow) {
-        super(parent, parentWindow);
+    public UpdaterPopup(final SwingController controller, final JPanel parent,
+            final Window parentWindow) {
+        super(controller, parent, parentWindow);
     }
 
     /** {@inheritDoc} */
@@ -79,7 +82,7 @@ public class UpdaterPopup extends StatusbarPopupWindow {
 
             panel.add(new JSeparator(), "span, growx, pushx, wrap");
 
-            for (Update update : updates) {
+            for (final Update update : updates) {
                 panel.add(new JLabel(update.getComponent().getFriendlyName()),
                         "growx, pushx");
                 panel.add(new JLabel(update.getRemoteVersion(), JLabel.CENTER),

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

@@ -26,8 +26,6 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 
-import java.awt.Dialog.ModalityType;
-
 /**
  * A dialog to prompt the user for a channel and then join that channel.
  */

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

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.addons.ui_swing.dialogs;
 
-import java.awt.Window;
+import com.dmdirc.addons.ui_swing.SwingController;
 
 /**
  * A simple dialog to confirm and handle the quitting of the client.
@@ -39,10 +39,10 @@ public abstract class ConfirmQuitDialog extends StandardQuestionDialog {
     /**
      * Creates a new client quit confirmation dialog.
      *
-     * @param window Parent window
+     * @param controller Swing controller
      */
-    public ConfirmQuitDialog(final Window window) {
-        super(window, ModalityType.APPLICATION_MODAL, "Quit confirm",
+    public ConfirmQuitDialog(final SwingController controller) {
+        super(controller, ModalityType.APPLICATION_MODAL, "Quit confirm",
                     "You are about to quit DMDirc, are you sure?");
     }
 

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

@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2006-2011 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.dialogs;
+
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
+import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
+import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ui.StatusBar;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.core.util.URLHandler;
+import com.dmdirc.util.SimpleInjector;
+
+import java.awt.Window;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Manages the DMDirc dialogs, creates and disposes as required to ensure only
+ * the required number exist at any one time.
+ */
+public class DialogManager {
+
+    /** Controller used for standard parameters for dependency injection. */
+    private final SwingController controller;
+    /** Stores all known dialogs in this manager. */
+    private final Map<Class<? extends StandardDialog>, StandardDialog> dialogs;
+
+    /**
+     * Creates a new instance of the dialog manager.
+     *
+     * @param controller Parent Swing controller
+     */
+    public DialogManager(final SwingController controller) {
+        this.controller = controller;
+        dialogs = Collections.synchronizedMap(
+                new HashMap<Class<? extends StandardDialog>, StandardDialog>());
+    }
+
+    /**
+     * Creates, or retrieves, an instance of the specified dialog and displays
+     * this dialog to the user. For more details on what parameters might be
+     * required see {@link DialogManager#getDialog(Class, Object...)}
+     *
+     * @see DialogManager#getDialog(Class, Object...) getDialog
+     *
+     * @param klass The class of the dialog to show
+     * @param params Any non standard parameters required
+     *
+     * @return Dialog instance
+     */
+    public <T extends StandardDialog> T showDialog(final Class<T> klass,
+            final Object... params) {
+        final T dialog = getDialog(klass, params);
+        dialog.display();
+        return dialog;
+    }
+
+    /**
+     * Creates, or retrieves, an instance of the specified dialog.
+     *
+     * The following parameters will automatically be provided when creating a
+     * dialog, any extra parameters will need to be provided.
+     * <ul>
+     *   <li>SwingController</li>
+     *   <li>IconManager</li>
+     *   <li>IdentityManager</li>
+     *   <li>ConfigManager</li>
+     *   <li>MainFrame</li>
+     *   <li>Window</li>
+     *   <li>SwingStatusBar</li>
+     *   <li>StatusBar</li>
+     *   <li>SwingWindowFactory</li>
+     *   <li>URLHandler</li>
+     *   <li>DialogManager</li>
+     * </ul>
+     *
+     * @param klass The class of the dialog to show
+     * @param params Any non standard parameters required
+     *
+     * @return Dialog instance
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends StandardDialog> T getDialog(final Class<T> klass,
+            final Object... params) {
+        final T instance;
+        if (dialogs.containsKey(klass)) {
+            instance = (T) dialogs.get(klass);
+        } else {
+            final SimpleInjector injector = getInjector(params);
+            instance = injector.createInstance(klass);
+
+            dialogs.put(instance.getClass(), instance);
+        }
+        return instance;
+    }
+
+    /**
+     * Creates and initialises the a dependency injector that can be used to
+     * create a dialog.
+     *
+     * The following parameters will automatically be provided when creating a
+     * dialog, any extra parameters will need to be provided.
+     * <ul>
+     *   <li>SwingController</li>
+     *   <li>IconManager</li>
+     *   <li>IdentityManager</li>
+     *   <li>ConfigManager</li>
+     *   <li>MainFrame</li>
+     *   <li>Window</li>
+     *   <li>SwingStatusBar</li>
+     *   <li>StatusBar</li>
+     *   <li>SwingWindowFactory</li>
+     *   <li>URLHandler</li>
+     *   <li>DialogManager</li>
+     * </ul>
+     *
+     * @param params Extra parameters to inject.
+     *
+     * @return Injector with parameters added
+     */
+    private SimpleInjector getInjector(final Object... params) {
+        final SimpleInjector injector = new SimpleInjector();
+
+        injector.addParameter(SwingController.class, controller);
+        injector.addParameter(IconManager.class, controller.getIconManager());
+        injector.addParameter(IdentityManager.class, controller.getIdentityManager());
+        injector.addParameter(ConfigManager.class, controller.getGlobalConfig());
+        injector.addParameter(MainFrame.class, controller.getMainFrame());
+        injector.addParameter(Window.class, controller.getMainFrame());
+        injector.addParameter(SwingStatusBar.class, controller.getSwingStatusBar());
+        injector.addParameter(StatusBar.class, controller.getSwingStatusBar());
+        injector.addParameter(SwingWindowFactory.class, controller.getWindowFactory());
+        injector.addParameter(URLHandler.class, controller.getURLHandler());
+        injector.addParameter(DialogManager.class, this);
+
+        for (final Object param : params) {
+            injector.addParameter(param);
+        }
+
+        return injector;
+    }
+
+    /**
+     * Closes the previously created instance of a dialog.
+     *
+     * @param klass The class of the dialog to show
+     */
+    public void close(final Class<? extends StandardDialog> klass) {
+        final StandardDialog dialog = dispose(klass);
+        if (dialog != null) {
+            dialog.dispose();
+        }
+    }
+
+    /**
+     * Removes a previously created instance of a dialog from the dialog
+     * manager.
+     *
+     * @param klass The class of the dialog to show
+     *
+     * @return Instance of the dialog that has been removed or null if there
+     * was no dialog created
+     */
+    public StandardDialog dispose(final Class<? extends StandardDialog> klass) {
+        if (dialogs.containsKey(klass)) {
+            return dialogs.remove(dialogs.get(klass));
+        }
+        return null;
+    }
+
+    /**
+     * Removes a previously created instance of a dialog from the dialog
+     * manager.
+     *
+     * @param klass The class of the dialog to show
+     *
+     * @return Instance of the dialog that has been removed or null if there
+     * was no dialog created
+     */
+    public StandardDialog dispose(final StandardDialog dialog) {
+        if (dialogs.containsKey(dialog.getClass())) {
+            return dispose(dialog.getClass());
+        }
+        return null;
+    }
+}

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.ui.core.util.Info;
 
 import java.awt.Insets;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -46,20 +45,17 @@ import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
+import lombok.AutoGenMethodStub;
+
 import net.miginfocom.swing.MigLayout;
 
 /** Feedback form. */
+@AutoGenMethodStub
 public final class FeedbackDialog extends StandardDialog implements
         ActionListener, DocumentListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** A previously created instance of FeedbackDialog. */
-    private static FeedbackDialog me;
     /** Information label. */
     private TextLabel info;
     /** Name field. */
@@ -78,10 +74,10 @@ public final class FeedbackDialog extends StandardDialog implements
     /**
      * Instantiates the feedback dialog.
      *
-     * @param parentWindow Parent window
+     * @param controller Swing controller
      */
-    private FeedbackDialog(final Window parentWindow) {
-        super(parentWindow, ModalityType.MODELESS);
+    public FeedbackDialog(final SwingController controller) {
+        super(controller, ModalityType.MODELESS);
 
         initComponents();
         layoutComponents();
@@ -91,41 +87,6 @@ public final class FeedbackDialog extends StandardDialog implements
         setResizable(false);
     }
 
-    /**
-     * Creates the new feedback dialog if one doesn't exist, and displays it.
-     *
-     * @param parentWindow Parent window
-     */
-    public static void showFeedbackDialog(final Window parentWindow) {
-        me = getFeedbackDialog(parentWindow);
-
-        me.display();
-        me.requestFocusInWindow();
-    }
-
-    /**
-     * Returns the current instance of the FeedbackDialog.
-     *
-     * @param parentWindow Parent window
-     *
-     * @return The current FeedbackDialog instance
-     */
-    public static FeedbackDialog getFeedbackDialog(final Window parentWindow) {
-        synchronized (FeedbackDialog.class) {
-            if (me == null) {
-                me = new FeedbackDialog(parentWindow);
-                me.serverCheckbox.setEnabled(ServerManager.getServerManager().
-                        numServers() > 0);
-            } else if (!me.isVisible()) {
-                me = new FeedbackDialog(parentWindow);
-                me.serverCheckbox.setEnabled(ServerManager.getServerManager().
-                    numServers() > 0);
-            }
-        }
-
-        return me;
-    }
-
     /** Initialises the components. */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
@@ -258,7 +219,7 @@ public final class FeedbackDialog extends StandardDialog implements
             dmdircInfo.append("Look & Feel: ").append(
                     SwingController.getLookAndFeel());
         }
-        new SendWorker(me, name.getText().trim(), email.getText().trim(),
+        new SendWorker(this, name.getText().trim(), email.getText().trim(),
                 feedback.getText().trim(), serverInfo.toString().trim(),
                 dmdircInfo.toString().trim()).executeInExecutor();
     }
@@ -288,33 +249,23 @@ public final class FeedbackDialog extends StandardDialog implements
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * @{inheritDoc}
+     *
+     * @param e Document event
+     */
     @Override
     public void insertUpdate(final DocumentEvent e) {
         validateInput();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @param e Document event
+     */
     @Override
     public void removeUpdate(final DocumentEvent e) {
         validateInput();
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public void changedUpdate(final DocumentEvent e) {
-    //Ignore
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void dispose() {
-        if (me == null) {
-            return;
-        }
-        synchronized (me) {
-            super.dispose();
-            me = null;
-        }
-    }
 }

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxSelectionListener;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.validators.PortValidator;
@@ -63,14 +62,8 @@ import net.miginfocom.swing.MigLayout;
 public final class NewServerDialog extends StandardDialog implements
         ActionListener, VetoableComboBoxSelectionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 8;
-    /** A previously created instance of NewServerDialog. */
-    private static volatile NewServerDialog me;
     /** checkbox. */
     private JCheckBox newServerWindowCheck;
     /** checkbox. */
@@ -85,8 +78,6 @@ public final class NewServerDialog extends StandardDialog implements
     private JComboBox identityField;
     /** button. */
     private JButton editProfileButton;
-    /** Swing controller. */
-    private final SwingController controller;
     /**  Opening new server? */
     private boolean openingServer = false;
 
@@ -95,10 +86,8 @@ public final class NewServerDialog extends StandardDialog implements
      *
      * @param mainFrame Main frame
      */
-    private NewServerDialog(final SwingController controller) {
-        super(controller.getMainFrame(), ModalityType.MODELESS);
-
-        this.controller = controller;
+    public NewServerDialog(final SwingController controller) {
+        super(controller, controller.getMainFrame(), ModalityType.MODELESS);
 
         initComponents();
         layoutComponents();
@@ -117,51 +106,13 @@ public final class NewServerDialog extends StandardDialog implements
         serverField.requestFocus();
     }
 
-    /**
-     * Creates the new server dialog if one doesn't exist, and displays it.
-     *
-     * @param controller Swing controller
-     */
-    public static void showNewServerDialog(final SwingController controller) {
-        me = getNewServerDialog(controller);
-
-        me.display();
-    }
-
-    /**
-     * Returns the current instance of the NewServerDialog.
-     *
-     * @param controller Swing controller
-     *
-     * @return The current NewServerDialog instance
-     */
-    public static NewServerDialog getNewServerDialog(
-            final SwingController controller) {
-        synchronized (NewServerDialog.class) {
-            if (me == null) {
-                me = new NewServerDialog(controller);
-            }
-        }
-
-        return me;
-    }
-
-    /**
-     * Is the new server dialog showing?
-     *
-     * @return true iif the NSD is showing
-     */
-    public static synchronized boolean isNewServerDialogShowing() {
-        return me != null;
-    }
-
     /** Updates the values to defaults. */
     private void update() {
-        serverField.setText(controller.getGlobalConfig().getOption("general",
+        serverField.setText(getController().getGlobalConfig().getOption("general",
                 "server"));
-        portField.setText(controller.getGlobalConfig().getOption("general",
+        portField.setText(getController().getGlobalConfig().getOption("general",
                 "port"));
-        passwordField.setText(controller.getGlobalConfig().getOption("general",
+        passwordField.setText(getController().getGlobalConfig().getOption("general",
                 "password"));
         sslCheck.setSelected(false);
         newServerWindowCheck.setEnabled(false);
@@ -169,7 +120,7 @@ public final class NewServerDialog extends StandardDialog implements
         serverField.requestFocusInWindow();
 
         if (ServerManager.getServerManager().numServers() == 0 ||
-                controller.getMainFrame().getActiveFrame() == null) {
+                getController().getMainFrame().getActiveFrame() == null) {
             newServerWindowCheck.setSelected(true);
             newServerWindowCheck.setEnabled(false);
         } else {
@@ -194,9 +145,9 @@ public final class NewServerDialog extends StandardDialog implements
      * Initialises the components in this dialog.
      */
     private void initComponents() {
-        serverField = new ValidatingJTextField(controller.getIconManager(),
+        serverField = new ValidatingJTextField(getController().getIconManager(),
                 new ServerNameValidator());
-        portField = new ValidatingJTextField(controller.getIconManager(),
+        portField = new ValidatingJTextField(getController().getIconManager(),
                 new PortValidator());
         passwordField = new JPasswordField();
         newServerWindowCheck = new JCheckBox();
@@ -225,8 +176,8 @@ public final class NewServerDialog extends StandardDialog implements
 
     /** Populates the profiles list. */
     public void populateProfiles() {
-        final List<Identity> profiles = IdentityManager.getCustomIdentities(
-                "profile");
+        final List<Identity> profiles = getController().getIdentityManager()
+                .getIdentitiesByType("profile");
         ((DefaultComboBoxModel) identityField.getModel()).removeAllElements();
         for (Identity profile : profiles) {
             ((DefaultComboBoxModel) identityField.getModel()).addElement(profile);
@@ -291,7 +242,7 @@ public final class NewServerDialog extends StandardDialog implements
             // Open in a new window?
             if (newServerWindowCheck.isSelected()
                     || ServerManager.getServerManager().numServers() == 0
-                    || controller.getMainFrame().getActiveFrame() == null) {
+                    || getController().getMainFrame().getActiveFrame() == null) {
 
                 new LoggingSwingWorker<Void, Void>() {
                     @Override
@@ -302,7 +253,7 @@ public final class NewServerDialog extends StandardDialog implements
                     }
                 }.executeInExecutor();
             } else {
-                final Server server = controller.getMainFrame()
+                final Server server = getController().getMainFrame()
                         .getActiveFrame().getContainer().getServer();
 
                 new LoggingSwingWorker<Void, Void>() {
@@ -335,7 +286,7 @@ public final class NewServerDialog extends StandardDialog implements
         if (e.getSource() == getOkButton()) {
             save();
         } else if (e.getSource() == editProfileButton) {
-            ProfileManagerDialog.showProfileManagerDialog(controller);
+            getController().showDialog(ProfileManagerDialog.class);
         } else if (e.getSource() == getCancelButton()) {
             dispose();
         }
@@ -348,18 +299,6 @@ public final class NewServerDialog extends StandardDialog implements
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void dispose() {
-        if (me == null) {
-            return;
-        }
-        synchronized (NewServerDialog.this) {
-            super.dispose();
-            me = null;
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public boolean selectionChanged(final VetoableChangeEvent e) {

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

@@ -22,7 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.ui.CoreUIUtils;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.Component;
 import java.awt.Dialog;
@@ -37,17 +40,21 @@ import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
 
+import lombok.Getter;
+
 /**
  * Provides common methods for dialogs.
  */
+@SuppressWarnings("unused")
 public class StandardDialog extends JDialog {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
+    /** Dialog manager. */
+    private final DialogManager dialogManager;
+    /** Swing controller. */
+    @Getter
+    private SwingController controller;
     /** The OK button for this frame. */
     private JButton okButton;
     /** The cancel button for this frame. */
@@ -55,14 +62,65 @@ public class StandardDialog extends JDialog {
     /** Parent window. */
     private Window owner;
 
+
+
+    /**
+     * Creates a new instance of StandardDialog.
+     *
+     * @param controller Parent swing controller
+     * @param modal Whether to display modally or not
+     */
+    public StandardDialog(final SwingController controller,
+            final ModalityType modal) {
+        super(controller.getMainFrame(), modal);
+        this.owner = controller.getMainFrame();
+        this.controller = controller;
+        dialogManager = controller.getDialogManager();
+
+        if (owner != null) {
+            setIconImages(owner.getIconImages());
+        }
+        orderButtons(new JButton(), new JButton());
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+    }
+
     /**
      * Creates a new instance of StandardDialog.
+     *
+     * @param controller Parent swing controller
+     * @param modal Whether to display modally or not
+     */
+    public StandardDialog(final SwingController controller,
+            final boolean modal) {
+        super(controller.getMainFrame(), modal);
+        this.owner = controller.getMainFrame();
+        this.controller = controller;
+        dialogManager = controller.getDialogManager();
+
+        if (owner != null) {
+            setIconImages(owner.getIconImages());
+        }
+        orderButtons(new JButton(), new JButton());
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+    }
+
+    /**
+     * Creates a new instance of StandardDialog.
+     *
+     * @param controller Parent swing controller
      * @param owner The frame that owns this dialog
      * @param modal Whether to display modally or not
      */
-    public StandardDialog(final Frame owner, final boolean modal) {
+    public StandardDialog(final SwingController controller, final Frame owner,
+            final boolean modal) {
         super(owner, modal);
         this.owner = owner;
+        this.controller = controller;
+        if (controller != null) {
+            dialogManager = controller.getDialogManager();
+        } else {
+            dialogManager = null;
+        }
 
         if (owner != null) {
             setIconImages(owner.getIconImages());
@@ -73,12 +131,21 @@ public class StandardDialog extends JDialog {
 
     /**
      * Creates a new instance of StandardDialog.
+     *
+     * @param controller Parent swing controller
      * @param owner The frame that owns this dialog
      * @param modal Whether to display modally or not
      */
-    public StandardDialog(final Window owner, final ModalityType modal) {
+    public StandardDialog(final SwingController controller, final Window owner,
+            final ModalityType modal) {
         super(owner, modal);
         this.owner = owner;
+        this.controller = controller;
+        if (controller != null) {
+            dialogManager = controller.getDialogManager();
+        } else {
+            dialogManager = null;
+        }
 
         if (owner != null) {
             setIconImages(owner.getIconImages());
@@ -89,12 +156,21 @@ public class StandardDialog extends JDialog {
 
     /**
      * Creates a new instance of StandardDialog.
+     *
+     * @param controller Parent swing controller
      * @param owner The frame that owns this dialog
      * @param modal Whether to display modally or not
      */
-    public StandardDialog(final Dialog owner, final boolean modal) {
+    public StandardDialog(final SwingController controller, final Dialog owner,
+            final boolean modal) {
         super(owner, modal);
         this.owner = owner;
+        this.controller = controller;
+        if (controller != null) {
+            dialogManager = controller.getDialogManager();
+        } else {
+            dialogManager = null;
+        }
 
         if (owner != null) {
             setIconImages(owner.getIconImages());
@@ -108,6 +184,15 @@ public class StandardDialog extends JDialog {
         super.setTitle("DMDirc: " + title);
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void dispose() {
+        if (dialogManager != null) {
+            dialogManager.dispose(this);
+        }
+        super.dispose();
+    }
+
     /**
      * Displays the dialog centering on the parent window.
      */
@@ -323,4 +408,22 @@ public class StandardDialog extends JDialog {
         executeAction(getCancelButton());
         return true;
     }
+
+    /**
+     * Returns the Swing main frame.
+     *
+     * @return Main frame
+     */
+    public MainFrame getMainFrame() {
+        return getController().getMainFrame();
+    }
+
+    /**
+     * Returns the icon manager.
+     *
+     * @return Icon manager
+     */
+    public IconManager getIconManager() {
+        return getController().getIconManager();
+    }
 }

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

@@ -48,6 +48,8 @@ import net.miginfocom.swing.MigLayout;
  */
 public abstract class StandardInputDialog extends StandardDialog {
 
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1;
     /** Validator. */
     private Validator<String> validator;
     /** Text field. */
@@ -58,8 +60,6 @@ public abstract class StandardInputDialog extends StandardDialog {
     private String message;
     /** Are we saving? */
     protected final AtomicBoolean saving = new AtomicBoolean(false);
-    /** Swing controller. */
-    private final SwingController controller;
 
     /**
      * Instantiates a new standard input dialog.
@@ -97,9 +97,8 @@ public abstract class StandardInputDialog extends StandardDialog {
             final Window owner, final ModalityType modal,
             final String title, final String message,
             final Validator<String> validator) {
-        super(owner, modal);
+        super(controller, owner, modal);
 
-        this.controller = controller;
         this.validator = validator;
         this.message = message;
 
@@ -128,10 +127,10 @@ public abstract class StandardInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        if (controller == null) {
+        if (getController() == null) {
             textField = new ValidatingJTextField(new IconManager(new ConfigManager("", "", "", "")), validator);
         } else {
-            textField = new ValidatingJTextField(controller.getIconManager(), validator);
+            textField = new ValidatingJTextField(getController().getIconManager(), validator);
         }
         blurb = new TextLabel(message);
         validateText();

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Window;
@@ -39,11 +40,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class StandardMessageDialog extends StandardDialog {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Message. */
     private final String message;
@@ -53,14 +50,16 @@ public class StandardMessageDialog extends StandardDialog {
     /**
      * Instantiates a new standard input dialog.
      *
+     * @param controller Swing controller
      * @param owner Dialog owner
      * @param modal modality type
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardMessageDialog(final Window owner, final ModalityType modal,
-            final String title, final String message) {
-        super(owner, modal);
+    public StandardMessageDialog(final SwingController controller,
+            final Window owner, final ModalityType modal, final String title,
+            final String message) {
+        super(controller, owner, modal);
 
         this.message = message;
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Window;
@@ -39,6 +40,8 @@ import net.miginfocom.swing.MigLayout;
  */
 public abstract class StandardQuestionDialog extends StandardDialog {
 
+    /** Serial version UID. */
+    private static final long serialVersionUID = 1;
     /** Message. */
     private final String message;
     /** Blurb label. */
@@ -49,14 +52,39 @@ public abstract class StandardQuestionDialog extends StandardDialog {
     /**
      * Instantiates a new standard input dialog.
      *
+     * @param controller Swing controller
      * @param owner Dialog owner
      * @param modal modality type
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardQuestionDialog(final Window owner, final ModalityType modal,
-            final String title, final String message) {
-        super(owner, modal);
+    public StandardQuestionDialog(final SwingController controller,
+            final Window owner, final ModalityType modal, final String title,
+            final String message) {
+        super(controller, owner, modal);
+
+        this.message = message;
+
+        setTitle(title);
+        setDefaultCloseOperation(StandardInputDialog.DISPOSE_ON_CLOSE);
+
+        initComponents();
+        addListeners();
+        layoutComponents();
+    }
+
+    /**
+     * Instantiates a new standard input dialog.
+     *
+     * @param controller Swing controller
+     * @param modal modality type
+     * @param title Dialog title
+     * @param message Dialog message
+     */
+    public StandardQuestionDialog(final SwingController controller,
+            final ModalityType modal, final String title,
+            final String message) {
+        super(controller, modal);
 
         this.message = message;
 

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -42,65 +42,25 @@ import net.miginfocom.swing.MigLayout;
 public final class AboutDialog extends StandardDialog implements
         ActionListener, ChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 5;
-    /** Previously created instance of AboutDialog. */
-    private static AboutDialog me = null;
     /** Tabbed pane to use. */
     private JTabbedPane tabbedPane;
     /** Credits panel. */
     private CreditsPanel cp;
     /** Tab history. */
     private int history = 0;
-    /** Parent swing controller. */
-    private SwingController controller;
-
     /**
      * Creates a new instance of AboutDialog.
      *
      * @param controller Parent controller
      */
-    private AboutDialog(final SwingController controller) {
-        super(controller.getMainFrame(), ModalityType.MODELESS);
-
-        this.controller = controller;
+    public AboutDialog(final SwingController controller) {
+        super(controller, ModalityType.MODELESS);
 
         initComponents();
     }
 
-    /**
-     * Creates the dialog if one doesn't exist, and displays it.
-     *
-     * @param controller Parent controller
-     */
-    public static void showAboutDialog(final SwingController controller) {
-        me = getAboutDialog(controller);
-
-        me.display();
-        me.requestFocusInWindow();
-    }
-
-    /**
-     * Returns the current instance of the AboutDialog.
-     *
-     * @param controller Parent controller
-     *
-     * @return The current AboutDialog instance
-     */
-    public static AboutDialog getAboutDialog(final SwingController controller) {
-        synchronized (AboutDialog.class) {
-            if (me == null) {
-                me = new AboutDialog(controller);
-            }
-        }
-
-        return me;
-    }
-
     /** Initialises the main UI components. */
     private void initComponents() {
         tabbedPane = new JTabbedPane();
@@ -114,12 +74,13 @@ public final class AboutDialog extends StandardDialog implements
         getOkButton().addActionListener(this);
         getCancelButton().addActionListener(this);
 
-        cp = new CreditsPanel(controller.getURLHandler());
+        cp = new CreditsPanel(getController().getURLHandler());
 
-        tabbedPane.add("About", new AboutPanel(controller.getURLHandler()));
+        tabbedPane.add("About", new AboutPanel(getController().getURLHandler()));
         tabbedPane.add("Credits", cp);
-        tabbedPane.add("Licences", new LicencesPanel());
-        tabbedPane.add("Information", new InfoPanel(controller));
+        tabbedPane.add("Licences", new LicencesPanel(getController()
+                .getGlobalConfig()));
+        tabbedPane.add("Information", new InfoPanel(getController()));
         tabbedPane.addChangeListener(this);
 
         getContentPane().setLayout(new MigLayout("ins rel, wrap 1, fill, " +
@@ -145,18 +106,6 @@ public final class AboutDialog extends StandardDialog implements
         return true;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void dispose() {
-        if (me == null) {
-            return;
-        }
-        synchronized (me) {
-            super.dispose();
-            me = null;
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public void stateChanged(final ChangeEvent e) {

src/com/dmdirc/addons/ui_swing/dialogs/about/InfoPanel.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.core.util.Info;
 import com.dmdirc.util.DateUtils;
 
@@ -45,14 +44,10 @@ import net.miginfocom.swing.MigLayout;
 /** Info panel. */
 public final class InfoPanel extends JPanel {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Parent controller. */
-    private SwingController controller;
+    private final SwingController controller;
 
     /**
      * Creates a new instance of InfoPanel.
@@ -63,7 +58,7 @@ public final class InfoPanel extends JPanel {
         super();
 
         this.controller = controller;
-        this.setOpaque(UIUtilities.getTabbedPaneOpaque());
+        setOpaque(UIUtilities.getTabbedPaneOpaque());
         initComponents();
     }
 
@@ -79,7 +74,7 @@ public final class InfoPanel extends JPanel {
 
          infoPane.setText("<html>"
                  + "<b>DMDirc version: </b>" + Info.getDMDircVersion() + "<br>"
-                 + "<b>Mode Alises version: </b>" + IdentityManager
+                 + "<b>Mode Alises version: </b>" + controller
                  .getGlobalConfig().getOption("identity", "modealiasversion")
                  + "<br>"
                  + "<b>Swing UI version: </b>" + controller.getVersion()

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -24,13 +24,13 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.plugins.PluginInfo;
 
 import java.awt.Font;
 import java.awt.Rectangle;
-import javax.swing.BorderFactory;
 
+import javax.swing.BorderFactory;
 import javax.swing.JEditorPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -50,14 +50,13 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Licences panel.
  */
-public final class LicencesPanel extends JPanel implements TreeSelectionListener {
+public final class LicencesPanel extends JPanel implements
+        TreeSelectionListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 3;
+    /** Config manager. */
+    private final ConfigManager config;
     /** Licence scroll pane. */
     private JScrollPane scrollPane;
     /** Licence list model */
@@ -67,10 +66,15 @@ public final class LicencesPanel extends JPanel implements TreeSelectionListener
     /** Licence list. */
     private JTree list;
 
-    /** Creates a new instance of LicencesPanel. */
-    public LicencesPanel() {
+    /**
+     * Creates a new instance of LicencesPanel.
+     *
+     * @param config Config manager
+     */
+    public LicencesPanel(final ConfigManager config) {
         super();
 
+        this.config = config;
         initComponents();
         addListeners();
         layoutComponents();
@@ -84,7 +88,7 @@ public final class LicencesPanel extends JPanel implements TreeSelectionListener
     }
 
     /**
-     *  Lays out the components.
+     * Lays out the components.
      */
     private void layoutComponents() {
         setLayout(new MigLayout("ins rel, fill"));
@@ -99,8 +103,10 @@ public final class LicencesPanel extends JPanel implements TreeSelectionListener
         list = new JTree(listModel) {
 
             /**
-             * A version number for this class. It should be changed whenever the class
-             * structure is changed (or anything else that would prevent serialized
+             * A version number for this class. It should be changed whenever
+             * the class
+             * structure is changed (or anything else that would prevent
+             * serialized
              * objects being unserialized with the new class).
              */
             private static final long serialVersionUID = 1;
@@ -145,17 +151,20 @@ public final class LicencesPanel extends JPanel implements TreeSelectionListener
         final Object userObject = ((DefaultMutableTreeNode) e.getPath().
                 getLastPathComponent()).getUserObject();
         if (userObject instanceof Licence) {
-        licence.setText(((Licence) userObject).getBody());
+            licence.setText(((Licence) userObject).getBody());
         } else if (userObject instanceof PluginInfo) {
             final PluginInfo pi = (PluginInfo) userObject;
-            licence.setText("<b>Name:</b> " + pi.getMetaData().getFriendlyName() + "<br>"
-                    + "<b>Version:</b> " + pi.getMetaData().getFriendlyVersion() + "<br>"
+            licence.setText("<b>Name:</b> "
+                    + pi.getMetaData().getFriendlyName() + "<br>"
+                    + "<b>Version:</b> "
+                    + pi.getMetaData().getFriendlyVersion() + "<br>"
                     + "<b>Author:</b> " + pi.getMetaData().getAuthor() + "<br>"
-                    + "<b>Description:</b> " + pi.getMetaData().getDescription() + "<br>");
+                    + "<b>Description:</b> "
+                    + pi.getMetaData().getDescription() + "<br>");
         } else {
             licence.setText("<b>Name:</b> DMDirc<br>"
-                    + "<b>Version:</b> " + IdentityManager.getGlobalConfig().
-                    getOption("version", "version") + "<br>"
+                    + "<b>Version:</b> " + config
+                    .getOption("version", "version") + "<br>"
                     + "<b>Desciption:</b> The intelligent IRC client");
         }
         UIUtilities.resetScrollPane(scrollPane);

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java

@@ -23,11 +23,10 @@
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -44,21 +43,17 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Action condition display panel.
  */
-public class ActionConditionDisplayPanel extends JPanel implements ActionListener,
-        PropertyChangeListener {
+public class ActionConditionDisplayPanel extends JPanel implements
+        ActionListener, PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Info label. */
     private TextLabel label;
     /** Edit button. */
     private JToggleButton editButton;
     /** Delete button. */
-    private ImageButton deleteButton;
+    private ImageButton<Object> deleteButton;
     /** Edit panel. */
     private ActionConditionEditorPanel editPanel;
     /** Listeners. */
@@ -71,11 +66,12 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon Manager
      * @param condition Action condition
      * @param trigger Action trigger
      */
-    public ActionConditionDisplayPanel(final ActionCondition condition,
-            final ActionType trigger) {
+    public ActionConditionDisplayPanel(final IconManager iconManager,
+            final ActionCondition condition, final ActionType trigger) {
         super();
 
         this.trigger = trigger;
@@ -83,7 +79,7 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
                 condition.getComponent(), condition.getComparison(),
                 condition.getTarget());
 
-        initComponents();
+        initComponents(iconManager);
         addListeners();
         layoutComponents();
         setTrigger(trigger);
@@ -91,7 +87,8 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
         layoutComponents();
 
         if (condition.getArg() == -1 && condition.getComponent() == null &&
-                condition.getComparison() == null && condition.getTarget().isEmpty()) {
+                condition.getComparison() == null
+                && condition.getTarget().isEmpty()) {
             editPanel.setVisible(true);
             editButton.setSelected(true);
         }
@@ -123,14 +120,16 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
         label.setText(updateSentence());
     }
 
-    /** Initialises the components. */
-    private void initComponents() {
-        final IconManager iconManager = new IconManager(IdentityManager
-                .getGlobalConfig());
+    /**
+     * Initialises the components.
+     *
+     * @param iconManager Icon Manager
+     */
+    private void initComponents(final IconManager iconManager) {
         label = new TextLabel("", false);
         editButton = new ImageToggleButton("edit", iconManager.
                 getIcon("edit-inactive"), iconManager.getIcon("edit"));
-        deleteButton = new ImageButton("delete", iconManager.
+        deleteButton = new ImageButton<Object>("delete", iconManager.
                 getIcon("close-inactive"), iconManager.
                 getIcon("close-inactive"), iconManager.getIcon("close-active"));
 
@@ -177,7 +176,8 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
      *
      * @param listener Listener to add
      */
-    public void addConditionListener(final ActionConditionRemovalListener listener) {
+    public void addConditionListener(
+            final ActionConditionRemovalListener listener) {
         if (listener == null) {
             return;
         }
@@ -190,7 +190,8 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
      *
      * @param listener Listener to remove
      */
-    public void removeConditionListener(final ActionConditionRemovalListener listener) {
+    public void removeConditionListener(
+            final ActionConditionRemovalListener listener) {
         listeners.remove(ActionConditionRemovalListener.class, listener);
     }
 
@@ -199,8 +200,10 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
      *
      * @param condition Removed condition
      */
-    protected void fireConditionRemoved(final ActionConditionDisplayPanel condition) {
-        for (ActionConditionRemovalListener listener : listeners.get(ActionConditionRemovalListener.class)) {
+    protected void fireConditionRemoved(
+            final ActionConditionDisplayPanel condition) {
+        for (final ActionConditionRemovalListener listener : listeners
+                .get(ActionConditionRemovalListener.class)) {
             listener.conditionRemoved(condition);
         }
     }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsListPanel.java

@@ -23,16 +23,17 @@
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.ui.IconManager;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import java.util.Map;
+
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
@@ -41,44 +42,48 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Action conditions list panel.
  */
-public class ActionConditionsListPanel extends JPanel implements ActionConditionRemovalListener,
+public class ActionConditionsListPanel extends JPanel implements
+        ActionConditionRemovalListener,
         PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Action trigger. */
-    private ActionType trigger;
     /** Conditions list. */
-    private List<ActionConditionDisplayPanel> conditions;
+    private final List<ActionConditionDisplayPanel> conditions;
     /** Condition tree panel. */
-    private ActionConditionsTreePanel treePanel;
+    private final ActionConditionsTreePanel treePanel;
     /** Condition validation results. */
-    private Map<ActionConditionDisplayPanel, Boolean> validations;
+    private final Map<ActionConditionDisplayPanel, Boolean> validations;
+    /** Icon manager. */
+    private final IconManager iconManager;
+    /** Action trigger. */
+    private ActionType trigger;
     /** validates. */
     private boolean validates = true;
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager
      * @param treePanel Condition tree panel.
      */
-    public ActionConditionsListPanel(final ActionConditionsTreePanel treePanel) {
-        this(null, new ArrayList<ActionConditionDisplayPanel>(), treePanel);
+    public ActionConditionsListPanel(final IconManager iconManager,
+            final ActionConditionsTreePanel treePanel) {
+        this(iconManager, null, new ArrayList<ActionConditionDisplayPanel>(),
+                treePanel);
     }
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager
      * @param trigger Action trigger
      * @param treePanel Condition tree panel.
      */
-    public ActionConditionsListPanel(final ActionType trigger,
-            final ActionConditionsTreePanel treePanel) {
-        this(trigger, new ArrayList<ActionConditionDisplayPanel>(), treePanel);
+    public ActionConditionsListPanel(final IconManager iconManager,
+            final ActionType trigger, final ActionConditionsTreePanel treePanel) {
+        this(iconManager, trigger, new ArrayList<ActionConditionDisplayPanel>(),
+                treePanel);
     }
 
     /**
@@ -88,13 +93,15 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
      * @param conditions List of existing conditions;
      * @param treePanel Condition tree panel.
      */
-    public ActionConditionsListPanel(final ActionType trigger,
+    public ActionConditionsListPanel(final IconManager iconManager,
+            final ActionType trigger,
             final List<ActionConditionDisplayPanel> conditions,
             final ActionConditionsTreePanel treePanel) {
         super();
 
         validations = new HashMap<ActionConditionDisplayPanel, Boolean>();
 
+        this.iconManager = iconManager;
         this.trigger = trigger;
         this.conditions = new ArrayList<ActionConditionDisplayPanel>(conditions);
         this.treePanel = treePanel;
@@ -115,7 +122,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
 
     /** Adds the listeners. */
     private void addListeners() {
-        for (ActionConditionDisplayPanel condition : conditions) {
+        for (final ActionConditionDisplayPanel condition : conditions) {
             condition.addConditionListener(this);
         }
     }
@@ -126,14 +133,15 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
         removeAll();
         int index = 0;
         if (trigger == null) {
-            add(new TextLabel("You must add at least one trigger before you can add conditions."),
+            add(new TextLabel(
+                    "You must add at least one trigger before you can add conditions."),
                     "alignx center, aligny top, grow, push, w 90%!");
         } else if (trigger.getType().getArgNames().length == 0) {
             add(new TextLabel("Trigger does not have any arguments."),
                     "alignx center, aligny top, grow, push, w 90%!");
         } else {
             synchronized (conditions) {
-                for (ActionConditionDisplayPanel condition : conditions) {
+                for (final ActionConditionDisplayPanel condition : conditions) {
                     add(new JLabel(index + "."), "aligny top");
                     add(condition, "growx, pushx, aligny top");
                     index++;
@@ -155,7 +163,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
      */
     public void addCondition(final ActionCondition condition) {
         final ActionConditionDisplayPanel panel =
-                new ActionConditionDisplayPanel(condition, trigger);
+                new ActionConditionDisplayPanel(iconManager, condition, trigger);
         panel.addConditionListener(this);
         panel.addPropertyChangeListener("validationResult", this);
         validations.put(panel, panel.checkError());
@@ -176,7 +184,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
         ActionConditionDisplayPanel removeCondition = null;
 
         synchronized (conditions) {
-            for (ActionConditionDisplayPanel localCondition : conditions) {
+            for (final ActionConditionDisplayPanel localCondition : conditions) {
                 if (localCondition.getCondition().equals(condition)) {
                     removeCondition = localCondition;
                     break;
@@ -195,7 +203,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
      * Clear conditions.
      */
     public void clearConditions() {
-        for (ActionConditionDisplayPanel condition : conditions) {
+        for (final ActionConditionDisplayPanel condition : conditions) {
             delCondition(condition.getCondition());
         }
     }
@@ -210,7 +218,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
                 new ArrayList<ActionCondition>();
 
         synchronized (conditions) {
-            for (ActionConditionDisplayPanel condition : conditions) {
+            for (final ActionConditionDisplayPanel condition : conditions) {
                 conditionList.add(condition.getCondition());
             }
         }
@@ -228,7 +236,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
             conditions.clear();
         }
 
-        for (ActionConditionDisplayPanel panel : conditions) {
+        for (final ActionConditionDisplayPanel panel : conditions) {
             panel.setTrigger(trigger);
         }
         this.trigger = trigger;
@@ -250,7 +258,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
     /** {@inheritDoc} */
     @Override
     public void setEnabled(final boolean enabled) {
-        for (ActionConditionDisplayPanel condition : conditions) {
+        for (final ActionConditionDisplayPanel condition : conditions) {
             condition.setEnabled(enabled);
         }
     }
@@ -264,7 +272,7 @@ public class ActionConditionsListPanel extends JPanel implements ActionCondition
         }
 
         boolean pass = true;
-        for (boolean validation : validations.values()) {
+        for (final boolean validation : validations.values()) {
             if (!validation) {
                 pass = false;
                 break;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionsPanel.java

@@ -26,8 +26,8 @@ import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ConditionTree;
 import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
 import com.dmdirc.interfaces.actions.ActionType;
-
 import com.dmdirc.ui.IconManager;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -39,8 +39,8 @@ import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
-
 import javax.swing.UIManager;
+
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -49,11 +49,7 @@ import net.miginfocom.swing.MigLayout;
 public class ActionConditionsPanel extends JPanel implements ActionListener,
         PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Tree panel. */
     private ActionConditionsTreePanel tree;
@@ -66,7 +62,7 @@ public class ActionConditionsPanel extends JPanel implements ActionListener,
     /** list validates? */
     private boolean listValidates = true;
     /** Icon manager. */
-    private IconManager iconManager;
+    private final IconManager iconManager;
 
     /**
      * Instantiates the panel.
@@ -106,7 +102,7 @@ public class ActionConditionsPanel extends JPanel implements ActionListener,
     /** Initialises the components. */
     private void initComponents() {
         tree = new ActionConditionsTreePanel(iconManager);
-        list = new ActionConditionsListPanel(tree);
+        list = new ActionConditionsListPanel(iconManager, tree);
         add = new JButton("Add");
     }
 
@@ -171,7 +167,7 @@ public class ActionConditionsPanel extends JPanel implements ActionListener,
     public void setConditions(final List<ActionCondition> conditions) {
         list.clearConditions();
 
-        for (ActionCondition condition : conditions) {
+        for (final ActionCondition condition : conditions) {
             list.addCondition(condition);
         }
     }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialog.java

@@ -24,11 +24,10 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionStatus;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.Dimension;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -42,17 +41,12 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Action editor dialog.
  */
-public class ActionEditorDialog extends StandardDialog implements ActionListener,
+public class ActionEditorDialog extends StandardDialog implements
+        ActionListener,
         PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Previously created instance of ActionEditorDialog. */
-    private static volatile ActionEditorDialog me;
     /** Name panel. */
     private ActionNamePanel name;
     /** Triggers panel. */
@@ -76,39 +70,34 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     /** Are the conditions valid? */
     private boolean conditionsValid = false;
     /** Action to be edited. */
-    private Action action;
+    private final Action action;
     /** Action group. */
-    private String group;
-    /** Icon manager. */
-    private IconManager iconManager;
+    private final String group;
 
     /**
      * Instantiates the panel.
      *
-     * @param iconManager Icon manager
-     * @param window Parent window
+     * @param controller Swing controller
      * @param group Action's group
      */
-    private ActionEditorDialog(final IconManager iconManager,
-            final Window window, final String group) {
-        this(iconManager, window, group, null);
+    public ActionEditorDialog(final SwingController controller,
+            final String group) {
+        this(controller, group, null);
     }
 
     /**
      * Instantiates the panel.
      *
-     * @param iconManager Icon manager
-     * @param window Parent window
+     * @param controller Swing controller
      * @param action Action to be edited
      * @param group Action's group
      */
-    private ActionEditorDialog(final IconManager iconManager,
-            final Window window, final String group, final Action action) {
-        super(window, ModalityType.DOCUMENT_MODAL);
+    public ActionEditorDialog(final SwingController controller,
+            final String group, final Action action) {
+        super(controller, ModalityType.DOCUMENT_MODAL);
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         setTitle("Action Editor");
 
-        this.iconManager = iconManager;
         this.group = group;
         this.action = action;
 
@@ -120,81 +109,6 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
         setResizable(false);
     }
 
-    /**
-     * Is the dialog open?
-     *
-     * @return is the dialog open
-     */
-    public static boolean isOpen() {
-        synchronized (ActionEditorDialog.class) {
-            return me != null;
-        }
-    }
-
-    /**
-     * Creates the dialog if one doesn't exist, and displays it.
-     *
-     * @param iconManager Icon manager
-     * @param window Parent window
-     * @param group Action's group
-     */
-    public static void showActionEditorDialog(final IconManager iconManager,
-            final Window window, final String group) {
-        showActionEditorDialog(iconManager, window, group, null);
-    }
-
-    /**
-     * Creates the dialog if one doesn't exist, and displays it.
-     *
-     * @param iconManager Icon manager
-     * @param window Parent window
-     * @param group Action's group
-     * @param action Action to be edited
-     */
-    public static void showActionEditorDialog(final IconManager iconManager,
-            final Window window, final String group, final Action action) {
-        getActionEditorDialog(iconManager, window, group, action);
-
-        me.display();
-    }
-
-    /**
-     * Returns the current instance of the ActionEditorDialog.
-     *
-     * @param iconManager Icon manager
-     * @param window Parent window
-     * @param group Action's group
-     *
-     * @return The current ActionEditorDialog instance
-     */
-    public static ActionEditorDialog getActionEditorDialog(
-            final IconManager iconManager, final Window window,
-            final String group) {
-        return getActionEditorDialog(iconManager, window, group, null);
-    }
-
-    /**
-     * Returns the current instance of the ActionEditorDialog.
-     *
-     * @param iconManager Icon manager
-     * @param window Parent window
-     * @param group Action's group
-     * @param action Action to be edited
-     *
-     * @return The current ActionEditorDialog instance
-     */
-    public static ActionEditorDialog getActionEditorDialog(
-            final IconManager iconManager, final Window window,
-            final String group, final Action action) {
-        synchronized (ActionEditorDialog.class) {
-            if (me == null) {
-                me = new ActionEditorDialog(iconManager, window, group, action);
-            }
-        }
-
-        return me;
-    }
-
     /** Sets components initial states and stuff. */
     private void doComponents() {
         triggers.setEnabled(action != null);
@@ -225,10 +139,10 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     /** Initialises the components. */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        name = new ActionNamePanel(iconManager, "", group);
-        triggers = new ActionTriggersPanel();
-        response = new ActionResponsePanel();
-        conditions = new ActionConditionsPanel(iconManager);
+        name = new ActionNamePanel(getIconManager(), "", group);
+        triggers = new ActionTriggersPanel(getIconManager());
+        response = new ActionResponsePanel(getController());
+        conditions = new ActionConditionsPanel(getIconManager());
         substitutions = new ActionSubstitutionsPanel();
         advanced = new ActionAdvancedPanel();
         showSubstitutions = new JButton("Show Substitutions");
@@ -266,7 +180,7 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     }
 
     /**
-     * @{inheritDoc}
+     * @{inheritDoc
      *
      * @param e Action event
      */
@@ -274,9 +188,10 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource().equals(showSubstitutions)) {
             substitutions.setVisible(!substitutions.isVisible());
-            showSubstitutions.setText(substitutions.isVisible() ? "Hide Substitutions"
-                    : "Show Substitutions");
-                    pack();
+            showSubstitutions
+                    .setText(substitutions.isVisible() ? "Hide Substitutions"
+                            : "Show Substitutions");
+            pack();
         } else if (e.getSource().equals(showAdvanced)) {
             advanced.setVisible(!advanced.isVisible());
             showAdvanced.setText(advanced.isVisible() ? "Hide Advanced Options"
@@ -334,7 +249,7 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
         }
     }
 
-    /** @{inheritDoc} */
+    /** @{inheritDoc */
     @Override
     public void propertyChange(final PropertyChangeEvent evt) {
         if (evt.getSource().equals(name)) {
@@ -358,16 +273,4 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
 
         getOkButton().setEnabled(triggersValid && conditionsValid && nameValid);
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public void dispose() {
-        if (me == null) {
-            return;
-        }
-        synchronized (me) {
-            super.dispose();
-            me = null;
-        }
-    }
 }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionResponsePanel.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
-import com.dmdirc.config.IdentityManager;
 
 import java.util.TreeSet;
 
@@ -44,11 +44,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class ActionResponsePanel extends JPanel {
 
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
+    /** Serial version UID. */
     private static final long serialVersionUID = 1;
     /** Response text area. */
     private JTextArea response;
@@ -57,18 +53,26 @@ public class ActionResponsePanel extends JPanel {
     /** Response scrollpane. */
     private JScrollPane scrollPane;
 
-    /** Instantiates the panel. */
-    public ActionResponsePanel() {
+    /**
+     * Instantiates the panel.
+     *
+     * @param controller Swing controller
+     */
+    public ActionResponsePanel(final SwingController controller) {
         super();
 
-        initComponents();
+        initComponents(controller);
         addListeners();
         layoutComponents();
     }
 
-    /** Initialises the components. */
-    private void initComponents() {
-        response = new TextAreaInputField("");
+    /**
+     * Initialises the components.
+     *
+     * @param controller Swing controller
+     */
+    private void initComponents(final SwingController controller) {
+        response = new TextAreaInputField(controller, "");
         scrollPane = new JScrollPane(response);
         response.setRows(4);
         //new SwingInputHandler(response, GlobalCommandParser
@@ -81,10 +85,10 @@ public class ActionResponsePanel extends JPanel {
 
         final TreeSet<String> formatters = new TreeSet<String>(
                 String.CASE_INSENSITIVE_ORDER);
-        formatters.addAll(IdentityManager.getGlobalConfig().getOptions(
-                "formatter").keySet());
+        formatters.addAll(controller.getGlobalConfig().getOptions("formatter")
+                .keySet());
 
-        for (String format : formatters) {
+        for (final String format : formatters) {
             ((DefaultComboBoxModel) formatter.getModel()).addElement(format);
         }
     }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java

@@ -22,10 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -55,27 +54,40 @@ public class ActionTriggersListPanel extends JPanel {
     private final List<ActionType> triggers;
     /** Listeners. */
     private final ListenerList listeners = new ListenerList();
+    /** Icon manager. */
+    private final IconManager iconManager;
 
-    /** Instantiates the panel. */
-    public ActionTriggersListPanel() {
-        this(new ArrayList<ActionType>());
+    /**
+     * Instantiates the panel.
+     *
+     * @param iconManager Icon Manager
+     */
+    public ActionTriggersListPanel(final IconManager iconManager) {
+        this(iconManager, new ArrayList<ActionType>());
     }
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon Manager
      * @param triggers Trigger list
      */
-    public ActionTriggersListPanel(final List<ActionType> triggers) {
+    public ActionTriggersListPanel(final IconManager iconManager,
+            final List<ActionType> triggers) {
         super();
 
+        this.iconManager = iconManager;
         this.triggers = new ArrayList<ActionType>(triggers);
 
         initComponents();
         layoutComponents();
     }
 
-    /** Initialises the components. */
+    /**
+     * Initialises the components.
+     *
+     * @param iconManager Icon Manager
+     */
     private void initComponents() {
         setOpaque(false);
         setLayout(new MigLayout("fillx, wrap 2"));
@@ -84,15 +96,13 @@ public class ActionTriggersListPanel extends JPanel {
     /** Lays out the components. */
     private void layoutComponents() {
         synchronized (triggers) {
-            final IconManager iconManager = new IconManager(IdentityManager
-                .getGlobalConfig());
             setVisible(false);
 
             removeAll();
 
             for (final ActionType trigger : triggers) {
-                final ImageButton button = new ImageButton("delete",
-                        iconManager.getIcon("close-inactive"),
+                final ImageButton<?> button = new ImageButton<Object>(
+                        "delete", iconManager.getIcon("close-inactive"),
                         iconManager.getIcon("close-active"));
                 button.addActionListener(new ActionListener() {
 
@@ -169,7 +179,7 @@ public class ActionTriggersListPanel extends JPanel {
      * Clears the trigger list.
      */
     public void clearTriggers() {
-        for (ActionType trigger : triggers) {
+        for (final ActionType trigger : triggers) {
             delTrigger(trigger);
         }
     }
@@ -237,7 +247,7 @@ public class ActionTriggersListPanel extends JPanel {
      * @param type Removed trigger
      */
     protected void fireTriggerRemoved(final ActionType type) {
-        for (ActionTriggerRemovalListener listener : listeners.get(
+        for (final ActionTriggerRemovalListener listener : listeners.get(
                 ActionTriggerRemovalListener.class)) {
             listener.triggerRemoved(type);
         }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java

@@ -24,10 +24,11 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionTypeComparator;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.ComboBoxWidthModifier;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.MapList;
 
 import java.awt.event.ActionEvent;
@@ -70,37 +71,45 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
     /** Triggers compatible with the currently added triggers. */
     private final List<ActionType> compatibleTriggers;
 
-    /** Instantiates the panel. */
-    public ActionTriggersPanel() {
+    /**
+     * Instantiates the panel.
+     *
+     * @param iconManager Icon manager
+     * */
+    public ActionTriggersPanel(final IconManager iconManager) {
         super();
 
         compatibleTriggers = new ArrayList<ActionType>();
 
-        initComponents();
+        initComponents(iconManager);
         addListeners();
         layoutComponents();
     }
 
-    /** Initialises the components. */
-    private void initComponents() {
+    /**
+     * Initialises the components.
+     *
+     * @param iconManager Icon manager
+     * */
+    private void initComponents(final IconManager iconManager) {
         setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
                 "TitledBorder.border"), "Triggers"));
 
         triggerGroup = new JComboBox(new DefaultComboBoxModel());
-        //Only fire events on selection not on highlight
+        // Only fire events on selection not on highlight
         triggerGroup.putClientProperty("JComboBox.isTableCellEditor",
                 Boolean.TRUE);
         triggerGroup.setRenderer(new ActionTypeRenderer());
         triggerGroup.addPopupMenuListener(new ComboBoxWidthModifier());
 
         triggerItem = new JComboBox(new DefaultComboBoxModel());
-        //Only fire events on selection not on highlight
+        // Only fire events on selection not on highlight
         triggerItem.putClientProperty("JComboBox.isTableCellEditor",
                 Boolean.TRUE);
         triggerItem.setRenderer(new ActionTypeRenderer());
         triggerItem.addPopupMenuListener(new ComboBoxWidthModifier());
 
-        triggerList = new ActionTriggersListPanel();
+        triggerList = new ActionTriggersListPanel(iconManager);
         addAll(ActionManager.getActionManager().getGroupedTypes());
     }
 
@@ -154,7 +163,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
     public void setTriggers(final ActionType[] triggers) {
         triggerList.clearTriggers();
 
-        for (ActionType localTrigger : triggers) {
+        for (final ActionType localTrigger : triggers) {
             triggerList.addTrigger(localTrigger);
         }
     }
@@ -197,7 +206,8 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         compatibleTriggers.clear();
         ((DefaultComboBoxModel) triggerGroup.getModel()).removeAllElements();
         ((DefaultComboBoxModel) triggerItem.getModel()).removeAllElements();
-        for (Map.Entry<String, List<ActionType>> entry : mapList.entrySet()) {
+        for (final Map.Entry<String, List<ActionType>> entry : mapList
+                .entrySet()) {
             ((DefaultComboBoxModel) triggerGroup.getModel())
                     .addElement(entry.getKey());
         }
@@ -219,7 +229,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
                 .findCompatibleTypes(primaryType));
         ((DefaultComboBoxModel) triggerGroup.getModel()).removeAllElements();
         ((DefaultComboBoxModel) triggerItem.getModel()).removeAllElements();
-        for (ActionType thisType : compatibleTriggers) {
+        for (final ActionType thisType : compatibleTriggers) {
             final List<ActionType> types = triggerList.getTriggers();
             if (!types.contains(thisType)) {
                 ((DefaultComboBoxModel) triggerItem.getModel())
@@ -234,7 +244,8 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         triggerGroup.setSelectedIndex(-1);
         triggerItem.setSelectedIndex(-1);
         if (triggerItem.getModel().getSize() == 0) {
-            ((DefaultComboBoxModel) triggerGroup.getModel()).removeAllElements();
+            ((DefaultComboBoxModel) triggerGroup.getModel())
+                    .removeAllElements();
         }
         triggerGroup.setEnabled(triggerGroup.getModel().getSize() > 0);
         triggerItem.setEnabled(triggerItem.getModel().getSize() > 0);
@@ -251,10 +262,11 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         comboChange = true;
         ((DefaultComboBoxModel) triggerItem.getModel()).removeAllElements();
         Collections.sort(list, new ActionTypeComparator());
-        for (ActionType entry : list) {
+        for (final ActionType entry : list) {
             if (compatibleTriggers.isEmpty()
                     || compatibleTriggers.contains(entry)) {
-                ((DefaultComboBoxModel) triggerItem.getModel()).addElement(entry);
+                ((DefaultComboBoxModel) triggerItem.getModel())
+                        .addElement(entry);
             }
         }
         triggerItem.setSelectedIndex(-1);

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanel.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionTypeComparator;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
@@ -32,7 +33,6 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 
-import com.dmdirc.ui.IconManager;
 import java.awt.Window;
 import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
@@ -82,21 +82,21 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
     private JButton delete;
     /** Action group. */
     private ActionGroup group;
-    /** Prefs component factory. */
-    private IconManager iconManager;
+    /** Swing controller. */
+    private SwingController controller;
 
     /**
      * Creates a new instance of ActionsManagerDialog.
      *
-     * @param iconManager Prefs component factory
+     * @param controller Swing controller
      * @param parent Parent window
      * @param group Action group to display
      */
-    public ActionsGroupPanel(final IconManager iconManager,
+    public ActionsGroupPanel(final SwingController controller,
             final Window parent, final ActionGroup group) {
         super();
 
-        this.iconManager = iconManager;
+        this.controller = controller;
         this.parent = parent;
         this.group = group;
 
@@ -249,10 +249,10 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
-            ActionEditorDialog.showActionEditorDialog(iconManager, parent,
+            controller.showDialog(ActionEditorDialog.class, parent,
                     group.getName());
         } else if (e.getSource() == edit) {
-            ActionEditorDialog.showActionEditorDialog(iconManager, parent,
+            controller.showDialog(ActionEditorDialog.class, parent,
                     group.getName(), model.getAction(
                     table.getRowSorter().convertRowIndexToModel(table.
                     getSelectedRow())));
@@ -261,8 +261,8 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
                     model.getAction(
                     table.getRowSorter().convertRowIndexToModel(table.
                     getSelectedRow()));
-            new StandardQuestionDialog(parent, ModalityType.APPLICATION_MODAL,
-                    "Confirm deletion",
+            new StandardQuestionDialog(controller, parent,
+                    ModalityType.APPLICATION_MODAL, "Confirm deletion",
                     "Are you sure you wish to delete the action '" + action.
                     getName() + "'?") {