Stop using deprecated IconManager methods

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

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

@@ -75,8 +75,8 @@ public final class SystrayPlugin extends BasePlugin implements ActionListener,
         show.addActionListener(this);
         quit.addActionListener(this);
 
-        icon = new TrayIcon(IconManager.getIconManager().getImage("logo"),
-                "DMDirc", menu);
+        icon = new TrayIcon(new IconManager(IdentityManager.getGlobalConfig())
+                .getImage("logo"), "DMDirc", menu);
         icon.setImageAutoSize(true);
         icon.addMouseListener(this);
         registerCommand(new PopupCommand(this), PopupCommand.INFO);

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

@@ -126,8 +126,8 @@ public final class MainFrame extends JFrame implements WindowListener,
         focusOrder = new QueuedLinkedHashSet<TextFrame>();
         initComponents();
 
-        imageIcon = new ImageIcon(IconManager.getIconManager()
-                .getImage("icon"));
+        imageIcon = new ImageIcon(new IconManager(IdentityManager
+                .getGlobalConfig()).getImage("icon"));
         setIconImage(imageIcon.getImage());
 
         CoreUIUtils.centreWindow(this);
@@ -581,8 +581,8 @@ public final class MainFrame extends JFrame implements WindowListener,
                         "ui", "showversion");
             }
         } else {
-            imageIcon = new ImageIcon(IconManager.getIconManager().getImage(
-                    "icon"));
+            imageIcon = new ImageIcon(new IconManager(IdentityManager
+                    .getGlobalConfig()).getImage("icon"));
             UIUtilities.invokeLater(new Runnable() {
 
                 /** {@inheritDoc} */

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

@@ -79,8 +79,9 @@ public class MDIBar extends JPanel implements SwingWindowListener,
         this.configDomain = controller.getDomain();
         visibility = config.getOptionBool(configDomain, "mdiBarVisibility");
 
-        closeButton = new NoFocusButton(IconManager.getIconManager().
-                getScaledIcon("close-12", ICON_SIZE, ICON_SIZE));
+        closeButton = new NoFocusButton(new IconManager(IdentityManager
+                .getGlobalConfig()).getScaledIcon("close-12", ICON_SIZE,
+                ICON_SIZE));
 
         setOpaque(false);
         setLayout(new MigLayout("hmax 17, ins 1 0 0 0, fill"));

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

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.SearchBar;
 import com.dmdirc.ui.interfaces.SearchBar.Direction;
 import com.dmdirc.ui.messages.IRCDocument;
@@ -114,15 +113,15 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
     /** Initialises components. */
     private void initComponents() {
         closeButton = new ImageButton("close",
-                IconManager.getIconManager().getIcon("close-inactive"),
-                IconManager.getIconManager().getIcon("close-active"));
+                parent.getIconManager().getIcon("close-inactive"),
+                parent.getIconManager().getIcon("close-active"));
         nextButton = new JButton();
         prevButton = new JButton();
         caseCheck = new JCheckBox();
         validator = new SearchValidator();
         searchBox = new ValidatingJTextField(validator);
         wrapIndicator = new JLabel("Search wrapped",
-                IconManager.getIconManager().getIcon("linewrap"),
+                parent.getContainer().getIconManager().getIcon("linewrap"),
                 JLabel.LEFT);
 
         nextButton.setText("Later");

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Color;
@@ -77,7 +78,8 @@ public class ToolTipPanel extends JPanel implements MouseListener {
 
         defaultHelp = helpText;
         this.tooltips = new HashMap<JComponent, String>();
-        this.icon = new JLabel(IconManager.getIconManager().getIcon("warning"));
+        this.icon = new JLabel(new IconManager(IdentityManager
+                .getGlobalConfig()).getIcon("warning"));
 
         setBackground(Color.WHITE);
         setForeground(Color.BLACK);

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

@@ -35,7 +35,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -112,8 +111,8 @@ public class TopicBar extends JComponent implements ActionListener,
         controller = channelFrame.getController();
         topicText = new TextPaneInputField(parentWindow);
         topicLengthMax = channel.getMaxTopicLength();
-        errorIcon =
-                new JLabel(IconManager.getIconManager().getIcon("input-error"));
+        errorIcon = new JLabel(channelFrame.getIconManager()
+                .getIcon("input-error"));
         topicText.setEditorKit(new WrapEditorKit(channel.getConfigManager()
                 .getOptionBool(controller.getDomain(), "showfulltopic")));
         ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
@@ -121,12 +120,12 @@ public class TopicBar extends JComponent implements ActionListener,
 
         topicText.getActionMap().put("paste-from-clipboard",
                 new ReplacePasteAction("(\r\n|\n|\r)", " "));
-        topicEdit = new ImageButton("edit", IconManager.getIconManager().
-                getIcon("edit-inactive"), IconManager.getIconManager().
-                getIcon("edit"));
-        topicCancel = new ImageButton("cancel", IconManager.getIconManager().
-                getIcon("close"), IconManager.getIconManager().
-                getIcon("close-active"));
+        topicEdit = new ImageButton("edit",
+                channelFrame.getIconManager().getIcon("edit-inactive"),
+                channelFrame.getContainer().getIconManager().getIcon("edit"));
+        topicCancel = new ImageButton("cancel",
+                channelFrame.getIconManager().getIcon("close"),
+                channelFrame.getIconManager().getIcon("close-active"));
 
         final SwingInputHandler handler = new SwingInputHandler(topicText,
                 channelFrame.getContainer().getCommandParser(),

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Window;
@@ -74,7 +75,8 @@ public final class ColourPickerDialog extends StandardDialog {
      */
     public ColourPickerDialog(final boolean showIRC, final boolean showHex) {
         this(showIRC, showHex, null);
-        setIconImage(IconManager.getIconManager().getImage("icon"));
+        setIconImage(new IconManager(IdentityManager.getGlobalConfig())
+                .getImage("icon"));
     }
 
     /**

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
@@ -77,9 +78,7 @@ public final class CurrentOptionsPanel extends JPanel implements
     /**
      * Adds a current option.
      *
-     * @param optionName option to add
-     * @param type Option type
-     * @param value Option value
+     * @param setting Setting to add
      */
     protected void addOption(final JComponent setting) {
         settings.add(setting);
@@ -90,8 +89,7 @@ public final class CurrentOptionsPanel extends JPanel implements
     /**
      * Deletes a current option.
      *
-     * @param optionName Option to delete
-     * @param type Option type
+     * @param setting Setting to remove
      */
     protected void delOption(final JComponent setting) {
         settings.remove(setting);
@@ -110,8 +108,9 @@ public final class CurrentOptionsPanel extends JPanel implements
         final JLabel label = new JLabel();
         final ImageButton<JComponent> button = new ImageButton<JComponent>(
                 component.getName(),
-                IconManager.getIconManager().getIcon("close-inactive"),
-                IconManager.getIconManager().getIcon("close-active"));
+                new IconManager(IdentityManager.getGlobalConfig())
+                .getIcon("close-inactive"), new IconManager(IdentityManager
+                .getGlobalConfig()).getIcon("close-active"));
         button.setObject(component);
 
         label.setText(component.getName() + ": ");

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.components.expandingsettings;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
 
@@ -50,8 +49,6 @@ public class SettingsPanel extends JPanel {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 3;
-    /** Config manager. */
-    private final transient Identity config;
     /** Current Settings. */
     private final DoubleMap<PreferencesSetting, JComponent> settings;
     /** Info label. */
@@ -70,28 +67,24 @@ public class SettingsPanel extends JPanel {
     /**
      * Creates a new instance of SettingsPanel.
      *
-     * @param config Config to use
      * @param infoText Info blurb.
      */
-    public SettingsPanel(final Identity config, final String infoText) {
-        this(config, infoText, true);
+    public SettingsPanel(final String infoText) {
+        this(infoText, true);
     }
 
     /**
      * Creates a new instance of SettingsPanel.
      *
-     * @param config Config to use
      * @param infoText Info blurb.
      * @param padding Should we add padding to the panel?
      */
-    public SettingsPanel(final Identity config, final String infoText,
-            final boolean padding) {
+    public SettingsPanel(final String infoText, final boolean padding) {
         super();
 
         settings = new DoubleMap<PreferencesSetting, JComponent>();
 
         this.setOpaque(UIUtilities.getTabbedPaneOpaque());
-        this.config = config;
         this.padding = padding;
 
         initComponents(infoText);
@@ -135,15 +128,9 @@ public class SettingsPanel extends JPanel {
     /**
      * Adds an option to the settings panel.
      *
-     * @param optionName Option name
-     * @param displayName Display name
-     * @param type Option type
+     * @param category Category of options to add
      */
     public void addOption(final PreferencesCategory category) {
-        if (config == null) {
-            return;
-        }
-
         this.category = category;
 
         for (PreferencesSetting setting : category.getSettings()) {
@@ -192,9 +179,7 @@ public class SettingsPanel extends JPanel {
     /**
      * Adds a current option.
      *
-     * @param optionName option to add
-     * @param type Option type
-     * @param value Option value
+     * @param setting Setting to add
      */
     protected void addCurrentOption(final JComponent setting) {
         currentOptionsPanel.addOption(setting);
@@ -203,8 +188,7 @@ public class SettingsPanel extends JPanel {
     /**
      * Deletes a current option.
      *
-     * @param optionName Option to delete
-     * @param type Option type
+     * @param setting Setting to remove
      */
     protected void removeCurrentOption(final JComponent setting) {
         currentOptionsPanel.delOption(setting);
@@ -213,7 +197,7 @@ public class SettingsPanel extends JPanel {
     /**
      * Adds an addable option.
      *
-     * @param optionName Option name
+     * @param setting Setting to add
      */
     protected void addAddableOption(final JComponent setting) {
         settings.getKey(setting).setValue(null);
@@ -223,7 +207,7 @@ public class SettingsPanel extends JPanel {
     /**
      * Returns the component associated with a setting.
      *
-     * @param component The component to get the setting for
+     * @param comp The component to get the setting for
      *
      * @return Setting or null if not found
      */

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.FrameInfoListener;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -56,7 +55,7 @@ public class DesktopWindowFrame extends JFrame implements FrameInfoListener,
     /**
      * Creates a new instance of DesktopWindowFrame.
      *
-     * @param windowFrame Frame that we want to contain in this Desktop frame.
+     * @param windowWindow Frame that we want to contain in this Desktop frame.
      * @param placeHolder The frame to use in the main client whilst this is
      * popped out.
      */
@@ -83,8 +82,8 @@ public class DesktopWindowFrame extends JFrame implements FrameInfoListener,
         setLayout(new MigLayout("fill, ins panel"));
         setPreferredSize(windowWindow.getController().getMainFrame().getSize());
         setTitle(windowWindow.getContainer().getTitle());
-        setIconImage(IconManager.getIconManager()
-                .getImage(windowWindow.getContainer().getIcon()));
+        setIconImage(windowWindow.getIconManager().getImage(windowWindow
+                .getContainer().getIcon()));
     }
 
     /**
@@ -121,7 +120,7 @@ public class DesktopWindowFrame extends JFrame implements FrameInfoListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setIconImage(IconManager.getIconManager().getImage(icon));
+                setIconImage(window.getIconManager().getImage(icon));
             }
         });
     }

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

@@ -54,6 +54,7 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 
@@ -572,6 +573,15 @@ public abstract class TextFrame extends JPanel implements Window,
         return controller;
     }
 
+    /**
+     * Returns the IconManager for this frame.
+     *
+     * @return This frame's IconManager
+     */
+    public IconManager getIconManager() {
+        return getContainer().getIconManager();
+    }
+
     /**
      * Updates colour settings from their config values.
      */

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

@@ -26,7 +26,6 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.InputField;
 import com.dmdirc.ui.interfaces.InputValidationListener;
 import com.dmdirc.util.ListenerList;
@@ -93,10 +92,10 @@ public class SwingInputField extends JComponent implements InputField,
         textField.addKeyListener(this);
         textField.setOpaque(true);
         wrapIndicator =
-                new JLabel(IconManager.getIconManager().getIcon("linewrap"));
+                new JLabel(textFrame.getIconManager().getIcon("linewrap"));
         wrapIndicator.setVisible(false);
         errorIndicator =
-                new JLabel(IconManager.getIconManager().getIcon("input-error"));
+                new JLabel(textFrame.getIconManager().getIcon("input-error"));
         errorIndicator.setVisible(false);
 
         setLayout(new MigLayout("ins 0, hidemode 3"));

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

@@ -22,12 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateChainEntry;
 
 import java.awt.Component;
 
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.Icon;
 import javax.swing.JList;
 
 /**
@@ -41,23 +43,33 @@ public class CertificateChainEntryCellRenderer extends DefaultListCellRenderer {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Icon to use for invalid entries. */
+    private final Icon invalidIcon = new IconManager(IdentityManager
+            .getGlobalConfig()).getIcon("cross");
+    /** Icon to use for trusted entries. */
+    private final Icon trustedIcon = new IconManager(IdentityManager
+            .getGlobalConfig()).getIcon("tick");
+    /** Icon to use for other entries. */
+    private final Icon icon = new IconManager(IdentityManager
+            .getGlobalConfig()).getIcon("nothing");
 
     /** {@inheritDoc} */
     @Override
     public Component getListCellRendererComponent(final JList list,
             final Object value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        super.getListCellRendererComponent(list, value, index, isSelected,
+                cellHasFocus);
         if (value instanceof CertificateChainEntry) {
             final CertificateChainEntry entry = (CertificateChainEntry) value;
 
             setText(entry.getName());
             if (entry.isInvalid()) {
-                setIcon(IconManager.getIconManager().getIcon("cross"));
+                setIcon(invalidIcon);
             } else if (entry.isTrusted()) {
-                setIcon(IconManager.getIconManager().getIcon("tick"));
+                setIcon(trustedIcon);
             } else {
-                setIcon(IconManager.getIconManager().getIcon("nothing"));
+                setIcon(icon);
             }
         }
         return this;

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.IconManager;
 
@@ -38,11 +39,14 @@ public final class ErrorLevelIconCellRenderer extends DefaultTableCellRenderer {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    /** Icon manager to get icons from. */
+    private final IconManager iconManager = new IconManager(IdentityManager
+            .getGlobalConfig());
 
     /** {@inheritDoc} */
     @Override
     public void setValue(final Object value) {
         setHorizontalAlignment(JLabel.CENTER);
-        setIcon(IconManager.getIconManager().getIcon(((ErrorLevel) value).getIcon()));
+        setIcon(iconManager.getIcon(((ErrorLevel) value).getIcon()));
     }
 }

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

@@ -24,6 +24,7 @@ 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;
@@ -57,14 +58,15 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
      */
     private static final long serialVersionUID = 2;
     /** non error state image icon. */
-    private static final Icon DEFAULT_ICON = IconManager.getIconManager().
-            getIcon("normal");
+    private static final Icon DEFAULT_ICON = new IconManager(IdentityManager
+            .getGlobalConfig()).getIcon("normal");
     /** Status controller. */
     private final MainFrame mainFrame;
     /** Swing status bar. */
     private final SwingStatusBar statusBar;
     /** Error manager. */
-    private final transient ErrorManager errorManager = ErrorManager.getErrorManager();
+    private final transient ErrorManager errorManager = ErrorManager
+            .getErrorManager();
     /** Dismiss menu. */
     private final JPopupMenu menu;
     /** Dismiss menu item. */
@@ -151,8 +153,9 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
                         if (errorLevel == null ||
                                 !error.getLevel().moreImportant(errorLevel)) {
                             errorLevel = error.getLevel();
-                            label.setIcon(IconManager.getIconManager()
-                                    .getIcon(errorLevel.getIcon()));
+                            label.setIcon(new IconManager(IdentityManager
+                                    .getGlobalConfig()).getIcon(errorLevel
+                                    .getIcon()));
                         }
                     }
                     setVisible(true);

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
@@ -89,8 +90,8 @@ public class ErrorPopup extends StatusbarPopupWindow {
                 final int count = buckets.values(level).size();
 
                 panel.add(new JLabel(level.toString(),
-                        IconManager.getIconManager().getIcon(level.getIcon()),
-                        JLabel.LEFT));
+                        new IconManager(IdentityManager.getGlobalConfig())
+                        .getIcon(level.getIcon()), JLabel.LEFT));
                 panel.add(new JLabel(String.valueOf(count), JLabel.RIGHT),
                         "growx, pushx, wrap");
             }

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.StatusBarComponent;
 
@@ -33,7 +34,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -69,8 +69,8 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
         show = new JMenuItem("Open");
         final JMenuItem dismiss = new JMenuItem("Dismiss");
 
-        setIcon(new ImageIcon(IconManager.getIconManager().getImage(
-                "feedback")));
+        setIcon(new IconManager(IdentityManager.getGlobalConfig()).getIcon(
+                "feedback"));
         setBorder(BorderFactory.createEtchedBorder());
         setToolTipText("We would appreciate any feedback you may have about "
                 + "DMDirc.");

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

@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 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;
@@ -83,7 +84,8 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         this.mainFrame = mainFrame;
 
         setBorder(BorderFactory.createEtchedBorder());
-        label.setIcon(IconManager.getIconManager().getIcon("invite"));
+        label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+                .getIcon("invite"));
 
         menu = new JPopupMenu();
         dismiss = new JMenuItem("Dismiss all invites");

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

@@ -206,7 +206,8 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
                 if (currentMessage.getIconType() == null) {
                     label.setIcon(null);
                 } else {
-                    label.setIcon(IconManager.getIconManager().getIcon(
+                    label.setIcon(new IconManager(IdentityManager
+                            .getGlobalConfig()).getIcon(
                             currentMessage.getIconType()));
                 }
                 label.setText(UIUtilities.clipStringifNeeded(MessageLabel.this,

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
 
@@ -163,9 +164,9 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
 
             for (StatusMessage message : messages) {
                 panel.add(new JLabel(message.getMessage(), message.getIconType()
-                        == null ? null : IconManager.getIconManager().getIcon(
-                        message.getIconType()), SwingConstants.LEFT),
-                        "grow, push, wrap");
+                        == null ? null : new IconManager(IdentityManager
+                        .getGlobalConfig()).getIcon(message.getIconType()),
+                        SwingConstants.LEFT), "grow, push, wrap");
             }
         }
 

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.addons.ui_swing.MainFrame;
 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.ui.interfaces.StatusBarComponent;
 import com.dmdirc.updater.UpdateChecker;
@@ -97,12 +98,14 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         }
 
         if (newStatus.equals(STATE.CHECKING)) {
-            label.setIcon(IconManager.getIconManager().
-                    getIcon("hourglass"));
+            label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+                    .getIcon("hourglass"));
         } else if (newStatus.equals(STATE.UPDATES_AVAILABLE)) {
-            label.setIcon(IconManager.getIconManager().getIcon("update"));
+            label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+                    .getIcon("update"));
         } else if (newStatus.equals(STATE.RESTART_REQUIRED)) {
-            label.setIcon(IconManager.getIconManager().getIcon("restart-needed"));
+            label.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+                    .getIcon("restart-needed"));
         }
     }
 

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

@@ -23,6 +23,7 @@
 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;
@@ -81,8 +82,8 @@ public class ValidatingJTextField extends JComponent implements DocumentListener
         super();
         this.textField = textField;
         this.validator = validator;
-        errorIcon =
-                new JLabel(IconManager.getIconManager().getIcon("input-error"));
+        errorIcon = new JLabel(new IconManager(IdentityManager
+                .getGlobalConfig()).getIcon("input-error"));
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3, gap 0"));
         add(textField, "grow, pushx");

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

@@ -27,6 +27,7 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.ListenerList;
 
@@ -124,14 +125,14 @@ public class ActionConditionDisplayPanel extends JPanel implements ActionListene
 
     /** Initialises the components. */
     private void initComponents() {
+        final IconManager iconManager = new IconManager(IdentityManager
+                .getGlobalConfig());
         label = new TextLabel("", false);
-        editButton = new ImageToggleButton("edit", IconManager.getIconManager().
-                getIcon("edit-inactive"),
-                IconManager.getIconManager().getIcon("edit"));
-        deleteButton = new ImageButton("delete", IconManager.getIconManager().
-                getIcon("close-inactive"), IconManager.getIconManager().
-                getIcon("close-inactive"),
-                IconManager.getIconManager().getIcon("close-active"));
+        editButton = new ImageToggleButton("edit", iconManager.
+                getIcon("edit-inactive"), iconManager.getIcon("edit"));
+        deleteButton = new ImageButton("delete", iconManager.
+                getIcon("close-inactive"), iconManager.
+                getIcon("close-inactive"), iconManager.getIcon("close-active"));
 
         editPanel = new ActionConditionEditorPanel(condition, trigger);
         listeners = new ListenerList();

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.ListenerList;
 
@@ -83,14 +84,16 @@ public class ActionTriggersListPanel extends JPanel {
     /** Lays out the components. */
     private void layoutComponents() {
         synchronized (triggers) {
+            final IconManager iconManager = new IconManager(IdentityManager
+                .getGlobalConfig());
             setVisible(false);
 
             removeAll();
 
             for (final ActionType trigger : triggers) {
                 final ImageButton button = new ImageButton("delete",
-                        IconManager.getIconManager().getIcon("close-inactive"),
-                        IconManager.getIconManager().getIcon("close-active"));
+                        iconManager.getIcon("close-inactive"),
+                        iconManager.getIcon("close-active"));
                 button.addActionListener(new ActionListener() {
 
                     /** {@inheritDoc} */

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

@@ -193,7 +193,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
 
     /** Initialises the channel settings. */
     private void initSettingsPanel() {
-        channelSettingsPane = new SettingsPanel(identity,
+        channelSettingsPane = new SettingsPanel(
                 "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/IconLoader.java

@@ -22,6 +22,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
@@ -56,7 +57,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
     /** {@inheritDoc} */
     @Override
     protected Icon doInBackground() {
-        return IconManager.getIconManager().getIcon(icon);
+        return new IconManager(IdentityManager.getGlobalConfig()).getIcon(icon);
     }
 
     /** {@inheritDoc} */

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

@@ -33,8 +33,8 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.swing.BorderFactory;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
@@ -111,16 +111,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(IdentityManager.
-                        getNetworkConfig(item.getName()), "", false));
+                panels.put(item, new SettingsPanel("", 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(null, "", false));
+                panels.put(null, new SettingsPanel("", false));
             } else {
-                panels.put(item, new SettingsPanel(IdentityManager.
-                        getServerConfig(item.getName()), "", false));
+                panels.put(item, new SettingsPanel("", false));
             }
         }
         return panels.get(item);

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

@@ -148,8 +148,7 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
                 new PerformTab(server);
 
         settingsPanel =
-                new SettingsPanel(server.getNetworkIdentity(),
-                "These settings are specific to this " +
+                new SettingsPanel("These settings are specific to this " +
                 "network, any settings specified here will overwrite global " +
                 "settings");
 

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/CertificateChainPanel.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.renderers.CertificateChainEntryCellRenderer;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateChainEntry;
 
@@ -79,10 +80,12 @@ public class CertificateChainPanel extends JPanel {
         setLayout(new MigLayout("fillx, wrap 1"));
 
         add(new JScrollPane(list), "grow, pushy");
-        add(new JLabel("Certificate is trusted", IconManager.getIconManager().
-                getIcon("tick"), JLabel.LEFT), "growx");
-        add(new JLabel("Problem with certificate", IconManager.getIconManager().
-                getIcon("cross"), JLabel.LEFT), "growx");
+        add(new JLabel("Certificate is trusted", new IconManager(
+                IdentityManager.getGlobalConfig()).getIcon("tick"),
+                JLabel.LEFT), "growx");
+        add(new JLabel("Problem with certificate", new IconManager(
+                IdentityManager.getGlobalConfig()).getIcon("cross"),
+                JLabel.LEFT), "growx");
     }
 
     /**

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SummaryPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateSummaryEntry;
 
@@ -31,8 +32,8 @@ import java.util.List;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-
 import javax.swing.UIManager;
+
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -61,11 +62,13 @@ public class SummaryPanel extends JPanel {
         setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
                 "TitledBorder.border"), "Summary"));
         setLayout(new MigLayout("fill, wrap 1"));
+        final IconManager iconManager = new IconManager(IdentityManager
+                .getGlobalConfig());
 
         for (CertificateSummaryEntry entry : summary) {
-            add(new JLabel(entry.getText(),
-                    entry.isGood() ? IconManager.getIconManager().getIcon("tick")
-                    : IconManager.getIconManager().getIcon("cross"), JLabel.LEFT),
+            add(new JLabel(entry.getText(), entry.isGood()
+                    ? iconManager.getIcon("tick")
+                    : iconManager.getIcon("cross"), JLabel.LEFT),
                     "growx");
         }
     }

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -35,7 +35,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.Window;
 
@@ -303,8 +302,9 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     private void addButton(final Window source) {
         final FrameToggleButton button = new FrameToggleButton(
-                source.getContainer().getName(), IconManager.getIconManager()
-                .getIcon(source.getContainer().getIcon()), source);
+                source.getContainer().getName(), source.getContainer()
+                .getIconManager().getIcon(source.getContainer().getIcon()),
+                source);
         button.addActionListener(this);
         button.addMouseListener(this);
         button.setHorizontalAlignment(SwingConstants.LEFT);
@@ -485,7 +485,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
             public void run() {
                 final FrameToggleButton button = getButton(window);
                 if (button != null) {
-                    button.setIcon(IconManager.getIconManager().getIcon(icon));
+                    button.setIcon(window.getIconManager().getIcon(icon));
                 }
             }
         });

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

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 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.IconManager;
@@ -66,8 +67,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
     /** Are we the selected window? */
     private boolean selected;
     /** Node icon. */
-    private final ImageButton icon = new ImageButton("", IconManager
-            .getIconManager().getIcon("icon"));
+    private final ImageButton icon = new ImageButton("", null);
     /** Text label. */
     private final JTextPane text = new JTextPane(new DefaultStyledDocument());
     /** Current styled text. */
@@ -91,10 +91,12 @@ public class NodeLabel extends JPanel implements SelectionListener,
      */
     private void init() {
         if (window == null) {
+            icon.setIcon(new IconManager(IdentityManager.getGlobalConfig())
+                    .getIcon("icon"));
             return;
         }
 
-        icon.setIcon(IconManager.getIconManager().getIcon(window.getIcon()));
+        icon.setIcon(window.getIconManager().getIcon(window.getIcon()));
         text.setText(window.getName());
         text.setBorder(null);
 
@@ -145,7 +147,7 @@ public class NodeLabel extends JPanel implements SelectionListener,
     @Override
     public void iconChanged(final FrameContainer window, final String icon) {
         if (equals(window)) {
-            this.icon.setIcon(IconManager.getIconManager().getIcon(icon));
+            this.icon.setIcon(window.getIconManager().getIcon(icon));
         }
     }
 

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenu.java

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.FrameInfoListener;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.Font;
 import java.awt.event.ActionEvent;
@@ -64,7 +63,7 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
     public FrameContainerMenu(final FrameContainer frame,
             final SwingController controller) {
         super(frame.getName());
-        setIcon(IconManager.getIconManager().getIcon(frame.getIcon()));
+        setIcon(frame.getIconManager().getIcon(frame.getIcon()));
         new WindowMenuScroller(this, controller.getDomain(), 0);
 
         this.controller = controller;
@@ -83,7 +82,7 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
             @Override
             public void run() {
                 if ((frame != null && window != null) && frame.equals(window)) {
-                    setIcon(IconManager.getIconManager().getIcon(icon));
+                    setIcon(window.getIconManager().getIcon(icon));
                 }
             }
         });

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.FrameInfoListener;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Font;
@@ -66,8 +65,7 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
     public FrameContainerMenuItem(final SwingController controller,
             final FrameContainer frame,
             final WindowMenuFrameManager manager) {
-        super(frame.getName(), IconManager.getIconManager().getIcon(frame.
-                getIcon()));
+        super(frame.getName(), frame.getIconManager().getIcon(frame.getIcon()));
 
         this.controller = controller;
         this.frame = frame;
@@ -86,7 +84,7 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
             @Override
             public void run() {
                 if (frame != null && window != null && frame.equals(window)) {
-                    setIcon(IconManager.getIconManager().getIcon(icon));
+                    setIcon(window.getIconManager().getIcon(icon));
                 }
             }
         });

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -102,8 +102,8 @@ public final class WindowMenuFrameManager extends JMenu implements
         setMnemonic('w');
         controller.getWindowFactory().addWindowListener(this);
 
-        closeMenuItem = new JMenuItem(IconManager.getIconManager().getIcon(
-                "close"));
+        closeMenuItem = new JMenuItem(new IconManager(IdentityManager
+                .getGlobalConfig()).getIcon("close"));
         closeMenuItem.setMnemonic('c');
         closeMenuItem.setText("Close");
         closeMenuItem.setActionCommand("Close");

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

@@ -71,7 +71,8 @@ public final class SwingFirstRunWizard implements WizardListener,
         wizardDialog = new WizardDialog("DMDirc: Setup wizard",
                 new ArrayList<Step>(), parentWindow,
                 ModalityType.APPLICATION_MODAL);
-        wizardDialog.setIconImage(IconManager.getIconManager().getImage("icon"));
+        wizardDialog.setIconImage(new IconManager(IdentityManager
+                .getGlobalConfig()).getImage("icon"));
         wizardDialog.addWizardListener(this);
         if(Apple.isAppleUI()) {
             wizardDialog.setMinimumSize(new Dimension(400, 425));