Merge pull request #283 from csmith/master

Move the IconManager to ui_swing.

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Window;

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

@@ -44,7 +44,7 @@ import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.parser.interfaces.StringConverter;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.colours.Colour;
 

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.nickcolours;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;

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

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.events.ClientMinimisedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.AWTException;

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

@@ -45,7 +45,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.CoreUIUtils;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
 import java.awt.Dialog;

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

@@ -34,7 +34,7 @@ import com.dmdirc.addons.ui_swing.components.renderers.MapEntryRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;

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

@@ -24,7 +24,6 @@ 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.collections.ListenerList;
 
 import java.awt.event.ActionEvent;

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

@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.components;
+
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.util.URLBuilder;
+
+import java.awt.Image;
+import java.awt.Toolkit;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+import static com.dmdirc.ClientModule.GlobalConfig;
+
+/**
+ * The icon manager provides a standard way to access icons for use in DMDirc. It allows the user to
+ * override the default actions using config settings under the icons domain.
+ */
+@Singleton
+public class IconManager implements ConfigChangeListener {
+
+    /** A map of existing icons. */
+    private final Map<String, Icon> icons;
+    /** A map of existing images. */
+    private final Map<String, Image> images;
+    /** Config manager to retrieve settings from. */
+    private final AggregateConfigProvider configManager;
+    /** URL builder to use for icons. */
+    private final URLBuilder urlBuilder;
+
+    /**
+     * Creates a new instance of IconManager.
+     *
+     * @param configManager Config manager to retrieve settings from
+     * @param urlBuilder    URL builder to use for icons.
+     */
+    @Inject
+    public IconManager(
+            @GlobalConfig final AggregateConfigProvider configManager,
+            final URLBuilder urlBuilder) {
+        this.configManager = configManager;
+        this.urlBuilder = urlBuilder;
+
+        icons = new HashMap<>();
+        images = new HashMap<>();
+
+        configManager.addChangeListener("icon", this);
+    }
+
+    /**
+     * Retrieves the icon with the specified type. Returns null if the icon wasn't found.
+     *
+     * @param type The name of the icon type to retrieve
+     *
+     * @return The icon that should be used for the specified type
+     */
+    public Icon getIcon(final String type) {
+        if (icons.containsKey(type)) {
+            return icons.get(type);
+        }
+        if (!icons.containsKey(type)) {
+            final URL iconURL = getIconURL(type);
+            final Image iconImage = Toolkit.getDefaultToolkit().getImage(iconURL);
+            final Image scaledIconImage = getScaledImage(iconImage, 16, 16);
+            icons.put(type, new ImageIcon(scaledIconImage));
+        }
+        return icons.get(type);
+    }
+
+    /**
+     * Retrieves the icon with the specified type. Returns null if the icon wasn't found.
+     *
+     * @param type   The name of the icon type to retrieve
+     * @param width  width of the image
+     * @param height height of the image
+     *
+     * @return The icon that should be used for the specified type
+     *
+     * @since 0.6.3m1
+     */
+    public Icon getScaledIcon(final String type, final int width, final int height) {
+        return new ImageIcon(getScaledImage(new ImageIcon(getIconURL(type)).
+                getImage(), width, height));
+    }
+
+    /**
+     * Retrieves the image with the specified type. Returns null if the icon wasn't found.
+     *
+     * @param type The name of the icon type to retrieve
+     *
+     * @return The image that should be used for the specified type
+     */
+    public Image getImage(final String type) {
+        if (!images.containsKey(type)) {
+            images.put(type, Toolkit.getDefaultToolkit().createImage(getIconURL(type)));
+        }
+        return images.get(type);
+    }
+
+    /**
+     * Returns a scaled image.
+     *
+     * @param image  Image to scale
+     * @param width  Width of resulting image
+     * @param height Height of resulting image
+     *
+     * @return Scaled Image
+     */
+    private Image getScaledImage(final Image image,
+            final int width, final int height) {
+        return image.getScaledInstance(width, height, Image.SCALE_SMOOTH);
+    }
+
+    /**
+     * Retrieves the URL of a specified icon type.
+     *
+     * @param type The name of the icon type to retrieve
+     *
+     * @return The URL that should be used to retrieve the specified icon
+     */
+    private URL getIconURL(final String type) {
+        final String iconType = getSpecialIcons(type);
+        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader classLoader = contextClassLoader == null
+                ? getClass().getClassLoader() : contextClassLoader;
+        final URL defaultURL = classLoader.getResource("com/dmdirc/res/" + iconType + ".png");
+
+        //Get the path for the url
+        final String path = configManager.hasOptionString("icon", iconType)
+                ? configManager.getOption("icon", iconType)
+                : "dmdirc://com/dmdirc/res/" + iconType + ".png";
+
+        //Get the url for the specified path
+        URL imageURL = urlBuilder.getUrl(path);
+
+        if (imageURL == null && defaultURL != null) {
+            imageURL = defaultURL;
+        }
+
+        if (imageURL == null) {
+            imageURL = classLoader.getResource("com/dmdirc/res/icon.png");
+        }
+
+        //Check URL points to a valid location
+        try {
+            imageURL.openConnection().connect();
+        } catch (IOException ex) {
+            imageURL = classLoader.getResource("com/dmdirc/res/icon.png");
+        }
+
+        if (imageURL == null) {
+            throw new IllegalArgumentException("Unable to load icon type '"
+                    + iconType + "', and unable to load default");
+        }
+
+        return imageURL;
+    }
+
+    private String getSpecialIcons(final String type) {
+        final Calendar cal = new GregorianCalendar();
+        cal.setTime(new Date());
+        if (cal.get(Calendar.MONTH) == Calendar.DECEMBER
+                && cal.get(Calendar.DAY_OF_MONTH) >= 12
+                && cal.get(Calendar.DAY_OF_MONTH) <= 31
+                && ("icon".equals(type) || "logo".equals(type))) {
+            return "logo-special";
+        }
+        return type;
+    }
+
+    @Override
+    public void configChanged(final String domain, final String key) {
+        if ("icon".equals(domain)) {
+            if (images.containsKey(key)) {
+                images.remove(key);
+            }
+            if (icons.containsKey(key)) {
+                icons.remove(key);
+            }
+        }
+    }
+
+}

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

@@ -33,7 +33,6 @@ import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
-import com.dmdirc.ui.IconManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

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

@@ -31,7 +31,6 @@ import com.dmdirc.addons.ui_swing.textpane.TextPane;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.SearchBar;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCDocumentSearcher;

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import javax.inject.Inject;

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.ui.IconManager;
 
 import java.awt.Color;
 import java.awt.event.MouseEvent;

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

@@ -39,7 +39,6 @@ import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;

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

@@ -31,7 +31,6 @@ import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Color;
 import java.awt.Font;

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

@@ -31,7 +31,7 @@ import com.dmdirc.events.PluginRefreshEvent;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
 import java.awt.Window;

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

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.colours.Colour;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.colours;
 
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Component;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.colours.Colour;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.collections.ListenerList;
 

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.DateUtils;
 import com.dmdirc.util.collections.ListenerList;
 

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.Window;

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

@@ -24,7 +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.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.collections.DoubleMap;
 
 import javax.swing.BorderFactory;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Point;
 

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

@@ -61,7 +61,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;

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

@@ -29,7 +29,7 @@ import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.collections.ListenerList;
 

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.KeyboardFocusManager;

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

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.validators.Validator;
 

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

@@ -35,7 +35,7 @@ import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dialog;
 import java.util.Optional;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.modes;
 
 import com.dmdirc.Channel;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 /** Non list mode panel. */
 public final class ChannelModesPane extends ModesPane {

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.modes;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Insets;
 import java.util.HashMap;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components.modes;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.RegexStringValidator;
 
 import java.awt.Component;

ui_swing/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.interfaces.Connection;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 /** User mode panel. */
 public final class UserModesPane extends ModesPane {

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

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.commandparser.auto.AutoCommand;
 import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.util.Collection;

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateChainEntry;
 
 import javax.swing.Icon;

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

@@ -29,7 +29,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

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

@@ -26,7 +26,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.collections.MapList;
 
 import java.awt.Font;

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

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

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

@@ -31,7 +31,7 @@ import com.dmdirc.events.ServerInviteExpiredEvent;
 import com.dmdirc.events.ServerInviteReceivedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Window;
 import java.awt.event.MouseEvent;

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

@@ -30,7 +30,7 @@ import com.dmdirc.events.StatusBarMessageClearEvent;
 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.StatusMessage;
 
 import java.awt.Window;

ui_swing/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.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.collections.RollingList;
 

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

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogModule.ForUpdates;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.updater.manager.UpdateManagerListener;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.validating;
 
 import com.dmdirc.addons.ui_swing.components.JIconTextField;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.validating;
 
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.ValidationResponse;
 
 import javax.swing.ImageIcon;

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.validating;
 
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.Validator;
 
 import java.awt.Component;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.Validator;
 

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

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.commandparser.aliases.Alias;
 import com.dmdirc.interfaces.ui.AliasDialogModel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.NotEmptyValidator;
 
 import java.awt.Dimension;

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

@@ -31,7 +31,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.commandparser.aliases.Alias;
 import com.dmdirc.interfaces.ui.AliasDialogModel;
 import com.dmdirc.interfaces.ui.AliasDialogModelListener;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dialog;
 import java.beans.PropertyVetoException;

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

@@ -30,7 +30,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.parser.common.ChannelListModeItem;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.validators.NotEmptyValidator;
 

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

@@ -36,7 +36,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -35,7 +35,7 @@ import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/errors/ErrorLevelIconCellRenderer.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.errors;
 
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import javax.swing.SwingConstants;
 import javax.swing.table.DefaultTableCellRenderer;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/errors/ErrorsDialog.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.ui.ErrorsDialogModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dimension;
 import java.awt.Window;

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

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.ui.FeedbackDialogModel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Window;
 

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

@@ -31,7 +31,7 @@ import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Window;
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -32,7 +32,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialogFactory.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dimension;
 

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

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.components.TitlePanel;
 import com.dmdirc.addons.ui_swing.components.ToolTipPanel;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.util.Arrays;
 import java.util.Collections;

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

@@ -26,7 +26,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.util.concurrent.ExecutionException;
 

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Component;
 import java.awt.Font;

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

@@ -35,7 +35,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

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

@@ -32,7 +32,7 @@ import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.validators.URLProtocolValidator;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileManagerController.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.vetoable.VetoableListSelectionModel
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
 import com.dmdirc.interfaces.ui.ProfilesDialogModelListener;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.profiles.MutableProfile;
 
 import com.google.common.collect.Lists;

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

@@ -29,7 +29,7 @@ import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.profiles.MutableProfile;
 
 import java.awt.Window;

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

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.IgnoreList;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.RegexValidator;
 import com.dmdirc.util.validators.ValidatorChain;

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

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.auto.AutoCommand;
 import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.event.ActionEvent;

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

@@ -34,7 +34,7 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;

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

@@ -24,7 +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.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateChainEntry;
 
 import java.util.List;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 
 import java.awt.Window;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.events.ServerCertificateProblemEncounteredEvent;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 
 import java.awt.Window;

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateSummaryEntry;
 
 import java.util.ArrayList;

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

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.textpane.StyledDocumentMaker;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.colours.Colour;
 

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

@@ -45,7 +45,7 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
 

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -54,7 +54,7 @@ import com.dmdirc.interfaces.ui.FeedbackDialogModel;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;
 import com.dmdirc.interfaces.ui.ProfilesDialogModel;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.about.CoreAboutDialogModel;
 import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
 import com.dmdirc.ui.core.errors.CoreErrorsDialogModel;

ui_swing/src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -61,7 +61,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.ServiceLocator;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.util.URLBuilder;
 

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

@@ -31,7 +31,7 @@ import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.FirstRunWizard;
 import com.dmdirc.plugins.CorePluginExtractor;
-import com.dmdirc.ui.IconManager;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Dimension;