Begin to remove deprecated IdentityManager methods.

Change-Id: I1fc7086057871a9b5f5f6d0ec790ec28b7ee067f
Depends-On: I7c24baa6f2e64302406e656a8931390aff9d3c9d
Reviewed-on: http://gerrit.dmdirc.com/2204
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -745,42 +745,50 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
 
         firewall.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 getDomain(), "firewall.ip", "Forced IP",
-                "What IP should be sent as our IP (Blank = work it out)"));
+                "What IP should be sent as our IP (Blank = work it out)",
+                manager.getConfigManager(), manager.getIdentity()));
         firewall.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "firewall.ports.usePortRange", "Use Port Range",
                 "Useful if you have a firewall that only forwards specific "
-                + "ports"));
+                + "ports", manager.getConfigManager(), manager.getIdentity()));
         firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "firewall.ports.startPort", "Start Port",
-                "Port to try to listen on first"));
+                "Port to try to listen on first", manager.getConfigManager(),
+                manager.getIdentity()));
         firewall.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "firewall.ports.endPort", "End Port",
-                "Port to try to listen on last"));
+                "Port to try to listen on last", manager.getConfigManager(),
+                manager.getIdentity()));
         receiving.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
                 getDomain(), "receive.savelocation", "Default save location",
-                "Where the save as window defaults to?"));
+                "Where the save as window defaults to?",
+                manager.getConfigManager(), manager.getIdentity()));
         sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "send.reverse", "Reverse DCC",
                 "With reverse DCC, the sender connects rather than "
-                + "listens like normal dcc"));
+                + "listens like normal dcc", manager.getConfigManager(),
+                manager.getIdentity()));
         sending.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "send.forceturbo", "Use Turbo DCC",
                 "Turbo DCC doesn't wait for ack packets. this is "
-                + "faster but not always supported."));
+                + "faster but not always supported.",
+                manager.getConfigManager(), manager.getIdentity()));
         receiving.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "receive.reverse.sendtoken",
                 "Send token in reverse receive",
                 "If you have problems with reverse dcc receive resume,"
-                + " try toggling this."));
+                + " try toggling this.", manager.getConfigManager(),
+                manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "send.blocksize", "Blocksize to use for DCC",
                 "Change the block size for send/receive, this can "
-                + "sometimes speed up transfers."));
+                + "sometimes speed up transfers.", manager.getConfigManager(),
+                manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "general.percentageInTitle",
                 "Show percentage of transfers in the window title",
                 "Show the current percentage of transfers in the DCC window "
-                + "title"));
+                + "title", manager.getConfigManager(), manager.getIdentity()));
     }
 
 }

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -195,19 +195,24 @@ public final class FreeDesktopNotificationsPlugin
 
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "general.timeout", "Timeout",
-                "Length of time in seconds before the notification popup closes."));
+                "Length of time in seconds before the notification popup closes.",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.FILE,
                 getDomain(), "general.icon", "icon",
-                "Path to icon to use on the notification."));
+                "Path to icon to use on the notification.",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.escapehtml", "Escape HTML",
-                "Some Implementations randomly parse HTML, escape it before showing?"));
+                "Some Implementations randomly parse HTML, escape it before showing?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.strictescape", "Strict Escape HTML",
-                "Strictly escape HTML or just the basic characters? (&, < and >)"));
+                "Strictly escape HTML or just the basic characters? (&, < and >)",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.stripcodes", "Strip Control Codes",
-                "Strip IRC Control codes from messages?"));
+                "Strip IRC Control codes from messages?",
+                manager.getConfigManager(), manager.getIdentity()));
 
         manager.getCategory("Plugins").addSubCategory(general);
     }

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -144,46 +144,56 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
                 getDomain(), "general.useUsername", "Use connection " +
                 "username rather than system username", "If this is enabled," +
                 " the username for the connection will be used rather than " +
-                "'" + System.getProperty("user.name") + "'"));
+                "'" + System.getProperty("user.name") + "'",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "general.useNickname", "Use connection " +
                 "nickname rather than system username", "If this is enabled, " +
                 "the nickname for the connection will be used rather than " +
-                "'" + System.getProperty("user.name") + "'"));
+                "'" + System.getProperty("user.name") + "'",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "general.useCustomName", "Use custom name" +
                 " all the time", "If this is enabled, the name specified below" +
-                " will be used all the time"));
+                " will be used all the time", manager.getConfigManager(),
+                manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 getDomain(), "general.customName", "Custom Name to use",
-                "The custom name to use when 'Use Custom Name' is enabled"));
+                "The custom name to use when 'Use Custom Name' is enabled",
+                manager.getConfigManager(), manager.getIdentity()));
 
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.alwaysOn", "Always have ident " +
                 "port open", "By default the identd only runs when there are " +
-                "active connection attempts. This overrides that."));
+                "active connection attempts. This overrides that.",
+                manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 new PortValidator(), getDomain(), "advanced.port",
                 "What port should the identd listen on", "Default port is 113," +
                 " this is probably useless if changed unless you port forward" +
-                " ident to a different port"));
+                " ident to a different port", manager.getConfigManager(),
+                manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.useCustomSystem", "Use custom OS",
                 "By default the plugin uses 'UNIX' or 'WIN32' as the system " +
-                "type, this can be overriden by enabling this."));
+                "type, this can be overriden by enabling this.",
+                manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 getDomain(), "advanced.customSystem", "Custom OS to use",
-                "The custom system to use when 'Use Custom System' is enabled"));
+                "The custom system to use when 'Use Custom System' is enabled",
+                manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.isHiddenUser", "Respond to ident" +
                 " requests with HIDDEN-USER error", "By default the plugin will" +
                 " give a USERID response, this can force an 'ERROR :" +
-                " HIDDEN-USER' response instead."));
+                " HIDDEN-USER' response instead.", manager.getConfigManager(),
+                manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.isNoUser", "Respond to ident" +
                 " requests with NO-USER error", "By default the plugin will" +
                 " give a USERID response, this can force an 'ERROR : NO-USER'" +
-                " response instead. (Overrides HIDDEN-USER)"));
+                " response instead. (Overrides HIDDEN-USER)",
+                manager.getConfigManager(), manager.getIdentity()));
 
         manager.getCategory("Plugins").addSubCategory(general);
         general.addSubCategory(advanced);

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

@@ -275,16 +275,20 @@ public final class LagDisplayPlugin extends BasePlugin implements
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "usealternate",
                 "Alternate method", "Use an alternate method of determining "
-                + "lag which bypasses bouncers or proxies that may reply?"));
+                + "lag which bypasses bouncers or proxies that may reply?",
+                manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "graph", "Show graph", "Show a graph of ping times " +
-                "for the current server in the information popup?"));
+                "for the current server in the information popup?",
+                manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "labels", "Show labels", "Show labels on selected " +
-                "points on the ping graph?"));
+                "points on the ping graph?",
+                manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "history", "Graph points", "Number of data points " +
-                "to plot on the graph, if enabled."));
+                "to plot on the graph, if enabled.",
+                manager.getConfigManager(), manager.getIdentity()));
         manager.getCategory("Plugins").addSubCategory(cat);
     }
 

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -229,22 +229,66 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
         final PreferencesCategory advanced = new PluginPreferencesCategory(
                 pluginInfo, "Advanced", "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
 
-        general.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY, getDomain(), "general.directory", "Directory", "Directory for log files"));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.networkfolders", "Separate logs by network", "Should the files be stored in a sub-dir with the networks name?"));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.addtime", "Timestamp logs", "Should a timestamp be added to the log files?"));
-        general.addSetting(new PreferencesSetting(PreferencesType.TEXT, getDomain(), "general.timestamp", "Timestamp format", "The String to pass to 'SimpleDateFormat' to format the timestamp"));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.stripcodes", "Strip Control Codes", "Remove known irc control codes from lines before saving?"));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "general.channelmodeprefix", "Show channel mode prefix", "Show the @,+ etc next to nicknames"));
-
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "backbuffer.autobackbuffer", "Automatically display", "Automatically display the backbuffer when a channel is joined"));
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.COLOUR, getDomain(), "backbuffer.colour", "Colour to use for display", "Colour used when displaying the backbuffer"));
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "backbuffer.lines", "Number of lines to show", "Number of lines used when displaying backbuffer"));
-        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "backbuffer.timestamp", "Show Formatter-Timestamp", "Should the line be added to the frame with the timestamp from the formatter aswell as the file contents"));
-
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.filenamehash", "Add Filename hash", "Add the MD5 hash of the channel/client name to the filename. (This is used to allow channels with similar names (ie a _ not a  -) to be logged separately)"));
-
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.usedate", "Use Date directories", "Should the log files be in separate directories based on the date?"));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT, getDomain(), "advanced.usedateformat", "Archive format", "The String to pass to 'SimpleDateFormat' to format the directory name(s) for archiving"));
+        general.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
+                getDomain(), "general.directory", "Directory",
+                "Directory for log files", manager.getConfigManager(),
+                manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.networkfolders",
+                "Separate logs by network",
+                "Should the files be stored in a sub-dir with the networks name?",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.addtime", "Timestamp logs",
+                "Should a timestamp be added to the log files?",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                getDomain(), "general.timestamp", "Timestamp format",
+                "The String to pass to 'SimpleDateFormat' to format the timestamp",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.stripcodes", "Strip Control Codes",
+                "Remove known irc control codes from lines before saving?",
+                manager.getConfigManager(), manager.getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "general.channelmodeprefix",
+                "Show channel mode prefix", "Show the @,+ etc next to nicknames",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "backbuffer.autobackbuffer", "Automatically display",
+                "Automatically display the backbuffer when a channel is joined",
+                manager.getConfigManager(), manager.getIdentity()));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
+                getDomain(), "backbuffer.colour", "Colour to use for display",
+                "Colour used when displaying the backbuffer",
+                manager.getConfigManager(), manager.getIdentity()));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "backbuffer.lines", "Number of lines to show",
+                "Number of lines used when displaying backbuffer",
+                manager.getConfigManager(), manager.getIdentity()));
+        backbuffer.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "backbuffer.timestamp", "Show Formatter-Timestamp",
+                "Should the line be added to the frame with the timestamp from "
+                + "the formatter aswell as the file contents",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.filenamehash", "Add Filename hash",
+                "Add the MD5 hash of the channel/client name to the filename. "
+                + "(This is used to allow channels with similar names "
+                + "(ie a _ not a  -) to be logged separately)",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "advanced.usedate", "Use Date directories",
+                "Should the log files be in separate directories based on the date?",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                getDomain(), "advanced.usedateformat", "Archive format",
+                "The String to pass to 'SimpleDateFormat' to format the "
+                + "directory name(s) for archiving",
+                manager.getConfigManager(), manager.getIdentity()));
 
         general.addSubCategory(backbuffer.setInline());
         general.addSubCategory(advanced.setInline());

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -211,7 +211,7 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
 
         final PreferencesSetting setting = new PreferencesSetting(
                 PreferencesType.LABEL, getDomain(), "", "Instructions",
-                "Instructions");
+                "Instructions", manager.getConfigManager(), manager.getIdentity());
         setting.setValue("<html><p>"
                 + "The VLC media source requires that VLC's web interface is"
                 + " enabled. To do this, follow the steps below:</p>"
@@ -237,7 +237,8 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
         general.addSetting(setting);
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 getDomain(), "host", "Hostname and port",
-                "The host and port that VLC listens on for web connections"));
+                "The host and port that VLC listens on for web connections",
+                manager.getConfigManager(), manager.getIdentity()));
 
         manager.getCategory("Plugins").addSubCategory(general);
     }

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

@@ -277,27 +277,33 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
 
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "shownickcoloursintext", "Show colours in text area",
-                "Colour nicknames in main text area?"));
+                "Colour nicknames in main text area?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "shownickcoloursinnicklist", "Show colours in"
-                + " nick list", "Colour nicknames in channel nick lists?"));
+                + " nick list", "Colour nicknames in channel nick lists?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "settext", "Set colours in textarea",
-                "Should the plugin set the textarea colour of nicks?"));
+                "Should the plugin set the textarea colour of nicks?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "setnicklist", "Set colours in nick list",
-                "Should the plugin set the nick list colour of nicks?"));
+                "Should the plugin set the nick list colour of nicks?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "userandomcolour", "Use random colour",
-                "Use a pseudo-random colour for each person?"));
+                "Use a pseudo-random colour for each person?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "useowncolour", "Use colour for own nick",
-                "Always use the same colour for our own nickname?"));
+                "Always use the same colour for our own nickname?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(
                 new PreferencesSetting(PreferencesType.COLOUR, getDomain(),
                 "owncolour", "Colour to use for own nick",
                 "Colour used for our own nickname, if above setting is "
-                + "enabled."));
+                + "enabled.", manager.getConfigManager(), manager.getIdentity()));
 
         general.addSubCategory(colours);
         manager.getCategory("Plugins").addSubCategory(general);

src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -83,24 +83,30 @@ public final class OsdPlugin extends BasePlugin implements
 
         fontSizeSetting = new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "fontSize", "Font size", "Changes the font " +
-                "size of the OSD").registerChangeListener(this);
+                "size of the OSD", manager.getConfigManager(),
+                manager.getIdentity()).registerChangeListener(this);
         backgroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
                 getDomain(), "bgcolour", "Background colour",
-                "Background colour for the OSD").registerChangeListener(this);
+                "Background colour for the OSD", manager.getConfigManager(),
+                manager.getIdentity()).registerChangeListener(this);
         foregroundSetting = new PreferencesSetting(PreferencesType.COLOUR,
                 getDomain(), "fgcolour", "Foreground colour",
-                "Foreground colour for the OSD").registerChangeListener(this);
+                "Foreground colour for the OSD", manager.getConfigManager(),
+                manager.getIdentity()).registerChangeListener(this);
         widthSetting = new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "width", "OSD Width", "Width of the OSD Window").
-                registerChangeListener(this);
+                getDomain(), "width", "OSD Width", "Width of the OSD Window",
+                manager.getConfigManager(), manager.getIdentity())
+                .registerChangeListener(this);
         timeoutSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
                 new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
                 getDomain(), "timeout", "Timeout", "Length of time in " +
-                "seconds before the OSD window closes");
+                "seconds before the OSD window closes", manager.getConfigManager(),
+                manager.getIdentity());
         maxWindowsSetting = new PreferencesSetting(PreferencesType.OPTIONALINTEGER,
                 new OptionalValidator(new NumericalValidator(1, Integer.MAX_VALUE)),
-                getDomain(), "maxWindows", "Maximum open windows", "Maximum number of OSD " +
-                "windows that will be displayed at any given time");
+                getDomain(), "maxWindows", "Maximum open windows",
+                "Maximum number of OSD windows that will be displayed at any given time",
+                manager.getConfigManager(), manager.getIdentity());
 
         category.addSetting(fontSizeSetting);
         category.addSetting(backgroundSetting);
@@ -118,7 +124,8 @@ public final class OsdPlugin extends BasePlugin implements
 
         category.addSetting(new PreferencesSetting(getDomain(), "newbehaviour",
                 "New window policy", "What to do when an OSD Window "
-                + "is opened when there are other, existing windows open", posOptions));
+                + "is opened when there are other, existing windows open",
+                posOptions, manager.getConfigManager(), manager.getIdentity()));
 
         category.addChangeListener(this);
         manager.getCategory("Plugins").addSubCategory(category);

src/com/dmdirc/addons/parser_twitter/TwitterPlugin.java

@@ -98,19 +98,48 @@ public class TwitterPlugin extends BasePlugin {
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory category = new PluginPreferencesCategory(pluginInfo, "Twitter Plugin", "Settings related to the twitter plugin", "category-twitter");
-        final PreferencesCategory advanced = new PluginPreferencesCategory(pluginInfo, "Advanced", "Advanced Settings related to the twitter plugin", "category-twitter");
-
-        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "statuscount", "Statuses to request", "How many statuses to request at a time?"));
-        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "apicalls", "API Calls", "Aim to only use how many API Calls per hour? (Twitter has a max of 350)"));
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "saveLastIDs", "Remember shown items", "Should previously shown items not be shown again next time?"));
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "getSentMessages", "Show own Direct Messages", "Should we try to show our own direct messages to people not just ones to us?"));
-
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "autoAt", "Prepend nicknames with @", "Should all nicknmaes be shown with an @ infront of them? (Makes tab competion easier)"));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "replaceOpeningNickname", "Replace opening nickame?", "Should nicknames at the start of the message be replaced? (eg Replace foo: with @foo)"));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "debugEnabled", "Debugging Enabled?", "Should more debugging be enabled on the twitter plugin?"));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "hide500Errors", "Hide HTTP 50x Errors", "At times twitter gives a lot of 502/503 errors. Should this be hidden from you?"));
-        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "autoLeaveMessageChannel", "Leave & channels automatically?", "Should you automatically be parted from & channels after sending a message?"));
+        final PreferencesCategory category = new PluginPreferencesCategory(pluginInfo,
+                "Twitter Plugin", "Settings related to the twitter plugin", "category-twitter");
+        final PreferencesCategory advanced = new PluginPreferencesCategory(pluginInfo,
+                "Advanced", "Advanced Settings related to the twitter plugin", "category-twitter");
+
+        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "statuscount", "Statuses to request",
+                "How many statuses to request at a time?",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
+                getDomain(), "apicalls", "API Calls",
+                "Aim to only use how many API Calls per hour? (Twitter has a max of 350)",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "saveLastIDs", "Remember shown items",
+                "Should previously shown items not be shown again next time?",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "getSentMessages", "Show own Direct Messages",
+                "Should we try to show our own direct messages to people not just ones to us?",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "autoAt", "Prepend nicknames with @",
+                "Should all nicknmaes be shown with an @ infront of them? (Makes tab competion easier)",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "replaceOpeningNickname", "Replace opening nickame?",
+                "Should nicknames at the start of the message be replaced? (eg Replace foo: with @foo)",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "debugEnabled", "Debugging Enabled?",
+                "Should more debugging be enabled on the twitter plugin?",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "hide500Errors", "Hide HTTP 50x Errors",
+                "At times twitter gives a lot of 502/503 errors. Should this be hidden from you?",
+                manager.getConfigManager(), manager.getIdentity()));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                getDomain(), "autoLeaveMessageChannel", "Leave & channels automatically?",
+                "Should you automatically be parted from & channels after sending a message?",
+                manager.getConfigManager(), manager.getIdentity()));
 
         category.addSubCategory(advanced);
 

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

@@ -296,10 +296,12 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
         colours.setInline().setInlineAfter();
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "joinOnDiscover", "Join on discover",
-                "Do you want fake clients to join the channel?"));
+                "Do you want fake clients to join the channel?",
+                manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "colourFullName", "Colour full name",
-                "Do you want to colour the full name?"));
+                "Do you want to colour the full name?",
+                manager.getConfigManager(), manager.getIdentity()));
         manager.getCategory("Plugins").addSubCategory(general);
         general.addSubCategory(colours);
     }

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -190,7 +190,8 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "autominimise", "Auto-hide DMDirc when minimised",
                 "If this option is enabled, the systray plugin will hide DMDirc"
-                + " to the system tray whenever DMDirc is minimised"));
+                + " to the system tray whenever DMDirc is minimised",
+                manager.getConfigManager(), manager.getIdentity()));
 
         manager.getCategory("Plugins").addSubCategory(category);
     }

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

@@ -65,11 +65,17 @@ import org.jdesktop.jxlayer.JXLayer;
  */
 public final class PrefsComponentFactory {
 
+    /** Swing Controller. */
+    private final SwingController controller;
+
     /**
      * Creates a new instance of PrefsComponentFactory.
+     *
+     * @param controller Swing Controller
      */
-    private PrefsComponentFactory() {
-        // Shouldn't be initialised
+    protected PrefsComponentFactory(final SwingController controller) {
+        this.controller = controller;
+
     }
 
     /**
@@ -80,7 +86,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting whose component is being requested
      * @return An appropriate JComponent descendant
      */
-    public static JComponent getComponent(final PreferencesSetting setting) {
+    public JComponent getComponent(final PreferencesSetting setting) {
         JComponent option;
 
         switch (setting.getType()) {
@@ -142,9 +148,9 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getTextOption(final PreferencesSetting setting) {
+    private JComponent getTextOption(final PreferencesSetting setting) {
         final ValidatingJTextField option = new ValidatingJTextField(
-                setting.getValidator());
+                controller.getIconManager(), setting.getValidator());
         option.setText(setting.getValue());
 
         option.addKeyListener(new KeyAdapter() {
@@ -163,7 +169,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getBooleanOption(
+    private JComponent getBooleanOption(
             final PreferencesSetting setting) {
         final JCheckBox option = new JCheckBox();
         option.setSelected(Boolean.parseBoolean(setting.getValue()));
@@ -187,7 +193,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getComboOption(final PreferencesSetting setting) {
+    private JComponent getComboOption(final PreferencesSetting setting) {
         final JComboBox option = new JComboBox(setting.getComboOptions()
                 .entrySet().toArray());
         option.setRenderer(new MapEntryRenderer());
@@ -223,7 +229,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getIntegerOption(
+    private JComponent getIntegerOption(
             final PreferencesSetting setting) {
         JSpinner option;
 
@@ -269,7 +275,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getOptionalIntegerOption(
+    private JComponent getOptionalIntegerOption(
             final PreferencesSetting setting) {
         final boolean state = setting.getValue() != null
                 && !setting.getValue().startsWith("false:");
@@ -323,7 +329,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getDurationOption(
+    private JComponent getDurationOption(
             final PreferencesSetting setting) {
         DurationDisplay option;
 
@@ -351,7 +357,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getColourOption(
+    private JComponent getColourOption(
             final PreferencesSetting setting) {
         final OptionalColourChooser option = new OptionalColourChooser(
                 setting.getValue(), true, true, true);
@@ -378,7 +384,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getOptionalColourOption(
+    private JComponent getOptionalColourOption(
             final PreferencesSetting setting) {
         final boolean state = setting.getValue() != null
                 && !setting.getValue().startsWith("false:");
@@ -408,7 +414,7 @@ public final class PrefsComponentFactory {
      * @param setting The setting to create the component for
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getFontOption(final PreferencesSetting setting) {
+    private JComponent getFontOption(final PreferencesSetting setting) {
         final String value = setting.getValue();
 
         final FontPicker option = new FontPicker(value);
@@ -439,9 +445,10 @@ public final class PrefsComponentFactory {
      *
      * @return A JComponent descendent for the specified setting
      */
-    private static JComponent getFileBrowseOption(
+    private JComponent getFileBrowseOption(
             final PreferencesSetting setting, final int type) {
-        final FileBrowser option = new FileBrowser(setting, type);
+        final FileBrowser option = new FileBrowser(controller.getIconManager(),
+                setting, type);
 
         option.addActionListener(new ActionListener() {
             /** {@inheritDoc} */

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

@@ -56,6 +56,7 @@ import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.validators.NumericalValidator;
@@ -80,6 +81,7 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.UIManager.LookAndFeelInfo;
 
 import lombok.Getter;
+
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
@@ -129,6 +131,12 @@ public class SwingController extends BasePlugin implements UIController {
     /** Addon config identity. */
     @Getter
     private final Identity addonIdentity;
+    /** Global Swing UI Icon manager. */
+    @Getter
+    private final IconManager iconManager;
+    /** Prefs component factory instance. */
+    @Getter
+    private final PrefsComponentFactory prefsComponentFactory;
 
     /**
      * Instantiates a new SwingController.
@@ -144,6 +152,8 @@ public class SwingController extends BasePlugin implements UIController {
                 .getGlobalConfigIdentity();
         addonIdentity = IdentityManager.getIdentityManager()
                 .getGlobalAddonIdentity();
+        iconManager = new IconManager(globalConfig);
+        prefsComponentFactory = new PrefsComponentFactory(this);
         setAntiAlias();
         windows = new ArrayList<java.awt.Window>();
         registerCommand(new ServerSettings(), ServerSettings.INFO);
@@ -214,9 +224,9 @@ public class SwingController extends BasePlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                ChannelSettingsDialog.showChannelSettingsDialog(channel,
-                        getMainFrame(), (InputWindow) getWindowFactory()
-                        .getSwingWindow(channel));
+                ChannelSettingsDialog.showChannelSettingsDialog(
+                        SwingController.this, channel, getMainFrame(),
+                        (InputWindow) getWindowFactory().getSwingWindow(channel));
             }
         });
     }
@@ -230,7 +240,7 @@ public class SwingController extends BasePlugin implements UIController {
             @Override
             public void run() {
                 ServerSettingsDialog.showServerSettingsDialog(
-                        server, getMainFrame());
+                        SwingController.this, server, getMainFrame());
             }
         });
     }
@@ -523,25 +533,32 @@ public class SwingController extends BasePlugin implements UIController {
         }
 
         general.addSetting(new PreferencesSetting("ui", "lookandfeel",
-                "Look and feel", "The Java look and feel to use", lafs));
+                "Look and feel", "The Java look and feel to use", lafs,
+                globalConfig, globalIdentity));
         general.addSetting(new PreferencesSetting("ui", "framemanager",
                 "Window manager", "Which window manager should be used?",
-                framemanagers));
+                framemanagers,
+                globalConfig, globalIdentity));
         general.addSetting(new PreferencesSetting("ui", "framemanagerPosition",
                 "Window manager position", "Where should the window "
-                + "manager be positioned?", fmpositions));
+                + "manager be positioned?", fmpositions,
+                globalConfig, globalIdentity));
         general.addSetting(new PreferencesSetting(PreferencesType.FONT,
                 "ui", "textPaneFontName", "Textpane font",
-                "Font for the textpane"));
+                "Font for the textpane",
+                globalConfig, globalIdentity));
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 "ui", "textPaneFontSize", "Textpane font size",
-                "Font size for the textpane"));
+                "Font size for the textpane",
+                globalConfig, globalIdentity));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "sortrootwindows", "Sort root windows",
-                "Sort child windows in the frame managers?"));
+                "Sort child windows in the frame managers?",
+                globalConfig, globalIdentity));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "sortchildwindows", "Sort child windows",
-                "Sort root windows in the frame managers?"));
+                "Sort root windows in the frame managers?",
+                globalConfig, globalIdentity));
 
         general.addSubCategory(createNicklistCategory());
         general.addSubCategory(createTreeViewCategory());
@@ -563,42 +580,52 @@ public class SwingController extends BasePlugin implements UIController {
                 PreferencesType.OPTIONALINTEGER,
                 new NumericalValidator(10, -1), "ui", "frameBufferSize",
                 "Window buffer size", "The maximum number of lines in a window"
-                + " buffer"));
+                + " buffer",
+                globalConfig, globalIdentity));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "mdiBarVisibility", "MDI Bar Visibility",
-                "Controls the visibility of the MDI bar"));
+                "Controls the visibility of the MDI bar",
+                globalConfig, globalIdentity));
         advanced.addSetting(
                 new PreferencesSetting(PreferencesType.BOOLEAN, "ui",
                 "useOneTouchExpandable", "Use one touch expandable split "
                 + "panes?", "Use one touch expandable arrows for "
-                + "collapsing/expanding the split panes"));
+                + "collapsing/expanding the split panes",
+                globalConfig, globalIdentity));
         advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 getDomain(), "windowMenuItems", "Window menu item count",
-                "Number of items to show in the window menu"));
+                "Number of items to show in the window menu",
+                globalConfig, globalIdentity));
         advanced.addSetting(
                 new PreferencesSetting(PreferencesType.INTEGER, getDomain(),
                 "windowMenuScrollInterval", "Window menu scroll interval",
                 "Number of milliseconds to pause when autoscrolling in the "
-                + "window menu"));
+                + "window menu",
+                globalConfig, globalIdentity));
         advanced.addSetting(
                 new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(),
                 "showtopicbar", "Show topic bar",
-                "Shows a graphical topic bar in channels."));
+                "Shows a graphical topic bar in channels.",
+                globalConfig, globalIdentity));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(),
                 "shownicklist", "Show nicklist?",
-                "Do you want the nicklist visible"));
+                "Do you want the nicklist visible",
+                globalConfig, globalIdentity));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "showfulltopic", "Show full topic in topic bar?",
                "Do you want to show the full topic in the topic bar or just"
-               + "first line?"));
+               + "first line?",
+                globalConfig, globalIdentity));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "hideEmptyTopicBar", "Hide empty topic bar?",
-                "Do you want to hide the topic bar when there is no topic"));
+                "Do you want to hide the topic bar when there is no topic",
+                globalConfig, globalIdentity));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "textpanelinenotification",
                 "New line notification", "Do you want to be notified about new "
-                + "lines whilst scrolled up?"));
+                + "lines whilst scrolled up?",
+                globalConfig, globalIdentity));
 
         return advanced;
     }
@@ -615,30 +642,37 @@ public class SwingController extends BasePlugin implements UIController {
         treeview.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "treeview", "backgroundcolour", "Treeview background colour",
-                "Background colour to use for the treeview"));
+                "Background colour to use for the treeview",
+                globalConfig, globalIdentity));
         treeview.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "treeview", "foregroundcolour", "Treeview foreground colour",
-                "Foreground colour to use for the treeview"));
+                "Foreground colour to use for the treeview",
+                globalConfig, globalIdentity));
         treeview.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "ui", "treeviewRolloverColour", "Treeview rollover colour",
                 "Background colour to use when the mouse cursor is over a "
-                + "node"));
+                + "node",
+                globalConfig, globalIdentity));
         treeview.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "treeviewActiveBold", "Active node bold",
-                "Make the active node bold?"));
+                "Make the active node bold?",
+                globalConfig, globalIdentity));
         treeview.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "ui", "treeviewActiveBackground", "Active node background",
-                "Background colour to use for active treeview node"));
+                "Background colour to use for active treeview node",
+                globalConfig, globalIdentity));
         treeview.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "ui", "treeviewActiveForeground", "Active node foreground",
-                "Foreground colour to use for active treeview node"));
+                "Foreground colour to use for active treeview node",
+                globalConfig, globalIdentity));
         treeview.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "showtreeexpands", "Show expand/collapse handles",
-                "Do you want to show tree view collapse/expand handles"));
+                "Do you want to show tree view collapse/expand handles",
+                globalConfig, globalIdentity));
 
         return treeview;
     }
@@ -655,22 +689,27 @@ public class SwingController extends BasePlugin implements UIController {
         nicklist.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "ui", "nicklistbackgroundcolour", "Nicklist background colour",
-                "Background colour to use for the nicklist"));
+                "Background colour to use for the nicklist",
+                globalConfig, globalIdentity));
         nicklist.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "ui", "nicklistforegroundcolour", "Nicklist foreground colour",
-                "Foreground colour to use for the nicklist"));
+                "Foreground colour to use for the nicklist",
+                globalConfig, globalIdentity));
         nicklist.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALCOLOUR,
                 "ui", "nickListAltBackgroundColour",
                 "Alternate background colour",
-                "Background colour to use for every other nicklist entry"));
+                "Background colour to use for every other nicklist entry",
+                globalConfig, globalIdentity));
         nicklist.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "nicklist", "sortByMode", "Sort nicklist by user mode",
-                "Sort nicknames by the modes that they have?"));
+                "Sort nicknames by the modes that they have?",
+                globalConfig, globalIdentity));
         nicklist.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "nicklist", "sortByCase", "Sort nicklist by case",
-                "Sort nicknames in a case-sensitive manner?"));
+                "Sort nicknames in a case-sensitive manner?",
+                globalConfig, globalIdentity));
 
         return nicklist;
     }

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.event.ActionEvent;
@@ -40,7 +41,6 @@ import net.miginfocom.swing.MigLayout;
 /**
  * File browser component.
  *
- * @author Simon Mott
  * @since 0.6.3
  */
 public class FileBrowser extends JPanel implements ActionListener {
@@ -61,10 +61,12 @@ public class FileBrowser extends JPanel implements ActionListener {
     /**
      * Creates a new File Browser.
      *
+     * @param iconManager Icon Manager to get icons from
      * @param setting The setting to create the component for
      * @param type The type of filechooser we want (Files/Directories/Both)
      */
-    public FileBrowser(final PreferencesSetting setting, final int type) {
+    public FileBrowser(final IconManager iconManager,
+            final PreferencesSetting setting, final int type) {
         super();
 
         fileChooser.setFileSelectionMode(type);
@@ -72,8 +74,8 @@ public class FileBrowser extends JPanel implements ActionListener {
         final JButton browseButton = new JButton("Browse");
         browseButton.addActionListener(this);
 
-        pathField = new ValidatingJTextField(new JTextField(setting.getValue()),
-                setting.getValidator());
+        pathField = new ValidatingJTextField(iconManager,
+                new JTextField(setting.getValue()), setting.getValidator());
 
         setLayout(new MigLayout("ins 0, fill"));
         add(pathField, "growx, pushx, sgy all");

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

@@ -118,7 +118,8 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
         prevButton = new JButton();
         caseCheck = new JCheckBox();
         validator = new SearchValidator();
-        searchBox = new ValidatingJTextField(validator);
+        searchBox = new ValidatingJTextField(parent.getController()
+                .getIconManager(), validator);
         wrapIndicator = new JLabel("Search wrapped",
                 parent.getContainer().getIconManager().getIcon("linewrap"),
                 JLabel.LEFT);

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
-import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -63,25 +63,33 @@ public class SettingsPanel extends JPanel {
     private final boolean padding;
     /** Preferences Category. */
     private PreferencesCategory category;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new instance of SettingsPanel.
      *
+     * @param controller Swing controller
      * @param infoText Info blurb.
      */
-    public SettingsPanel(final String infoText) {
-        this(infoText, true);
+    public SettingsPanel(final SwingController controller,
+            final String infoText) {
+        this(controller, infoText, true);
     }
 
     /**
      * Creates a new instance of SettingsPanel.
      *
+     * @param controller Swing controller
      * @param infoText Info blurb.
      * @param padding Should we add padding to the panel?
      */
-    public SettingsPanel(final String infoText, final boolean padding) {
+    public SettingsPanel(final SwingController controller,
+            final String infoText, final boolean padding) {
         super();
 
+        this.controller = controller;
+
         settings = new DoubleMap<PreferencesSetting, JComponent>();
 
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
@@ -135,8 +143,8 @@ public class SettingsPanel extends JPanel {
 
         for (PreferencesSetting setting : category.getSettings()) {
             if (settings.get(setting) == null) {
-                final JComponent component = PrefsComponentFactory
-                        .getComponent(setting);
+                final JComponent component = controller
+                        .getPrefsComponentFactory().getComponent(setting);
                 component.setName(setting.getTitle());
                 settings.put(setting, component);
             }

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

@@ -87,11 +87,11 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
         initComponents();
 
-        IdentityManager.getGlobalConfig().addChangeListener("ui",
+        controller.getGlobalConfig().addChangeListener("ui",
                 "channelSplitPanePosition", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 controller.getDomain(), "showtopicbar", this);
-        IdentityManager.getGlobalConfig().addChangeListener(
+        controller.getGlobalConfig().addChangeListener(
                 controller.getDomain(), "shownicklist", this);
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_CLOSING);
@@ -159,7 +159,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            ChannelSettingsDialog.showChannelSettingsDialog(
+            ChannelSettingsDialog.showChannelSettingsDialog(controller,
                     (Channel) getContainer(), getController().getMainFrame(),
                     (InputWindow) getController().getWindowFactory()
                     .getSwingWindow(frameParent));

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

@@ -56,6 +56,8 @@ public final class ServerFrame extends InputTextFrame implements
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 9;
+    /** Swing controller. */
+    private final SwingController controller;
     /** popup menu item. */
     private JMenuItem settingsMI;
     /** The SSL certificate dialog we're displaying for this server, if any. */
@@ -70,6 +72,7 @@ public final class ServerFrame extends InputTextFrame implements
     public ServerFrame(final SwingController controller, final Server owner) {
         super(controller, owner);
 
+        this.controller = controller;
         initComponents();
 
         owner.addCertificateProblemListener(this);
@@ -96,8 +99,8 @@ public final class ServerFrame extends InputTextFrame implements
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            ServerSettingsDialog.showServerSettingsDialog(getContainer().
-                    getServer(), getController().getMainFrame());
+            ServerSettingsDialog.showServerSettingsDialog(controller,
+                    getContainer().getServer(), getController().getMainFrame());
         }
     }
 
@@ -163,8 +166,9 @@ public final class ServerFrame extends InputTextFrame implements
     @Override
     public void windowClosing(final FrameContainer window) {
         if (ServerSettingsDialog.hasServerSettingsDialog()) {
-            ServerSettingsDialog.getServerSettingsDialog(getContainer()
-                    .getServer(), getController().getMainFrame()).dispose();
+            ServerSettingsDialog.getServerSettingsDialog(controller,
+                    getContainer().getServer(),
+                    getController().getMainFrame()).dispose();
         }
 
         super.windowClosing(window);

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

@@ -22,9 +22,9 @@
 
 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.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.util.validators.Validator;
 
@@ -46,28 +46,33 @@ public class ValidatingTextFieldInputField extends ValidatingJTextField
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-
     /** Colour picker. */
-    protected ColourPickerDialog colourPicker;
+    private ColourPickerDialog colourPicker;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new text field with the specified validator.
      *
+     * @param controller Swing controller
      * @param validator Validator for this textfield
      */
-    public ValidatingTextFieldInputField(final Validator<String> validator) {
-        super(validator);
+    public ValidatingTextFieldInputField(final SwingController controller,
+            final Validator<String> validator) {
+        this(controller, new JTextField(), validator);
     }
 
     /**
      * Creates a new text field with the specified validator.
      *
+     * @param controller Swing controller
      * @param validator Validator for this textfield
      * @param textField Textfield to use as a base
      */
-    public ValidatingTextFieldInputField(final JTextField textField,
-            final Validator<String> validator) {
-        super(textField, validator);
+    public ValidatingTextFieldInputField(final SwingController controller,
+            final JTextField textField, final Validator<String> validator) {
+        super(controller.getIconManager(), textField, validator);
+        this.controller = controller;
     }
 
     /** {@inheritDoc} */
@@ -85,7 +90,7 @@ public class ValidatingTextFieldInputField extends ValidatingJTextField
     /** {@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.addActionListener(new ActionListener() {

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

@@ -98,7 +98,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getActionCommand().equals("JoinChannel")) {
-            new ChannelJoinDialog(mainFrame, ModalityType.MODELESS,
+            new ChannelJoinDialog(controller, ModalityType.MODELESS,
                     "Join channel", "Enter the name of the channel to join.")
                     .display();
         } else if (e.getActionCommand().equals("ChannelSettings")) {

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

@@ -122,9 +122,9 @@ public class ServerMenu extends JMenu implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if ("NewServer".equals(e.getActionCommand())) {
-            NewServerDialog.showNewServerDialog(mainFrame);
+            NewServerDialog.showNewServerDialog(controller);
         } else if (e.getActionCommand().equals("ServerList")) {
-            ServerListDialog.showServerListDialog(mainFrame,
+            ServerListDialog.showServerListDialog(controller, mainFrame,
                     controller.getURLHandler());
         } else if (e.getActionCommand().equals("Exit")) {
             mainFrame.quit();

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

@@ -104,12 +104,12 @@ public class SettingsMenu extends JMenu implements ActionListener {
         if ("Preferences".equals(e.getActionCommand())) {
             SwingPreferencesDialog.showSwingPreferencesDialog(controller);
         } else if (e.getActionCommand().equals("Profile")) {
-            ProfileManagerDialog.showProfileManagerDialog(mainFrame);
+            ProfileManagerDialog.showProfileManagerDialog(controller);
         }  else if (e.getActionCommand().equals("Actions")) {
             ActionsManagerDialog.showActionsManagerDialog(mainFrame,
                     controller);
         } else if (e.getActionCommand().equals("Aliases")) {
-            AliasManagerDialog.showAliasManagerDialog(mainFrame);
+            AliasManagerDialog.showAliasManagerDialog(controller, mainFrame);
         }
     }
 }

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.modes;
 
 import com.dmdirc.Channel;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.parser.interfaces.Parser;
 
 /** Non list mode panel. */
@@ -37,15 +37,20 @@ public final class ChannelModesPane extends ModesPane {
     private static final long serialVersionUID = 1;
     /** Parent channel. */
     private final Channel channel;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new instance of ChannelModesPane.
      *
+     * @param controller Swing controller
      * @param channel Parent channel
      */
-    public ChannelModesPane(final Channel channel) {
+    public ChannelModesPane(final SwingController controller,
+            final Channel channel) {
         super();
 
+        this.controller = controller;
         this.channel = channel;
         initModesPanel();
     }
@@ -120,7 +125,7 @@ public final class ChannelModesPane extends ModesPane {
 
     /** {@inheritDoc} */
     @Override
-    public ConfigManager getConfigManager() {
-        return channel.getConfigManager();
+    public SwingController getSwingController() {
+        return controller;
     }
 }

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.modes;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.config.ConfigManager;
 
 import java.awt.Insets;
 import java.util.HashMap;
@@ -111,7 +111,7 @@ public abstract class ModesPane extends JPanel {
                     mode.subSequence(0, 1));
 
             final ParamModePanel panel = new ParamModePanel(mode, state, value,
-                    getConfigManager());
+                    getSwingController());
 
             getParamModes().put(mode, panel);
         }
@@ -235,11 +235,11 @@ public abstract class ModesPane extends JPanel {
     }
 
     /**
-     * Returns the config manager to retrieve values from
+     * Returns the Swing controller to grab various objects from.
      *
-     * @return Config manager
+     * @return Swing controller
      */
-    public abstract ConfigManager getConfigManager();
+    public abstract SwingController getSwingController();
 
     /**
      * Checks whether there is a plain text description for this mode.

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.modes;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.util.validators.RegexStringValidator;
 
 import java.awt.Component;
@@ -62,18 +62,18 @@ public final class ParamModePanel extends JPanel implements ActionListener {
      * @param thisMode The mode that this panel should deal with
      * @param state The current state of the mode
      * @param value The current value of the mode
-     * @param configManager The config manager to use to get mode names
+     * @param controller  Swing controller to gain access to settings/icons
      */
     public ParamModePanel(final String thisMode, final boolean state,
-            final String value, final ConfigManager configManager) {
+            final String value, final SwingController controller) {
         super();
         this.mode = thisMode;
         this.originalValue = value;
         String text;
         String tooltip;
-        if (configManager.hasOptionString("server", "mode" + mode)) {
-            tooltip = "Mode " + mode + ": " + configManager.getOption(
-                    "server", "mode" + mode);
+        if (controller.getGlobalConfig().hasOptionString("server", "mode" + mode)) {
+            tooltip = "Mode " + mode + ": " + controller.getGlobalConfig()
+                    .getOption("server", "mode" + mode);
         } else {
             tooltip = "Mode " + mode + ": Unknown";
         }
@@ -82,8 +82,8 @@ public final class ParamModePanel extends JPanel implements ActionListener {
 
         text = "Mode " + mode + ": ";
 
-        if (configManager.hasOptionString("server", "mode" + mode)) {
-            text = configManager.getOption("server", "mode" + mode)
+        if (controller.getGlobalConfig().hasOptionString("server", "mode" + mode)) {
+            text = controller.getGlobalConfig().getOption("server", "mode" + mode)
                     + " [+" + mode + "]: ";
         }
 
@@ -92,8 +92,8 @@ public final class ParamModePanel extends JPanel implements ActionListener {
         checkBox.setOpaque(UIUtilities.getTabbedPaneOpaque());
         add(checkBox);
 
-        textField = new ValidatingJTextField(new RegexStringValidator("^[^ ]*$",
-                "Cannot contain spaces"));
+        textField = new ValidatingJTextField(controller.getIconManager(),
+                new RegexStringValidator("^[^ ]*$", "Cannot contain spaces"));
         textField.setText(value);
         add(textField, "growx, pushx");
 

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.modes;
 
 import com.dmdirc.Server;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.addons.ui_swing.SwingController;
 
 /** User mode panel. */
 public final class UserModesPane extends ModesPane {
@@ -36,15 +36,20 @@ public final class UserModesPane extends ModesPane {
     private static final long serialVersionUID = 1;
     /** Parent server. */
     private final Server server;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Creates a new instance of UserModesPane.
      *
+     * @param controller Swing controller
      * @param server Parent server
      */
-    public UserModesPane(final Server server) {
+    public UserModesPane(final SwingController controller,
+            final Server server) {
         super();
 
+        this.controller = controller;
         this.server = server;
         initModesPanel();
     }
@@ -113,7 +118,7 @@ public final class UserModesPane extends ModesPane {
 
     /** {@inheritDoc} */
     @Override
-    public ConfigManager getConfigManager() {
-        return server.getConfigManager();
+    public SwingController getSwingController() {
+        return controller;
     }
 }

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

@@ -24,7 +24,6 @@ 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.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
@@ -58,8 +57,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
      */
     private static final long serialVersionUID = 2;
     /** non error state image icon. */
-    private static final Icon DEFAULT_ICON = new IconManager(IdentityManager
-            .getGlobalConfig()).getIcon("normal");
+    private final Icon DEFAULT_ICON;
     /** Status controller. */
     private final MainFrame mainFrame;
     /** Swing status bar. */
@@ -79,7 +77,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
     private ErrorLevel errorLevel;
 
     /**
-     * Creates a new ErrorPanel for the speicified status bar.
+     * Creates a new ErrorPanel for the specified status bar.
      *
      * @param controller Swing controller
      * @param mainFrame Main frame
@@ -92,6 +90,8 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
         this.controller = controller;
         this.mainFrame = mainFrame;
         this.statusBar = statusBar;
+        DEFAULT_ICON = new IconManager(controller.getGlobalConfig())
+                .getIcon("normal");
 
         menu = new JPopupMenu();
         dismiss = new JMenuItem("Clear All");
@@ -153,7 +153,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
                         if (errorLevel == null ||
                                 !error.getLevel().moreImportant(errorLevel)) {
                             errorLevel = error.getLevel();
-                            label.setIcon(new IconManager(IdentityManager
+                            label.setIcon(new IconManager(controller
                                     .getGlobalConfig()).getIcon(errorLevel
                                     .getIcon()));
                         }

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

@@ -36,7 +36,7 @@ public class GappedEtchedBorder extends EtchedBorder {
     /** Java serialisation version ID. */
     private static final long serialVersionUID = 1;
     /** Parent popup window. */
-    private final StatusbarPopupWindow outer;
+    private transient final StatusbarPopupWindow outer;
 
     /**
      * Creates a new etched border leaving a gap where the specified window is.

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

@@ -27,16 +27,15 @@ import com.dmdirc.Server;
 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.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.InviteListener;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
@@ -68,23 +67,23 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     private final JMenuItem dismiss;
     /** Accept invites menu item. */
     private final JMenuItem accept;
-    /** Parent window. */
-    private final MainFrame mainFrame;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Active server. */
     private Server activeServer;
 
     /**
      * Instantiates a new invite label.
      *
-     * @param mainFrame Parent window
+     * @param controller Swing controller
      */
-    public InviteLabel(final MainFrame mainFrame) {
+    public InviteLabel(final SwingController controller) {
         super(new JLabel());
 
-        this.mainFrame = mainFrame;
+        this.controller = controller;
 
         setBorder(BorderFactory.createEtchedBorder());
-        label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+        label.setIcon(new IconManager(controller.getGlobalConfig())
                 .getIcon("invite"));
 
         menu = new JPopupMenu();
@@ -99,7 +98,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
             server.addInviteListener(this);
         }
 
-        mainFrame.addSelectionListener(this);
+        controller.getMainFrame().addSelectionListener(this);
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.SERVER_CONNECTED);
         ActionManager.getActionManager().registerListener(this,
@@ -113,11 +112,11 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new InvitePopup(this, activeServer, mainFrame);
+        return new InvitePopup(this, activeServer, controller.getMainFrame());
     }
 
     /**
-     * Popuplates the menu.
+     * Populates the menu.
      */
     private void popuplateMenu() {
         menu.removeAll();

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
@@ -67,20 +67,23 @@ 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;
 
     /**
      * Instantiates a new message label.
      *
      * @param parentWindow Parent window
+     * @param config Config manager to read settings from
      */
-    public MessageLabel(final Window parentWindow) {
+    public MessageLabel(final Window parentWindow, final ConfigManager config) {
         super(new MigLayout("fill, ins 0, gap 0  0"));
+        this.config = config;
         queue = new ConcurrentLinkedQueue<StatusMessage>();
-        defaultMessage = new StatusMessage(null, "Ready.", null, -1,
-                IdentityManager.getGlobalConfig());
+        defaultMessage = new StatusMessage(null, "Ready.", null, -1, config);
         currentMessage = defaultMessage;
         label = new JLabel();
-        historyLabel = new MessagePopup(this, parentWindow);
+        historyLabel = new MessagePopup(this, parentWindow, config);
         label.setText("Ready.");
         label.setBorder(new SidelessEtchedBorder(
                 SidelessEtchedBorder.Side.RIGHT));
@@ -114,8 +117,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
                 if (currentMessage.getIconType() == null) {
                     label.setIcon(null);
                 } else {
-                    label.setIcon(new IconManager(IdentityManager
-                            .getGlobalConfig()).getIcon(
+                    label.setIcon(new IconManager(config).getIcon(
                             currentMessage.getIconType()));
                 }
                 label.setText(UIUtilities.clipStringifNeeded(MessageLabel.this,

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
 
@@ -57,19 +57,24 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
     private final List<StatusMessage> messages;
     /** Parent panel. */
     private final JPanel parent;
+    /** Config manager. */
+    private final ConfigManager configManager;
 
     /**
      * Creates a new message history popup.
      *
      * @param parent Parent to size against
      * @param parentWindow Parent window
+     * @param configManager Config manager
      */
-    public MessagePopup(final JPanel parent, final Window parentWindow) {
+    public MessagePopup(final JPanel parent, final Window parentWindow,
+            final ConfigManager configManager) {
         super(new JLabel("^"),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.LEFT),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.TOP));
         this.parentWindow = parentWindow;
         this.parent = parent;
+        this.configManager = configManager;
         messages = new ArrayList<StatusMessage>();
     }
 
@@ -164,9 +169,9 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
 
             for (StatusMessage message : messages) {
                 panel.add(new JLabel(message.getMessage(), message.getIconType()
-                        == null ? null : new IconManager(IdentityManager
-                        .getGlobalConfig()).getIcon(message.getIconType()),
-                        SwingConstants.LEFT), "grow, push, wrap");
+                        == null ? null : new IconManager(configManager)
+                        .getIcon(message.getIconType()), SwingConstants.LEFT),
+                        "grow, push, wrap");
             }
         }
 

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

@@ -69,10 +69,11 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
             final MainFrame mainFrame) {
         super();
 
-        messageLabel = new MessageLabel(mainFrame);
+        messageLabel = new MessageLabel(mainFrame,
+                controller.getGlobalConfig());
         errorPanel = new ErrorPanel(controller, mainFrame, this);
-        updateLabel = new UpdaterLabel(mainFrame);
-        inviteLabel = new InviteLabel(mainFrame);
+        updateLabel = new UpdaterLabel(controller);
+        inviteLabel = new InviteLabel(controller);
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3"));
 

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

@@ -22,12 +22,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.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateChecker.STATE;
 import com.dmdirc.updater.UpdateCheckerListener;
@@ -38,6 +37,8 @@ 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.
@@ -52,17 +53,19 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
      */
     private static final long serialVersionUID = 1;
     /** Swing controller. */
-    private final MainFrame mainFrame;
+    @Getter
+    private final SwingController controller;
 
     /**
-     * Instantiates a new updater label, handles showing updates on the status bar.
+     * Instantiates a new updater label, handles showing updates on the status
+     * bar.
      *
-     * @param mainFrame Main frame
+     * @param controller Swing controller
      */
-    public UpdaterLabel(final MainFrame mainFrame) {
+    public UpdaterLabel(final SwingController controller) {
         super(new JLabel());
 
-        this.mainFrame = mainFrame;
+        this.controller = controller;
         setBorder(BorderFactory.createEtchedBorder());
         UpdateChecker.addListener(this);
         setVisible(false);
@@ -79,11 +82,14 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         super.mouseClicked(mouseEvent);
 
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
-            if (UpdateChecker.getStatus().equals(UpdateChecker.STATE.RESTART_REQUIRED)) {
-                SwingRestartDialog.showSwingRestartDialog(mainFrame, ModalityType.MODELESS);
-            } else if (!UpdateChecker.getStatus().equals(UpdateChecker.STATE.CHECKING)) {
-                SwingUpdaterDialog.showSwingUpdaterDialog(
-                        UpdateChecker.getAvailableUpdates(), mainFrame);
+            if (UpdateChecker.getStatus().equals(
+                    UpdateChecker.STATE.RESTART_REQUIRED)) {
+                SwingRestartDialog.showSwingRestartDialog(controller
+                        .getMainFrame(), ModalityType.MODELESS);
+            } else if (!UpdateChecker.getStatus().equals(
+                    UpdateChecker.STATE.CHECKING)) {
+                SwingUpdaterDialog.showSwingUpdaterDialog(UpdateChecker
+                        .getAvailableUpdates(), controller.getMainFrame());
             }
         }
     }
@@ -98,13 +104,13 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         }
 
         if (newStatus.equals(STATE.CHECKING)) {
-            label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+            label.setIcon(new IconManager(controller.getGlobalConfig())
                     .getIcon("hourglass"));
         } else if (newStatus.equals(STATE.UPDATES_AVAILABLE)) {
-            label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+            label.setIcon(new IconManager(controller.getGlobalConfig())
                     .getIcon("update"));
         } else if (newStatus.equals(STATE.RESTART_REQUIRED)) {
-            label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+            label.setIcon(new IconManager(controller.getGlobalConfig())
                     .getIcon("restart-needed"));
         }
     }
@@ -112,6 +118,6 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new UpdaterPopup(this, mainFrame);
+        return new UpdaterPopup(this, controller.getMainFrame());
     }
 }

src/com/dmdirc/addons/ui_swing/components/validating/ValidatingJTextField.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.validating;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
@@ -65,25 +64,27 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
     /**
      * Instantiates a new Validating text field.
      *
+     * @param iconManager Icon manager
      * @param validator Validator instance
      */
-    public ValidatingJTextField(final Validator<String> validator) {
-        this(new JTextField(), validator);
+    public ValidatingJTextField(final IconManager iconManager,
+            final Validator<String> validator) {
+        this(iconManager, new JTextField(), validator);
     }
 
     /**
      * Instantiates a new Validating text field.
      *
+     * @param iconManager Icon manager
      * @param textField JTextField to wrap
      * @param validator Validator instance
      */
-    public ValidatingJTextField(final JTextField textField,
-            final Validator<String> validator) {
+    public ValidatingJTextField(final IconManager iconManager,
+            final JTextField textField, final Validator<String> validator) {
         super();
         this.textField = textField;
         this.validator = validator;
-        errorIcon = new JLabel(new IconManager(IdentityManager
-                .getGlobalConfig()).getIcon("input-error"));
+        errorIcon = new JLabel(iconManager.getIcon("input-error"));
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3, gap 0"));
         add(textField, "grow, pushx");

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs;
 
 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;
@@ -42,16 +43,17 @@ public class ChannelJoinDialog extends StandardInputDialog {
      * Creates a new dialog which prompts a user and then joins the channel
      * they specify.
      *
-     * @param owner Parent window
+     * @param controller Swing controller
      * @param modality Window modality
      * @param title Window title
      * @param message Window message
      */
-    public ChannelJoinDialog(final MainFrame owner, final ModalityType modality,
-            final String title, final String message) {
-        super(owner, modality, title, message);
+    public ChannelJoinDialog(final SwingController controller,
+            final ModalityType modality, final String title,
+            final String message) {
+        super(controller, controller.getMainFrame(), modality, title, message);
 
-        this.mainFrame = owner;
+        this.mainFrame = controller.getMainFrame();
     }
 
     /** {@inheritDoc} */

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableChangeEvent;
@@ -85,8 +85,8 @@ public final class NewServerDialog extends StandardDialog implements
     private JComboBox identityField;
     /** button. */
     private JButton editProfileButton;
-    /** Main frame. */
-    private final MainFrame mainFrame;
+    /** Swing controller. */
+    private final SwingController controller;
     /**  Opening new server? */
     private boolean openingServer = false;
 
@@ -95,10 +95,10 @@ public final class NewServerDialog extends StandardDialog implements
      *
      * @param mainFrame Main frame
      */
-    private NewServerDialog(final MainFrame mainFrame) {
-        super(mainFrame, ModalityType.MODELESS);
+    private NewServerDialog(final SwingController controller) {
+        super(controller.getMainFrame(), ModalityType.MODELESS);
 
-        this.mainFrame = mainFrame;
+        this.controller = controller;
 
         initComponents();
         layoutComponents();
@@ -120,10 +120,10 @@ public final class NewServerDialog extends StandardDialog implements
     /**
      * Creates the new server dialog if one doesn't exist, and displays it.
      *
-     * @param mainFrame Main frame
+     * @param controller Swing controller
      */
-    public static void showNewServerDialog(final MainFrame mainFrame) {
-        me = getNewServerDialog(mainFrame);
+    public static void showNewServerDialog(final SwingController controller) {
+        me = getNewServerDialog(controller);
 
         me.display();
     }
@@ -131,15 +131,15 @@ public final class NewServerDialog extends StandardDialog implements
     /**
      * Returns the current instance of the NewServerDialog.
      *
-     * @param mainFrame Main frame
+     * @param controller Swing controller
      *
      * @return The current NewServerDialog instance
      */
     public static NewServerDialog getNewServerDialog(
-            final MainFrame mainFrame) {
+            final SwingController controller) {
         synchronized (NewServerDialog.class) {
             if (me == null) {
-                me = new NewServerDialog(mainFrame);
+                me = new NewServerDialog(controller);
             }
         }
 
@@ -157,11 +157,11 @@ public final class NewServerDialog extends StandardDialog implements
 
     /** Updates the values to defaults. */
     private void update() {
-        serverField.setText(IdentityManager.getGlobalConfig().getOption("general",
+        serverField.setText(controller.getGlobalConfig().getOption("general",
                 "server"));
-        portField.setText(IdentityManager.getGlobalConfig().getOption("general",
+        portField.setText(controller.getGlobalConfig().getOption("general",
                 "port"));
-        passwordField.setText(IdentityManager.getGlobalConfig().getOption("general",
+        passwordField.setText(controller.getGlobalConfig().getOption("general",
                 "password"));
         sslCheck.setSelected(false);
         newServerWindowCheck.setEnabled(false);
@@ -169,7 +169,7 @@ public final class NewServerDialog extends StandardDialog implements
         serverField.requestFocusInWindow();
 
         if (ServerManager.getServerManager().numServers() == 0 ||
-                mainFrame.getActiveFrame() == null) {
+                controller.getMainFrame().getActiveFrame() == null) {
             newServerWindowCheck.setSelected(true);
             newServerWindowCheck.setEnabled(false);
         } else {
@@ -194,8 +194,10 @@ public final class NewServerDialog extends StandardDialog implements
      * Initialises the components in this dialog.
      */
     private void initComponents() {
-        serverField = new ValidatingJTextField(new ServerNameValidator());
-        portField = new ValidatingJTextField(new PortValidator());
+        serverField = new ValidatingJTextField(controller.getIconManager(),
+                new ServerNameValidator());
+        portField = new ValidatingJTextField(controller.getIconManager(),
+                new PortValidator());
         passwordField = new JPasswordField();
         newServerWindowCheck = new JCheckBox();
         newServerWindowCheck.setSelected(true);
@@ -287,25 +289,27 @@ public final class NewServerDialog extends StandardDialog implements
                 ""), pass, host, port, null, null, null);
 
             // Open in a new window?
-            if (newServerWindowCheck.isSelected() || ServerManager.getServerManager()
-                    .numServers() == 0 || mainFrame.getActiveFrame() == null) {
+            if (newServerWindowCheck.isSelected()
+                    || ServerManager.getServerManager().numServers() == 0
+                    || controller.getMainFrame().getActiveFrame() == null) {
 
-                new LoggingSwingWorker() {
+                new LoggingSwingWorker<Void, Void>() {
                     @Override
-                    protected Object doInBackground() {
+                    protected Void doInBackground() {
                         final Server server = new Server(address, profile);
                         server.connect();
                         return null;
                     }
                 }.executeInExecutor();
             } else {
-                final Server server = mainFrame.getActiveFrame().getContainer().getServer();
+                final Server server = controller.getMainFrame()
+                        .getActiveFrame().getContainer().getServer();
 
-                new LoggingSwingWorker() {
+                new LoggingSwingWorker<Void, Void>() {
 
                     /** {@inheritDoc} */
                     @Override
-                    protected Object doInBackground() {
+                    protected Void doInBackground() {
                         if (server == null) {
                             final Server newServer = new Server(address, profile);
                             newServer.connect();
@@ -331,7 +335,7 @@ public final class NewServerDialog extends StandardDialog implements
         if (e.getSource() == getOkButton()) {
             save();
         } else if (e.getSource() == editProfileButton) {
-            ProfileManagerDialog.showProfileManagerDialog(mainFrame);
+            ProfileManagerDialog.showProfileManagerDialog(controller);
         } else if (e.getSource() == getCancelButton()) {
             dispose();
         }

src/com/dmdirc/addons/ui_swing/dialogs/StandardInputDialog.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 com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.util.validators.ValidationResponse;
@@ -55,18 +56,22 @@ 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.
      *
+     * @param controller Swing controller
      * @param owner Dialog owner
      * @param modal modality type
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardInputDialog(final Window owner, final ModalityType modal,
+    public StandardInputDialog(final SwingController controller,
+            final Window owner, final ModalityType modal,
             final String title, final String message) {
-        this(owner, modal, title, message, new Validator<String>() {
+        this(controller, owner, modal, title, message, new Validator<String>() {
 
             /** {@inheritDoc} */
             @Override
@@ -79,17 +84,20 @@ public abstract class StandardInputDialog extends StandardDialog {
     /**
      * Instantiates a new standard input dialog.
      *
+     * @param controller Swing controller
      * @param owner Dialog owner
      * @param modal modality type
      * @param validator Textfield validator
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardInputDialog(final Window owner, final ModalityType modal,
+    public StandardInputDialog(final SwingController controller,
+            final Window owner, final ModalityType modal,
             final String title, final String message,
             final Validator<String> validator) {
         super(owner, modal);
 
+        this.controller = controller;
         this.validator = validator;
         this.message = message;
 
@@ -118,7 +126,7 @@ public abstract class StandardInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        textField = new ValidatingJTextField(validator);
+        textField = new ValidatingJTextField(controller.getIconManager(), validator);
         blurb = new TextLabel(message);
         validateText();
     }

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

@@ -27,6 +27,7 @@ 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;
@@ -64,20 +65,29 @@ public class ActionConditionsPanel extends JPanel implements ActionListener,
     private boolean treeValidates = true;
     /** list validates? */
     private boolean listValidates = true;
+    /** Icon manager. */
+    private IconManager iconManager;
 
-    /** Instantiates the panel. */
-    public ActionConditionsPanel() {
-        this(null);
+    /**
+     * Instantiates the panel.
+     *
+     * @param iconManager Icon manager
+     */
+    public ActionConditionsPanel(final IconManager iconManager) {
+        this(iconManager, null);
     }
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager
      * @param trigger Action trigger
      */
-    public ActionConditionsPanel(final ActionType trigger) {
+    public ActionConditionsPanel(final IconManager iconManager,
+            final ActionType trigger) {
         super();
 
+        this.iconManager = iconManager;
         initComponents();
         addListeners();
         layoutComponents();
@@ -95,7 +105,7 @@ public class ActionConditionsPanel extends JPanel implements ActionListener,
 
     /** Initialises the components. */
     private void initComponents() {
-        tree = new ActionConditionsTreePanel();
+        tree = new ActionConditionsTreePanel(iconManager);
         list = new ActionConditionsListPanel(tree);
         add = new JButton("Add");
     }

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

@@ -29,6 +29,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.actions.validators.ConditionRuleValidator;
 
+import com.dmdirc.ui.IconManager;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -72,13 +73,18 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
     private ConditionRuleValidator treeValidator;
     /** validates. */
     private boolean validates = true;
+    /** Icon manager. */
+    private IconManager iconManager;
 
     /**
      * Instantiates the panel.
+     *
+     * @param iconManager Icon manager
      */
-    public ActionConditionsTreePanel() {
+    public ActionConditionsTreePanel(final IconManager iconManager) {
         super();
 
+        this.iconManager = iconManager;
         initComponents();
         addListeners();
         layoutComponents();
@@ -94,7 +100,7 @@ public class ActionConditionsTreePanel extends JPanel implements ActionListener,
         customButton = new JRadioButton("The conditions match a custom rule");
         treeValidator = new ConditionRuleValidator(conditionCount);
 
-        rule = new ValidatingJTextField(treeValidator);
+        rule = new ValidatingJTextField(iconManager, treeValidator);
 
         group.add(allButton);
         group.add(oneButton);

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionStatus;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.Dimension;
 import java.awt.Window;
@@ -78,30 +79,36 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     private Action action;
     /** Action group. */
     private String group;
+    /** Icon manager. */
+    private IconManager iconManager;
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager
      * @param window Parent window
      * @param group Action's group
      */
-    private ActionEditorDialog(final Window window, final String group) {
-        this(window, group, null);
+    private ActionEditorDialog(final IconManager iconManager,
+            final Window window, final String group) {
+        this(iconManager, window, group, null);
     }
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager
      * @param window Parent window
      * @param action Action to be edited
      * @param group Action's group
      */
-    private ActionEditorDialog(final Window window, final String group,
-            final Action action) {
+    private ActionEditorDialog(final IconManager iconManager,
+            final Window window, final String group, final Action action) {
         super(window, ModalityType.DOCUMENT_MODAL);
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         setTitle("Action Editor");
 
+        this.iconManager = iconManager;
         this.group = group;
         this.action = action;
 
@@ -127,24 +134,26 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     /**
      * 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 Window window,
-            final String group) {
-        showActionEditorDialog(window, group, null);
+    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 Window window,
-            final String group, final Action action) {
-        getActionEditorDialog(window, group, action);
+    public static void showActionEditorDialog(final IconManager iconManager,
+            final Window window, final String group, final Action action) {
+        getActionEditorDialog(iconManager, window, group, action);
 
         me.display();
     }
@@ -152,30 +161,34 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     /**
      * 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 Window window,
+    public static ActionEditorDialog getActionEditorDialog(
+            final IconManager iconManager, final Window window,
             final String group) {
-        return getActionEditorDialog(window, group, null);
+        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 Window window,
+    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(window, group, action);
+                me = new ActionEditorDialog(iconManager, window, group, action);
             }
         }
 
@@ -212,10 +225,10 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     /** Initialises the components. */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        name = new ActionNamePanel("", group);
+        name = new ActionNamePanel(iconManager, "", group);
         triggers = new ActionTriggersPanel();
         response = new ActionResponsePanel();
-        conditions = new ActionConditionsPanel();
+        conditions = new ActionConditionsPanel(iconManager);
         substitutions = new ActionSubstitutionsPanel();
         advanced = new ActionAdvancedPanel();
         showSubstitutions = new JButton("Show Substitutions");

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

@@ -26,6 +26,7 @@ import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.actions.validators.ActionNameValidator;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.FileNameValidator;
 import com.dmdirc.util.validators.ValidatorChain;
 
@@ -57,23 +58,28 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
     private ValidatingJTextField name;
     /** Action group. */
     private ActionGroup group;
+    /** Icon manager. */
+    private IconManager iconManager;
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager
      * @param group Associated group for this action
      */
-    public ActionNamePanel(final String group) {
-        this("", group);
+    public ActionNamePanel(final IconManager iconManager, final String group) {
+        this(iconManager, "", group);
     }
 
     /**
      * Instantiates the panel.
      *
+     * @param iconManager Icon manager
      * @param name Initial name of the action
      * @param group Associated group for this action
      */
-    public ActionNamePanel(final String name, final String group) {
+    public ActionNamePanel(final IconManager iconManager, final String name,
+            final String group) {
         super();
 
         if (name == null) {
@@ -81,6 +87,7 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
         } else {
             this.existingName = name;
         }
+        this.iconManager = iconManager;
         this.group = ActionManager.getActionManager().getOrCreateGroup(group);
 
         initComponents();
@@ -114,7 +121,8 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
     /** Initialises the components. */
     @SuppressWarnings("unchecked")
     private void initComponents() {
-        name = new ValidatingJTextField(new JTextField(existingName),
+        name = new ValidatingJTextField(iconManager,
+                new JTextField(existingName),
                 new ValidatorChain<String>(new FileNameValidator(),
                 new ActionNameValidator(group, existingName)));
     }

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

@@ -61,27 +61,34 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
     private Map<JButton, PreferencesSetting> settingMap;
     /** Parent dialog. */
     private Window window;
+    /** Prefs component factory. */
+    private PrefsComponentFactory factory;
 
     /**
      * Initialises a new action group information panel.
      *
+     * @param factory Prefs component factory
      * @param group Action group
      */
-    public ActionGroupSettingsPanel(final ActionGroup group) {
-        this(group, null);
+    public ActionGroupSettingsPanel(final PrefsComponentFactory factory,
+            final ActionGroup group) {
+        this(factory, group, null);
     }
 
     /**
      * Initialises a new action group information panel.
      *
+     * @param factory Prefs component factory
      * @param group Action group
      * @param window Parent window
      *
      * @since 0.6
      */
-    public ActionGroupSettingsPanel(final ActionGroup group, final Window window) {
+    public ActionGroupSettingsPanel(final PrefsComponentFactory factory,
+            final ActionGroup group, final Window window) {
         super();
 
+        this.factory = factory;
         this.window = window;
 
         initComponents();
@@ -114,8 +121,7 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
         for (PreferencesSetting setting : settings) {
             final JLabel label = new JLabel(setting.getTitle());
             label.setToolTipText(setting.getTitle());
-            final JComponent component =
-                    PrefsComponentFactory.getComponent(setting);
+            final JComponent component = factory.getComponent(setting);
 
             if (component instanceof DurationDisplay) {
                 ((DurationDisplay) component).setWindow(window);

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

@@ -32,6 +32,7 @@ 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;
@@ -81,16 +82,21 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
     private JButton delete;
     /** Action group. */
     private ActionGroup group;
+    /** Prefs component factory. */
+    private IconManager iconManager;
 
     /**
      * Creates a new instance of ActionsManagerDialog.
      *
+     * @param iconManager Prefs component factory
      * @param parent Parent window
      * @param group Action group to display
      */
-    public ActionsGroupPanel(final Window parent, final ActionGroup group) {
+    public ActionsGroupPanel(final IconManager iconManager,
+            final Window parent, final ActionGroup group) {
         super();
 
+        this.iconManager = iconManager;
         this.parent = parent;
         this.group = group;
 
@@ -243,10 +249,11 @@ public final class ActionsGroupPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
-            ActionEditorDialog.showActionEditorDialog(parent, group.getName());
+            ActionEditorDialog.showActionEditorDialog(iconManager, parent,
+                    group.getName());
         } else if (e.getSource() == edit) {
-            ActionEditorDialog.showActionEditorDialog(parent, group.getName(),
-                    model.getAction(
+            ActionEditorDialog.showActionEditorDialog(iconManager, parent,
+                    group.getName(), model.getAction(
                     table.getRowSorter().convertRowIndexToModel(table.
                     getSelectedRow())));
         } else if (e.getSource() == delete) {

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

@@ -77,6 +77,12 @@ public final class ActionsManagerDialog extends StandardDialog implements
     private static final long serialVersionUID = 1;
     /** Previously created instance of ActionsManagerDialog. */
     private static volatile ActionsManagerDialog me;
+    /** Are we saving? */
+    private final AtomicBoolean saving = new AtomicBoolean(false);
+    /** Duplicate action group validator. */
+    private final ValidatorChain<String> validator;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Info label. */
     private TextLabel infoLabel;
     /** Group list. */
@@ -97,10 +103,6 @@ public final class ActionsManagerDialog extends StandardDialog implements
     private ActionGroupSettingsPanel activeSettings;
     /** Group panel. */
     private JPanel groupPanel;
-    /** Are we saving? */
-    private final AtomicBoolean saving = new AtomicBoolean(false);
-    /** Duplicate action group validator. */
-    private final ValidatorChain<String> validator;
 
     /**
      * Creates a new instance of ActionsManagerDialog.
@@ -111,6 +113,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
         super(Apple.isAppleUI() ? new AppleJFrame((MainFrame) parentWindow,
                 controller) : null, ModalityType.MODELESS);
 
+        this.controller= controller;
         initComponents();
         validator = new ValidatorChain<String>(
                 new ActionGroupNoDuplicatesInListValidator(groups,
@@ -180,10 +183,11 @@ public final class ActionsManagerDialog extends StandardDialog implements
                 + " to suit your needs.");
         groups = new JList(new SortedListModel<ActionGroup>(
                 new ActionGroupNameComparator()));
-        actions = new ActionsGroupPanel(this, null);
+        actions = new ActionsGroupPanel(controller.getIconManager(), this, null);
         info = new ActionGroupInformationPanel(null);
         settings = new HashMap<ActionGroup, ActionGroupSettingsPanel>();
-        activeSettings = new ActionGroupSettingsPanel(null, this);
+        activeSettings = new ActionGroupSettingsPanel(controller
+                .getPrefsComponentFactory(), null, this);
         settings.put(null, activeSettings);
         add = new JButton("Add");
         edit = new JButton("Edit");
@@ -294,7 +298,8 @@ public final class ActionsManagerDialog extends StandardDialog implements
         actions.setActionGroup(group);
         if (!settings.containsKey(group)) {
             final ActionGroupSettingsPanel currentSettings =
-                    new ActionGroupSettingsPanel(group, this);
+                    new ActionGroupSettingsPanel(controller
+                    .getPrefsComponentFactory(), group, this);
             settings.put(group, currentSettings);
             currentSettings.setBorder(BorderFactory.createTitledBorder(
                     UIManager.getBorder("TitledBorder.border"), "Settings"));
@@ -330,7 +335,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
             for (ActionGroupSettingsPanel loopSettings : settings.values()) {
                 loopSettings.save();
             }
-            IdentityManager.getConfigIdentity().setOption("dialogstate",
+            controller.getGlobalIdentity().setOption("dialogstate",
                     "actionsmanagerdialog", groups.getSelectedIndex());
             dispose();
         }
@@ -342,7 +347,7 @@ public final class ActionsManagerDialog extends StandardDialog implements
     private void addGroup() {
         final int index = groups.getSelectedIndex();
         groups.getSelectionModel().clearSelection();
-        new StandardInputDialog(this,
+        new StandardInputDialog(controller, this,
                 ModalityType.DOCUMENT_MODAL, "New action group",
                 "Please enter the name of the new action group", validator) {
 
@@ -382,8 +387,8 @@ public final class ActionsManagerDialog extends StandardDialog implements
     private void editGroup() {
         final String oldName =
                 ((ActionGroup) groups.getSelectedValue()).getName();
-        final StandardInputDialog inputDialog = new StandardInputDialog(this,
-                ModalityType.DOCUMENT_MODAL, "Edit action group",
+        final StandardInputDialog inputDialog = new StandardInputDialog(
+                controller, this, ModalityType.DOCUMENT_MODAL, "Edit action group",
                 "Please enter the new name of the action group", validator) {
 
             /** Java Serialisation verion ID. */

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -28,6 +28,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.wrappers.AliasWrapper;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
@@ -86,17 +87,22 @@ public final class AliasManagerDialog extends StandardDialog implements
     private int selectedRow;
     /** Substitutions panel. */
     private AliasSubstitutionsPanel subsPanel;
-    /** Show/Hide subsitution button. */
+    /** Show/Hide substitution button. */
     private JButton showSubs;
+    /** Swing controller. */
+    private SwingController controller;
 
     /**
      * Creates a new instance of ErrorListDialog.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window
      */
-    private AliasManagerDialog(final Window parentWindow) {
+    private AliasManagerDialog(final SwingController controller,
+            final Window parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
 
+        this.controller = controller;
         setTitle("Alias manager");
 
         selectedRow = -1;
@@ -109,10 +115,12 @@ public final class AliasManagerDialog extends StandardDialog implements
     /**
      * Creates the dialog if one doesn't exist, and displays it.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window
      */
-    public static void showAliasManagerDialog(final Window parentWindow) {
-        me = getAliasManagerDialog(parentWindow);
+    public static void showAliasManagerDialog(final SwingController controller,
+            final Window parentWindow) {
+        me = getAliasManagerDialog(controller, parentWindow);
 
         me.display();
         me.requestFocusInWindow();
@@ -121,15 +129,16 @@ public final class AliasManagerDialog extends StandardDialog implements
     /**
      * Returns the instance of AliasManagerDialog.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window
      *
      * @return Instance of AliasManagerDialog
      */
     public static AliasManagerDialog getAliasManagerDialog(
-            final Window parentWindow) {
+            final SwingController controller, final Window parentWindow) {
         synchronized (AliasManagerDialog.class) {
             if (me == null) {
-                me = new AliasManagerDialog(parentWindow);
+                me = new AliasManagerDialog(controller, parentWindow);
             }
         }
 
@@ -187,7 +196,7 @@ public final class AliasManagerDialog extends StandardDialog implements
 
         scrollPane.setViewportView(table);
 
-        aliasDetails = new AliasPanel();
+        aliasDetails = new AliasPanel(controller);
         subsPanel = new AliasSubstitutionsPanel();
         subsPanel.setVisible(false);
         showSubs = new JButton("Show Substitutions");

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasPanel.java

@@ -26,6 +26,7 @@ import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.wrappers.Alias;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.inputfields.ValidatingTextFieldInputField;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionComparisonCellRenderer;
@@ -70,13 +71,18 @@ public final class AliasPanel extends JPanel implements ActionListener {
     /** Alias. */
     private Alias alias;
 
-    /** Creates a new instance of AliasPanel. */
+    /**
+     * Creates a new instance of AliasPanel.
+     *
+     * @param controller Swing controller
+     */
     @SuppressWarnings("unchecked")
-    public AliasPanel() {
+    public AliasPanel(final SwingController controller) {
         super();
 
-        command = new ValidatingTextFieldInputField(new ValidatorChain<String>(
-                new CommandNameValidator(), new FileNameValidator()));
+        command = new ValidatingTextFieldInputField(controller,
+                new ValidatorChain<String>(new CommandNameValidator(),
+                new FileNameValidator()));
         command.setEnabled(false);
         //new SwingInputHandler(command, GlobalCommandParser
         //        .getGlobalCommandParser(), inputWindow)

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.renderers.ExtendedListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ListModeCellRenderer;
@@ -88,27 +89,32 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     private final MapList<Character, ChannelListModeItem> existingListItems;
     /** Mode count label. */
     private final JLabel modeCount;
-    /** Cell renderer. */
-    private ListCellRenderer renderer;
     /** Extended info toggle. */
     private final JCheckBox toggle;
     /** Parent window. */
     private final Window parentWindow;
+    /** Swing controller. */
+    private final SwingController controller;
+    /** Cell renderer. */
+    private ListCellRenderer renderer;
 
     /**
      * Creates a new instance of ChannelListModePane.
      *
+     * @param controller Swing controller
      * @param channel Parent channel
      * @param parentWindow Parent window
      */
-    public ChannelListModesPane(final Channel channel, final Window parentWindow) {
+    public ChannelListModesPane(final SwingController controller,
+            final Channel channel, final Window parentWindow) {
         super();
 
+        this.controller = controller;
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.channel = channel;
         this.parentWindow = parentWindow;
 
-        if (IdentityManager.getGlobalConfig().getOptionBool("general",
+        if (channel.getConfigManager().getOptionBool("general",
                 "extendedListModes")) {
             renderer = new ExtendedListModeCellRenderer();
         } else {
@@ -125,7 +131,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         removeListModeButton.setEnabled(false);
         modeCount = new JLabel();
         toggle = new JCheckBox("Show extended information",
-                IdentityManager.getGlobalConfig().getOptionBool("general",
+                channel.getConfigManager().getOptionBool("general",
                 "extendedListModes"));
         toggle.setOpaque(UIUtilities.getTabbedPaneOpaque());
 
@@ -220,7 +226,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         removeListModeButton.addActionListener(this);
         listModesMenu.addActionListener(this);
         toggle.addActionListener(this);
-        IdentityManager.getGlobalConfig().addChangeListener("general",
+        channel.getConfigManager().addChangeListener("general",
                 "extendedListModes", this);
 
     }
@@ -270,7 +276,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
 
         channel.getChannelInfo().flushModes();
 
-        IdentityManager.getConfigIdentity().setOption("general",
+        controller.getGlobalIdentity().setOption("general",
                 "extendedListModes", toggle.isSelected());
     }
 
@@ -283,8 +289,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             modeText = channel.getConfigManager().
                     getOption("server", "mode" + listModesArray[selectedIndex]);
         }
-        new StandardInputDialog(parentWindow, ModalityType.DOCUMENT_MODAL,
-                "Add new " + modeText,
+        new StandardInputDialog(controller, parentWindow,
+                ModalityType.DOCUMENT_MODAL, "Add new " + modeText,
                 "Please enter the hostmask for the new " + modeText,
                 new NotEmptyValidator()) {
 

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.addons.ui_swing.components.modes.ChannelModesPane;
 import com.dmdirc.Channel;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
@@ -59,6 +60,12 @@ public final class ChannelSettingsDialog extends StandardDialog implements
     private static volatile ChannelSettingsDialog me;
     /** The channel object that this dialog belongs to. */
     private final Channel channel;
+    /** Channel identity file. */
+    private final Identity identity;
+    /** Channel window. */
+    private final InputWindow channelWindow;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Tabbed pane. */
     private JTabbedPane tabbedPane;
     /** Client settings panel. */
@@ -69,20 +76,19 @@ public final class ChannelSettingsDialog extends StandardDialog implements
     private TopicPane topicModesPane;
     /** List modes panel. */
     private ChannelListModesPane channelListModesPane;
-    /** Channel identity file. */
-    private final Identity identity;
-    /** Channel window. */
-    private final InputWindow channelWindow;
 
     /**
      * Creates a new instance of ChannelSettingsDialog.
      *
+     * @param controller Swing controller
      * @param newChannel The channel object that we're editing settings for
      */
-    private ChannelSettingsDialog(final Channel newChannel,
-            final Window parentWindow, final InputWindow channelWindow) {
+    private ChannelSettingsDialog(final SwingController controller,
+            final Channel newChannel, final Window parentWindow,
+            final InputWindow channelWindow) {
         super(parentWindow, ModalityType.MODELESS);
 
+        this.controller = controller;
         channel = newChannel;
         identity = IdentityManager.getChannelConfig(channel.getServer().
                 getNetwork(), channel.getChannelInfo().getName());
@@ -95,14 +101,16 @@ public final class ChannelSettingsDialog extends StandardDialog implements
     /**
      * Creates the dialog if one doesn't exist, and displays it.
      *
+     * @param controller Swing controller
      * @param channel The channel object that we're editing settings for
      * @param parentWindow Parent window
      * @param channelWindow Channel window
      */
     public static void showChannelSettingsDialog(
-            final Channel channel, final Window parentWindow,
-            final InputWindow channelWindow) {
-        me = getChannelSettingsDialog(channel, parentWindow, channelWindow);
+            final SwingController controller, final Channel channel,
+            final Window parentWindow,final InputWindow channelWindow) {
+        me = getChannelSettingsDialog(controller, channel, parentWindow,
+                channelWindow);
 
         me.display();
         me.requestFocusInWindow();
@@ -111,6 +119,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
     /**
      * Returns the current instance of the ChannelSettingsDialog.
      *
+     * @param controller Swing controller
      * @param channel The channel object that we're editing settings for
      * @param parentWindow Parent window
      * @param channelWindow Channel window
@@ -118,12 +127,12 @@ public final class ChannelSettingsDialog extends StandardDialog implements
      * @return The current ChannelSettingsDialog instance
      */
     public static ChannelSettingsDialog getChannelSettingsDialog(
-            final Channel channel, final Window parentWindow,
-            final InputWindow channelWindow) {
+            final SwingController controller, final Channel channel,
+            final Window parentWindow, final InputWindow channelWindow) {
         synchronized (ChannelSettingsDialog.class) {
             if (me == null) {
-                me = new ChannelSettingsDialog(channel, parentWindow,
-                        channelWindow);
+                me = new ChannelSettingsDialog(controller, channel,
+                        parentWindow, channelWindow);
             }
         }
 
@@ -166,7 +175,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
 
     /** Initialises the IRC Settings tab. */
     private void initIrcTab() {
-        channelModesPane = new ChannelModesPane(channel);
+        channelModesPane = new ChannelModesPane(controller, channel);
 
         final JScrollPane channelModesSP = new JScrollPane(channelModesPane);
         channelModesSP.setHorizontalScrollBarPolicy(
@@ -180,7 +189,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
 
     /** Initialises the IRC Settings tab. */
     private void initListModesTab() {
-        channelListModesPane = new ChannelListModesPane(channel, this);
+        channelListModesPane = new ChannelListModesPane(controller, channel, this);
         tabbedPane.addTab("List Modes", channelListModesPane);
     }
 
@@ -193,7 +202,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
 
     /** Initialises the channel settings. */
     private void initSettingsPanel() {
-        channelSettingsPane = new SettingsPanel(
+        channelSettingsPane = new SettingsPanel(controller,
                 "These settings are specific to this channel on this network,"
                 + " any settings specified here will overwrite global settings");
         channelSettingsPane.addOption(PreferencesManager

src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.TitlePanel;
@@ -76,26 +77,33 @@ public class CategoryPanel extends JPanel {
     private Map<PreferencesCategory, JPanel> panels;
     /** Category loading swing worker. */
     private LoggingSwingWorker worker;
+    /** Prefs component factory. */
+    private final PrefsComponentFactory factory;
 
     /**
      * Instantiates a new category panel.
      *
+     * @param factory Prefs component factory instance
      * @param parent Parent window
      */
-    public CategoryPanel(final SwingPreferencesDialog parent) {
-        this(parent, null);
+    public CategoryPanel(final PrefsComponentFactory factory,
+            final SwingPreferencesDialog parent) {
+        this(factory, parent, null);
     }
 
     /**
      * Instantiates a new category panel.
      *
+     * @param factory Prefs component factory instance
      * @param parent Parent window
      * @param category Initial category
      */
-    public CategoryPanel(final SwingPreferencesDialog parent,
+    public CategoryPanel(final PrefsComponentFactory factory,
+            final SwingPreferencesDialog parent,
             final PreferencesCategory category) {
         super(new MigLayout("fillx, wrap, ins 0"));
         this.parent = parent;
+        this.factory = factory;
 
         panels = Collections.synchronizedMap(
                 new HashMap<PreferencesCategory, JPanel>());
@@ -235,7 +243,7 @@ public class CategoryPanel extends JPanel {
                 }
             });
 
-            worker = new PrefsCategoryLoader(this, category);
+            worker = new PrefsCategoryLoader(factory, this, category);
             worker.executeInExecutor();
         } else {
             categoryLoaded(category);

src/com/dmdirc/addons/ui_swing/dialogs/prefs/PrefsCategoryLoader.java

@@ -64,19 +64,26 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
             getValue();
     /** Error panel. */
     private JPanel errorCategory;
+    /** Category panel. */
     private final CategoryPanel categoryPanel;
+    /** Category to display. */
     private final PreferencesCategory category;
+    /** Prefs component factory instance. */
+    private final PrefsComponentFactory factory;
 
     /**
      * Instantiates a new preferences category loader.
      *
+     * @param factory Prefs component factory instance
      * @param categoryPanel Parent Category panel
      * @param category Preferences Category to load
      */
-    public PrefsCategoryLoader(final CategoryPanel categoryPanel,
+    public PrefsCategoryLoader(final PrefsComponentFactory factory,
+            final CategoryPanel categoryPanel,
             final PreferencesCategory category) {
         super();
 
+        this.factory = factory;
         this.categoryPanel = categoryPanel;
         this.category = category;
 
@@ -93,8 +100,6 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
 
     /**
      * {@inheritDoc}
-     *
-     * @throws Exception if unable to compute a result
      */
     @Override
     protected JPanel doInBackground() {
@@ -198,7 +203,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                JComponent option = PrefsComponentFactory.getComponent(setting);
+                JComponent option = factory.getComponent(setting);
                 option.setToolTipText(null);
                 setObject(option);
             }

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -110,7 +110,9 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                             new PluginPanel(parentWindow, controller),
                             new ThemePanel(parentWindow, controller),
                             new UpdateConfigPanel(controller),
-                            new URLConfigPanel(parentWindow));
+                            new URLConfigPanel(controller, parentWindow),
+                            controller.getGlobalConfig(),
+                            controller.getGlobalIdentity());
                 } catch (IllegalArgumentException ex) {
                     mainPanel.setError(ex.getMessage());
                     Logger.appError(ErrorLevel.HIGH, "Unable to load the" +
@@ -183,7 +185,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      * Initialises GUI components.
      */
     private void initComponents() {
-        mainPanel = new CategoryPanel(this);
+        mainPanel = new CategoryPanel(controller.getPrefsComponentFactory(), this);
 
         tabList = new JList(new DefaultListModel());
         tabList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.addons.ui_swing.components.renderers.URIHandlerCellRenderer;
@@ -65,6 +66,8 @@ public class URLConfigPanel extends JPanel implements
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Protocol list. */
     private PackingTable table;
     /** Table mode. */
@@ -89,11 +92,14 @@ public class URLConfigPanel extends JPanel implements
     /**
      * Instantiates a new URL config panel.
      *
+     * @param controller Swing controller
      * @param parentWindow Parent window
      */
-    public URLConfigPanel(final Window parentWindow) {
+    public URLConfigPanel(final SwingController controller,
+            final Window parentWindow) {
         super();
 
+        this.controller = controller;
         this.parentWindow = parentWindow;
 
         initComponents();
@@ -143,7 +149,7 @@ public class URLConfigPanel extends JPanel implements
 
         tableScrollPane.setViewportView(table);
 
-        final Set<String> options = IdentityManager.getGlobalConfig().
+        final Set<String> options = controller.getGlobalConfig().
                 getOptions("protocol").keySet();
 
         for (String option : options) {
@@ -261,8 +267,8 @@ public class URLConfigPanel extends JPanel implements
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
-            new StandardInputDialog(parentWindow, ModalityType.MODELESS,
-                    "New URL handler",
+            new StandardInputDialog(controller, parentWindow,
+                    ModalityType.MODELESS, "New URL handler",
                     "Please enter the name of the new protocol.",
                     new URLProtocolValidator()) {
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.addons.ui_swing.components.validating.NoDuplicatesInListValidator;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
@@ -67,8 +67,8 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-    /** Main frame. */
-    private final MainFrame mainFrame;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Parent window. */
     private final Window parentWindow;
     /** Displayed profile. */
@@ -102,14 +102,14 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
      * Creates a new profile detail panel.
      *
      * @param model The list model to use to validate names
-     * @param mainFrame Main frame
+     * @param controller Swing controller
      * @param parentWindow Parent window
      */
     @SuppressWarnings("unchecked")
     public ProfileDetailPanel(final ProfileListModel model,
-            final MainFrame mainFrame, final Window parentWindow) {
+            final SwingController controller, final Window parentWindow) {
         super();
-        this.mainFrame = mainFrame;
+        this.controller = controller;
         this.parentWindow = parentWindow;
 
         this.model = model;
@@ -127,9 +127,12 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
 
     /** Initialises the components in the main panel. */
     private void initMainComponents() {
-        name = new ValidatingJTextField(new ProfileNameValidator());
-        realname = new ValidatingJTextField(new NotEmptyValidator());
-        ident = new ValidatingJTextField(new IdentValidator());
+        name = new ValidatingJTextField(controller.getIconManager(),
+                new ProfileNameValidator());
+        realname = new ValidatingJTextField(controller.getIconManager(),
+                new NotEmptyValidator());
+        ident = new ValidatingJTextField(controller.getIconManager(),
+                new IdentValidator());
         nicknames = new ReorderableJList(nicknameModel);
 
         passBorder = nicknames.getBorder();
@@ -266,7 +269,8 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
         if (e.getSource() == addButton) {
             final int index = nicknames.getSelectedIndex();
             nicknames.getSelectionModel().clearSelection();
-            new StandardInputDialog(ProfileManagerDialog.getProfileManagerDialog(mainFrame),
+            new StandardInputDialog(controller, ProfileManagerDialog
+                    .getProfileManagerDialog(controller),
                     ModalityType.DOCUMENT_MODAL, "New Nickname",
                     "Please enter the new nickname", validator) {
 
@@ -293,7 +297,7 @@ public final class ProfileDetailPanel extends JPanel implements ActionListener,
             }.display();
         } else if (e.getSource() == editButton) {
             final StandardInputDialog dialog = new StandardInputDialog(
-                    ProfileManagerDialog.getProfileManagerDialog(mainFrame),
+                    controller, ProfileManagerDialog.getProfileManagerDialog(controller),
                     ModalityType.DOCUMENT_MODAL, "Edit Nickname",
                     "Please enter the new nickname", validator) {
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.renderers.ProfileListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -60,8 +60,8 @@ public final class ProfileManagerDialog extends StandardDialog implements
     private static final long serialVersionUID = 2;
     /** Previously created instance of ProfileEditorDialog. */
     private static volatile ProfileManagerDialog me;
-    /** main frame. */
-    private final MainFrame mainFrame;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Profile list. */
     private JList profileList;
     /** Profile list mode. */
@@ -82,11 +82,11 @@ public final class ProfileManagerDialog extends StandardDialog implements
     /**
      * Creates a new instance of ProfileEditorDialog.
      *
-     * @param parentWindow main frame
+     * @param controller Swing controller
      */
-    private ProfileManagerDialog(final MainFrame mainFrame) {
-        super(mainFrame, ModalityType.MODELESS);
-        this.mainFrame = mainFrame;
+    private ProfileManagerDialog(final SwingController controller) {
+        super(controller.getMainFrame(), ModalityType.MODELESS);
+        this.controller = controller;
         deletedProfiles = new ArrayList<Profile>();
 
         initComponents();
@@ -105,10 +105,10 @@ public final class ProfileManagerDialog extends StandardDialog implements
     /**
      * Creates the dialog if one doesn't exist, and displays it.
      *
-     * @param mainFrame Main frame
+     * @param controller Swing controller
      */
-    public static void showProfileManagerDialog(final MainFrame mainFrame) {
-        me = getProfileManagerDialog(mainFrame);
+    public static void showProfileManagerDialog(final SwingController controller) {
+        me = getProfileManagerDialog(controller);
 
         me.display();
         me.requestFocusInWindow();
@@ -117,15 +117,15 @@ public final class ProfileManagerDialog extends StandardDialog implements
     /**
      * Returns the current instance of the ProfileManagerDialog.
      *
-     * @param mainFrame Main frame
+     * @param controller Swing controller
      *
      * @return The current ProfileManagerDialog instance
      */
     public static ProfileManagerDialog getProfileManagerDialog(
-            final MainFrame mainFrame) {
+            final SwingController controller) {
         synchronized (ProfileManagerDialog.class) {
             if (me == null) {
-                me = new ProfileManagerDialog(mainFrame);
+                me = new ProfileManagerDialog(controller);
             }
         }
 
@@ -142,7 +142,7 @@ public final class ProfileManagerDialog extends StandardDialog implements
 
         model = new ProfileListModel();
         profileList = new JList(model);
-        details = new ProfileDetailPanel(model, mainFrame, this);
+        details = new ProfileDetailPanel(model, controller, this);
         addButton = new JButton("Add");
         deleteButton = new JButton("Delete");
         infoLabel =
@@ -214,7 +214,7 @@ public final class ProfileManagerDialog extends StandardDialog implements
             dispose();
         }
         if (NewServerDialog.isNewServerDialogShowing()) {
-            NewServerDialog.getNewServerDialog(mainFrame).populateProfiles();
+            NewServerDialog.getNewServerDialog(controller).populateProfiles();
         }
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/AddEntryInputDialog.java

@@ -31,6 +31,7 @@ import com.dmdirc.util.validators.URIValidator;
 import com.dmdirc.util.validators.Validator;
 import com.dmdirc.addons.serverlists.ServerGroup;
 
+import com.dmdirc.ui.IconManager;
 import java.awt.Window;
 import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
@@ -75,18 +76,23 @@ public class AddEntryInputDialog extends StandardDialog {
     private final JTree items;
     /** Parent model. */
     private final ServerListModel model;
+    /** Icon manager. */
+    private final IconManager iconManager;
 
     /**
      * Instantiates a new standard input dialog.
      *
+     * @param iconManager Icon manager
      * @param items Parent tree
      * @param owner Dialog owner
      * @param model Server list model
      */
-    public AddEntryInputDialog(final Window owner, final JTree items,
+    public AddEntryInputDialog(final IconManager iconManager,
+            final Window owner, final JTree items,
             final ServerListModel model) {
         super(owner, ModalityType.MODELESS);
 
+        this.iconManager = iconManager;
         this.items = items;
         this.model = model;
         this.entryValidator = new NotEmptyValidator();
@@ -122,8 +128,8 @@ public class AddEntryInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        entryName = new ValidatingJTextField(entryValidator);
-        uri = new ValidatingJTextField(new URIJTextField(), uriValidator);
+        entryName = new ValidatingJTextField(iconManager, entryValidator);
+        uri = new ValidatingJTextField(iconManager, new URIJTextField(), uriValidator);
         blurb = new TextLabel(message);
         validateText();
     }

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/AddGroupInputDialog.java

@@ -29,6 +29,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.Validator;
 import com.dmdirc.addons.serverlists.ServerGroup;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.Window;
 import java.awt.Dialog.ModalityType;
@@ -72,18 +73,23 @@ public class AddGroupInputDialog extends StandardDialog {
     private final JTree tree;
     /** Parent model. */
     private final ServerListModel serverListModel;
+    /** Icon manager. */
+    private final IconManager iconManager;
 
     /**
      * Instantiates a new standard input dialog.
      *
+     * @param iconManager Icon manager
      * @param items Parent tree
      * @param owner Dialog owner
      * @param model Server list model
      */
-    public AddGroupInputDialog(final Window owner, final JTree items,
+    public AddGroupInputDialog(final IconManager iconManager,
+            final Window owner, final JTree items,
             final ServerListModel model) {
         super(owner, ModalityType.MODELESS);
 
+        this.iconManager = iconManager;
         this.tree = items;
         this.serverListModel = model;
         this.validator = new NotEmptyValidator();
@@ -131,7 +137,7 @@ public class AddGroupInputDialog extends StandardDialog {
      */
     private void initComponents() {
         orderButtons(new JButton(), new JButton());
-        groupName = new ValidatingJTextField(validator);
+        groupName = new ValidatingJTextField(iconManager, validator);
         networkName = new JTextField();
         blurb = new TextLabel(message);
         validateText();

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListDialog.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 import com.dmdirc.addons.ui_swing.components.LockedLayer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.Window;
@@ -80,12 +81,13 @@ public final class ServerListDialog extends StandardDialog implements
     /**
      * Creates the dialog if one doesn't exist, and displays it.
      *
+     * @param controller Swing Controller
      * @param parentWindow Parent window
      * @param urlHandler The URL Handler to use to handle clicked links
      */
-    public static void showServerListDialog(final Window parentWindow,
-            final URLHandler urlHandler) {
-        me = getServerListDialog(parentWindow, urlHandler);
+    public static void showServerListDialog(final SwingController controller,
+            final Window parentWindow, final URLHandler urlHandler) {
+        me = getServerListDialog(controller, parentWindow, urlHandler);
 
         me.display();
         me.requestFocusInWindow();
@@ -94,16 +96,19 @@ public final class ServerListDialog extends StandardDialog implements
     /**
      * Returns the current instance of the ServerListDialog.
      *
+     * @param controller Swing Controller
      * @param parentWindow Parent window
      * @param urlHandler The URL Handler to use to handle clicked links
+     *
      * @return The current ServerListDialog instance
      */
     public static ServerListDialog getServerListDialog(
-            final Window parentWindow, final URLHandler urlHandler) {
+            final SwingController controller, final Window parentWindow,
+            final URLHandler urlHandler) {
         synchronized (ServerListDialog.class) {
             if (me == null) {
-                me = new ServerListDialog(parentWindow, ModalityType.MODELESS,
-                        urlHandler);
+                me = new ServerListDialog(controller, parentWindow,
+                ModalityType.MODELESS, urlHandler);
             }
         }
 
@@ -117,8 +122,9 @@ public final class ServerListDialog extends StandardDialog implements
      * @param modalityType Desired modality
      * @param urlHandler The URL Handler to use to handle clicked links
      */
-    private ServerListDialog(final Window window,
-            final ModalityType modalityType, final URLHandler urlHandler) {
+    private ServerListDialog(final SwingController controller,
+            final Window window, final ModalityType modalityType,
+            final URLHandler urlHandler) {
         super(window, modalityType);
 
         setTitle("Server List");
@@ -141,7 +147,7 @@ public final class ServerListDialog extends StandardDialog implements
                 null)));
         profileLayer = new JXLayer<Profiles>(new Profiles(model), profileLock);
         performLayer = new JXLayer<Perform>(new Perform(model), performLock);
-        settingsLayer = new JXLayer<Settings>(new Settings(model),
+        settingsLayer = new JXLayer<Settings>(new Settings(controller, model),
                 settingsLock);
         infoLayer = new JXLayer<Info>(new Info(model, urlHandler), infoLock);
         help = new Help();
@@ -149,7 +155,8 @@ public final class ServerListDialog extends StandardDialog implements
 
         setLayout(new MigLayout("fill, wrap 2, wmin 600, wmax 600"));
 
-        add(new Tree(model, this), "grow, spany 4, wmax 150, wmin 150");
+        add(new Tree(controller.getIconManager(), model, this),
+                "grow, spany 4, wmax 150, wmin 150");
         add(help, "pos 160 0.5al");
         add(infoLayer, "growx, pushx");
         add(settingsLayer, "grow, push, gaptop unrel, gapbottom unrel");

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Settings.java

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PreferencesManager;
@@ -59,14 +60,18 @@ public class Settings extends JPanel implements ServerListListener {
             new HashMap<ServerGroupItem, SettingsPanel>();
     /** Platform border. */
     private final Border border;
+    /** Swing controller. */
+    private final SwingController controller;
 
     /**
      * Instantiates a new settings panel.
      *
+     * @param controller Swing controller
      * @param model Backing model
      */
-    public Settings(final ServerListModel model) {
+    public Settings(final SwingController controller, final ServerListModel model) {
         super();
+        this.controller = controller;
         this.model = model;
         addListeners();
         border = UIManager.getBorder("TitledBorder.border");
@@ -111,14 +116,14 @@ public class Settings extends JPanel implements ServerListListener {
     private SettingsPanel getSettingsPanel(final ServerGroupItem item) {
         if (!panels.containsKey(item)) {
             if (item instanceof ServerGroup) {
-                panels.put(item, new SettingsPanel("", false));
+                panels.put(item, new SettingsPanel(controller, "", false));
                 addSettings(panels.get(item), new ConfigManager("irc", "",
                     item.getGroup().getNetwork(), item.getName()),
                     IdentityManager.getServerConfig(item.getName()));
             } else if (item == null) {
-                panels.put(null, new SettingsPanel("", false));
+                panels.put(null, new SettingsPanel(controller, "", false));
             } else {
-                panels.put(item, new SettingsPanel("", false));
+                panels.put(item, new SettingsPanel(controller, "", false));
             }
         }
         return panels.get(item);

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Tree.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.renderers.ServerGroupTreeRenderer;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.ui.IconManager;
 
 import java.awt.Rectangle;
 import java.awt.Window;
@@ -69,16 +70,21 @@ public class Tree extends JPanel implements TreeSelectionListener,
     private final JButton addItemButton;
     /** Parent window. */
     private final Window parentWindow;
+    /** Icon manager. */
+    private final IconManager iconManager;
 
     /**
      * Instantiates a new tree of server groups.
      *
+     * @param iconManager Icon Manager
      * @param model Model backing this tree
      * @param parentWindow Dialog's parent window
      */
-    public Tree(final ServerListModel model, final Window parentWindow) {
+    public Tree(final IconManager iconManager, final ServerListModel model,
+            final Window parentWindow) {
         super();
 
+        this.iconManager = iconManager;
         this.model = model;
         this.parentWindow = parentWindow;
         addGroupButton = new JButton("Add group");
@@ -193,9 +199,9 @@ public class Tree extends JPanel implements TreeSelectionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addGroupButton) {
-            new AddGroupInputDialog(parentWindow, items, model).display();
+            new AddGroupInputDialog(iconManager, parentWindow, items, model).display();
         } else {
-            new AddEntryInputDialog(parentWindow, items, model).display();
+            new AddEntryInputDialog(iconManager, parentWindow, items, model).display();
         }
     }
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
 import com.dmdirc.Server;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
@@ -64,6 +65,8 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
     private final Server server;
     /** Parent window. */
     private final Window parentWindow;
+    /** Swing controller. */
+    private final SwingController controller;
     /** Add button. */
     private JButton addButton;
     /** Remove button. */
@@ -82,12 +85,15 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
     /**
      * Creates a new instance of IgnoreList.
      *
+     * @param controller Swing controller
      * @param server Parent server
      * @param parentWindow Parent window
      */
-    public IgnoreListPanel(final Server server, final Window parentWindow) {
+    public IgnoreListPanel(final SwingController controller,
+            final Server server, final Window parentWindow) {
         super();
 
+        this.controller = controller;
         this.server = server;
         this.parentWindow = parentWindow;
 
@@ -97,7 +103,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
         populateList();
     }
 
-    /** Initialises teh components. */
+    /** Initialises the components. */
     private void initComponents() {
         cachedIgnoreList = new IgnoreList(server.getIgnoreList().getRegexList());
 
@@ -176,17 +182,18 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addButton) {
-            new StandardInputDialog(parentWindow, ModalityType.MODELESS,
-                    "New ignore list entry",
+            new StandardInputDialog(controller, parentWindow,
+                    ModalityType.MODELESS, "New ignore list entry",
                     "Please enter the new ignore list entry",
                     viewToggle.isSelected() ? new ValidatorChain<String>(
                     new NotEmptyValidator(), new RegexValidator())
                     : new NotEmptyValidator()) {
 
                 /**
-                 * 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).
+                 * 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 = 2;
 

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 import com.dmdirc.addons.ui_swing.components.modes.UserModesPane;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
@@ -57,6 +58,10 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
     private static volatile ServerSettingsDialog me;
     /** Parent server. */
     private final Server server;
+    /** Parent window. */
+    private final Window parentWindow;
+    /** Swing controller. */
+    private final SwingController controller;
     /** User modes panel. */
     private UserModesPane modesPanel;
     /** Ignore list panel. */
@@ -67,18 +72,19 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
     private SettingsPanel settingsPanel;
     /** The tabbed pane. */
     private JTabbedPane tabbedPane;
-    /** Parent window. */
-    private final Window parentWindow;
 
     /**
      * Creates a new instance of ServerSettingsDialog.
      *
+     * @param controller Swing controller
      * @param server The server object that we're editing settings for
      * @param parentWindow Parent window
      */
-    private ServerSettingsDialog(final Server server, final Window parentWindow) {
+    private ServerSettingsDialog(final SwingController controller,
+            final Server server, final Window parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
 
+        this.controller = controller;
         this.server = server;
         this.parentWindow = parentWindow;
 
@@ -92,12 +98,14 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
     /**
      * Creates the dialog if one doesn't exist, and displays it.
      *
+     * @param controller Swing controller
      * @param server The server object that we're editing settings for
      * @param parentWindow Parent window
      */
-    public static void showServerSettingsDialog(final Server server,
+    public static void showServerSettingsDialog(
+            final SwingController controller,final Server server,
             final Window parentWindow) {
-        me = getServerSettingsDialog(server, parentWindow);
+        me = getServerSettingsDialog(controller, server, parentWindow);
 
         me.display();
         me.requestFocusInWindow();
@@ -106,16 +114,18 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
     /**
      * Returns the current instance of the ServerSettingsDialog.
      *
+     * @param controller Swing controller
      * @param server The server object that we're editing settings for
      * @param parentWindow Parent window
      *
      * @return The current ServerSettingsDialog instance
      */
     public static ServerSettingsDialog getServerSettingsDialog(
+            final SwingController controller,
             final Server server, final Window parentWindow) {
         synchronized (ServerSettingsDialog.class) {
             if (me == null) {
-                me = new ServerSettingsDialog(server, parentWindow);
+                me = new ServerSettingsDialog(controller, server, parentWindow);
             }
         }
 
@@ -139,18 +149,18 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
 
         tabbedPane = new JTabbedPane();
 
-        modesPanel = new UserModesPane(server);
+        modesPanel = new UserModesPane(controller, server);
 
         ignoreList =
-                new IgnoreListPanel(server, parentWindow);
+                new IgnoreListPanel(controller, server, parentWindow);
 
         performPanel =
                 new PerformTab(server);
 
         settingsPanel =
-                new SettingsPanel("These settings are specific to this " +
-                "network, any settings specified here will overwrite global " +
-                "settings");
+                new SettingsPanel(controller, "These settings are specific to "
+                        + "this network, any settings specified here will "
+                        + "overwrite global settings");
 
         if (settingsPanel != null) {
             addSettings();

src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -77,7 +77,7 @@ public class CtrlTabWindowManager implements SwingWindowListener,
             final MainFrame mainFrame,
             final JComponent component) {
         nodes = new HashMap<Window, TreeViewNode>();
-        model = new TreeViewModel(new TreeViewNode(null, null));
+        model = new TreeViewModel(controller, new TreeViewNode(null, null));
         selectionModel = new DefaultTreeSelectionModel();
         treeScroller = new TreeScroller(model, selectionModel, false) {
 

src/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.ui.Colour;
@@ -93,7 +92,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
      */
     private void init() {
         if (window == null) {
-            icon.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+            icon.setIcon(new IconManager(window.getConfigManager())
                     .getIcon("icon"));
             return;
         }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
@@ -133,22 +132,23 @@ public final class TreeFrameManager implements FrameManager,
 
             @Override
             public void run() {
-                model = new TreeViewModel(new TreeViewNode(null, null));
+                model = new TreeViewModel(controller, new TreeViewNode(null,
+                        null));
                 tree = new Tree(TreeFrameManager.this, model,
                         TreeFrameManager.this.controller);
                 tree.setCellRenderer(new TreeViewTreeCellRenderer(
                         TreeFrameManager.this));
                 tree.setVisible(true);
 
-                IdentityManager.getGlobalConfig().addChangeListener("treeview",
+                controller.getGlobalConfig().addChangeListener("treeview",
                         TreeFrameManager.this);
-                IdentityManager.getGlobalConfig().addChangeListener("ui",
+                controller.getGlobalConfig().addChangeListener("ui",
                         "sortrootwindows", TreeFrameManager.this);
-                IdentityManager.getGlobalConfig().addChangeListener("ui",
+                controller.getGlobalConfig().addChangeListener("ui",
                         "sortchildwindows", TreeFrameManager.this);
-                IdentityManager.getGlobalConfig().addChangeListener("ui",
+                controller.getGlobalConfig().addChangeListener("ui",
                         "backgroundcolour", TreeFrameManager.this);
-                IdentityManager.getGlobalConfig().addChangeListener("ui",
+                controller.getGlobalConfig().addChangeListener("ui",
                         "foregroundcolour", TreeFrameManager.this);
             }
         });
@@ -272,11 +272,11 @@ public final class TreeFrameManager implements FrameManager,
     /** Sets treeview colours. */
     private void setColours() {
         tree.setBackground(UIUtilities.convertColour(
-                IdentityManager.getGlobalConfig().getOptionColour(
+                controller.getGlobalConfig().getOptionColour(
                 "treeview", "backgroundcolour",
                 "ui", "backgroundcolour")));
         tree.setForeground(UIUtilities.convertColour(
-                IdentityManager.getGlobalConfig().getOptionColour(
+                controller.getGlobalConfig().getOptionColour(
                 "treeview", "foregroundcolour",
                 "ui", "foregroundcolour")));
 

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewModel.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.GlobalWindow;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.addons.ui_swing.SwingController;
 
 import javax.swing.tree.DefaultTreeModel;
 
@@ -41,28 +41,20 @@ public class TreeViewModel extends DefaultTreeModel {
     private static final long serialVersionUID = 1;
     /** Frame container comparator. */
     private final FrameContainerComparator comparator;
+    /** Parent UI Controller. */
+    private SwingController controller;
 
     /**
      * Creates a tree in which any node can have children.
      *
+     * @param controller Parent UI
      * @param root a TreeNode object that is the root of the tree.
      */
-    public TreeViewModel(final TreeViewNode root) {
-        this(root, false);
-    }
-
-    /**
-     * Creates a tree specifying whether any node can have children,
-     * or whether only certain nodes can have children.
-     *
-     * @param asksAllowsChildren true = ask whether child can have chilren,
-     * false all nodes can have chilren.
-     * @param root a root TreeNode.
-     */
-    public TreeViewModel(final TreeViewNode root,
-            final boolean asksAllowsChildren) {
-        super(root, asksAllowsChildren);
+    public TreeViewModel(final SwingController controller,
+            final TreeViewNode root) {
+        super(root, false);
 
+        this.controller = controller;
         comparator = new FrameContainerComparator();
     }
 
@@ -105,12 +97,12 @@ public class TreeViewModel extends DefaultTreeModel {
             return 0;
         }
 
-        if (parent.equals(root) && !IdentityManager.getGlobalConfig().
+        if (parent.equals(root) && !controller.getGlobalConfig().
                 getOptionBool("ui", "sortrootwindows")) {
             return parent.getChildCount();
         }
 
-        if (IdentityManager.getGlobalConfig().getOptionBool("ui",
+        if (controller.getGlobalConfig().getOptionBool("ui",
                 "sortchildwindows")) {
             for (int i = 0; i < parent.getChildCount(); i++) {
                 final TreeViewNode child = (TreeViewNode) parent.getChildAt(i);

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.wizard.Step;
 import com.dmdirc.addons.ui_swing.wizard.WizardDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -71,8 +70,8 @@ public final class SwingFirstRunWizard implements WizardListener,
         wizardDialog = new WizardDialog("Setup wizard",
                 new ArrayList<Step>(), parentWindow,
                 ModalityType.APPLICATION_MODAL);
-        wizardDialog.setIconImage(new IconManager(IdentityManager
-                .getGlobalConfig()).getImage("icon"));
+        wizardDialog.setIconImage(new IconManager(controller.getGlobalConfig())
+                .getImage("icon"));
         wizardDialog.addWizardListener(this);
         if(Apple.isAppleUI()) {
             wizardDialog.setMinimumSize(new Dimension(400, 425));
@@ -94,9 +93,9 @@ public final class SwingFirstRunWizard implements WizardListener,
             extractActions();
         }
 
-        IdentityManager.getConfigIdentity().setOption("updater", "enable",
+        controller.getGlobalIdentity().setOption("updater", "enable",
                 ((CommunicationStep) wizardDialog.getStep(1)).checkUpdates());
-        IdentityManager.getConfigIdentity().setOption("general", "submitErrors",
+        controller.getGlobalIdentity().setOption("general", "submitErrors",
                 ((CommunicationStep) wizardDialog.getStep(1)).checkErrors());
 
         if (((ProfileStep) wizardDialog.getStep(2)).getProfileManagerState()) {
@@ -105,7 +104,7 @@ public final class SwingFirstRunWizard implements WizardListener,
                 @Override
                 public void processEvent(final ActionType type,
                         final StringBuffer format, final Object... arguments) {
-                    ProfileManagerDialog.showProfileManagerDialog(controller.getMainFrame());
+                    ProfileManagerDialog.showProfileManagerDialog(controller);
                 }
             }, CoreActionType.CLIENT_OPENED);
 

src/com/dmdirc/addons/windowflashing/WindowFlashing.java

@@ -128,17 +128,21 @@ public class WindowFlashing extends BasePlugin implements ConfigChangeListener {
                 PreferencesType.OPTIONALINTEGER, getDomain(), "blinkrate",
                 "Blink rate", "Specifies the rate at which the taskbar and or "
                 + "caption will blink, if unspecified this will be your cursor "
-                + "blink rate."));
+                + "blink rate.",
+                manager.getConfigManager(), manager.getIdentity()));
         category.addSetting(new PreferencesSetting(
                 PreferencesType.OPTIONALINTEGER, getDomain(), "flashcount",
                 "Flash count", "Specifies the number of times to blink, if "
-                + "unspecified this will blink indefinitely"));
+                + "unspecified this will blink indefinitely",
+                manager.getConfigManager(), manager.getIdentity()));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "flashtaskbar", "Flash taskbar",
-                "Should the taskbar entry flash?"));
+                "Should the taskbar entry flash?",
+                manager.getConfigManager(), manager.getIdentity()));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "flashcaption", "Flash caption",
-                "Should the window caption flash?"));
+                "Should the window caption flash?",
+                manager.getConfigManager(), manager.getIdentity()));
 
         manager.addCategory(category);
     }

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -223,13 +223,16 @@ public final class WindowStatusPlugin extends BasePlugin
 
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "channel.shownone", "Show 'none' count",
-                "Should the count for users with no state be shown?"));
+                "Should the count for users with no state be shown?",
+                manager.getConfigManager(), manager.getIdentity()));
         category.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 getDomain(), "channel.noneprefix", "'None' count prefix",
-                "The Prefix to use when showing the 'none' count"));
+                "The Prefix to use when showing the 'none' count",
+                manager.getConfigManager(), manager.getIdentity()));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "client.showname", "Show real name",
-                "Should the realname for clients be shown if known?"));
+                "Should the realname for clients be shown if known?",
+                manager.getConfigManager(), manager.getIdentity()));
 
         manager.getCategory("Plugins").addSubCategory(category);
     }

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanelTest.java

@@ -90,7 +90,7 @@ public class ActionsGroupPanelTest extends UISpecTestCase {
             action1, action2, action3, action4,
         })));
 
-        panel = new Panel(new ActionsGroupPanel(null, group));
+        panel = new Panel(new ActionsGroupPanel(null, null, group));
         table = panel.getTable();
     }