Remove deprecated URLBuilder-related stuff.

Change-Id: I0109f276aa49ddf3376969126c7e34ff020023e0
Reviewed-on: http://gerrit.dmdirc.com/3108
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/swingdebug/SwingDebugPlugin.java

@@ -27,6 +27,7 @@ import com.dmdirc.addons.ui_swing.components.CheckBoxMenuItem;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.util.URLBuilder;
 
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -59,12 +60,18 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
     private SystemStreamContainer sysoutFrame;
     /** System error window. */
     private SystemStreamContainer syserrFrame;
+    /** URL Builder to use for frame containers. */
+    private final URLBuilder urlBuilder;
 
-    public SwingDebugPlugin(final IdentityController identityController,
-            final SwingController controller, final WindowManager windowManager) {
+    public SwingDebugPlugin(
+            final IdentityController identityController,
+            final SwingController controller,
+            final WindowManager windowManager,
+            final URLBuilder urlBuilder) {
         this.identityController = identityController;
         this.controller = controller;
         this.windowManager = windowManager;
+        this.urlBuilder = urlBuilder;
     }
 
     /** {@inheritDoc} */
@@ -108,7 +115,7 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysOut) {
             if (showSysOut.isSelected()) {
                 sysoutFrame = new SystemStreamContainer(SystemStreamType.Out,
-                        controller.getGlobalConfig(), this, controller.getUrlBuilder());
+                        controller.getGlobalConfig(), this, urlBuilder);
                 windowManager.addWindow(sysoutFrame);
             } else {
                 sysoutFrame.close();
@@ -118,7 +125,7 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysErr) {
             if (showSysErr.isSelected()) {
                 syserrFrame = new SystemStreamContainer(SystemStreamType.Error,
-                        controller.getGlobalConfig(), this, controller.getUrlBuilder());
+                        controller.getGlobalConfig(), this, urlBuilder);
                 windowManager.addWindow(syserrFrame);
             } else {
                 syserrFrame.close();

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

@@ -103,8 +103,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final Apple apple;
     /** The colour manager to use to parse colours. */
     private final ColourManager colourManager;
-    /** The URL builder to use. */
-    private final URLBuilder urlBuilder;
     /** The manager we're using for dependencies. */
     private SwingManager swingManager;
 
@@ -130,7 +128,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.pluginInfo = pluginInfo;
         this.pluginManager = pluginManager;
         this.colourManager = colourManager;
-        this.urlBuilder = urlBuilder;
 
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getUserSettings();
@@ -171,11 +168,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return colourManager;
     }
 
-    @Deprecated
-    public URLBuilder getUrlBuilder() {
-        return urlBuilder;
-    }
-
     /**
      * Make swing not use Anti Aliasing if the user doesn't want it.
      */

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

@@ -37,7 +37,6 @@ import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
@@ -84,19 +83,17 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * @param deps The dependencies required by text frames.
      * @param identityFactory The factory to use to create a channel identity.
      * @param topicBarFactory The factory to use to create topic bars.
-     * @param urlBuilder The URL Builder to use for constructing icons paths.
      * @param owner The Channel object that owns this frame
      */
     public ChannelFrame(
             final TextFrameDependencies deps,
             final IdentityFactory identityFactory,
             final TopicBarFactory topicBarFactory,
-            final URLBuilder urlBuilder,
             @Unbound final Channel owner) {
         super(deps, owner);
         this.controller = getController();
 
-        initComponents(topicBarFactory, urlBuilder);
+        initComponents(topicBarFactory);
 
         controller.getGlobalConfig().addChangeListener("ui",
                 "channelSplitPanePosition", this);
@@ -128,13 +125,13 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     }
 
     /**
-     * Initialises the compoents in this frame.
+     * Initialises the components in this frame.
+     *
+     * @param topicBarFactory The factory to use to produce topic bars.
      */
-    private void initComponents(
-            final TopicBarFactory topicBarFactory,
-            final URLBuilder urlBuilder) {
+    private void initComponents(final TopicBarFactory topicBarFactory) {
         topicBar = topicBarFactory.getTopicBar((Channel) getContainer(),
-                getContainer().getIconManager(urlBuilder));
+                getContainer().getIconManager());
 
         nicklist = new NickList(this, getContainer().getConfigManager());
         settingsMI = new JMenuItem("Settings");

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

@@ -30,6 +30,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.SimpleInjector;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -47,12 +48,16 @@ public class ComponentCreator {
      *
      * @param frame Frame to initialise
      * @param controller UI Controller
+     * @param urlBuilder URL builder to inject.
      * @param owner container
      *
      * @return Set of initialised components
      */
     @Deprecated
-    public Set<JComponent> initFrameComponents(final Object frame, final SwingController controller,
+    public Set<JComponent> initFrameComponents(
+            final Object frame,
+            final SwingController controller,
+            final URLBuilder urlBuilder,
             final FrameContainer owner) {
         final SimpleInjector injector = new SimpleInjector();
         final Set<String> names = owner.getComponents();
@@ -62,7 +67,7 @@ public class ComponentCreator {
         injector.addParameter(owner);
         injector.addParameter(controller);
         injector.addParameter(controller.getMainFrame());
-        injector.addParameter(controller.getUrlBuilder());
+        injector.addParameter(urlBuilder);
         injector.addParameter(controller.getDomain());
 
         for (String string : names) {

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.PopupType;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
@@ -44,6 +45,8 @@ public class ComponentFrame extends TextFrame {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
+    /** URL builder to use when making components. */
+    private final URLBuilder urlBuilder;
     /** Parent frame container. */
     private final FrameContainer owner;
     /** Parent controller. */
@@ -53,13 +56,16 @@ public class ComponentFrame extends TextFrame {
      * Creates a new instance of CustomFrame.
      *
      * @param deps The dependencies required by text frames.
+     * @param urlBuilder URL builder to use when making components.
      * @param owner The frame container that owns this frame
      */
     public ComponentFrame(
             final TextFrameDependencies deps,
+            final URLBuilder urlBuilder,
             @Unbound final FrameContainer owner) {
         super(owner, deps);
         this.controller = getController();
+        this.urlBuilder = urlBuilder;
         this.owner = owner;
         initComponents();
     }
@@ -69,8 +75,8 @@ public class ComponentFrame extends TextFrame {
      */
     private void initComponents() {
         setLayout(new MigLayout("fill"));
-        for (JComponent comp : new ComponentCreator().initFrameComponents(this,
-                controller, owner)) {
+        for (JComponent comp : new ComponentCreator()
+                .initFrameComponents(this, controller, urlBuilder, owner)) {
             add(comp, "wrap, grow");
         }
     }

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

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.PopupType;
+import com.dmdirc.util.URLBuilder;
 
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
@@ -44,6 +45,8 @@ public class ComponentInputFrame extends InputTextFrame {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
+    /** URL builder to use when making components. */
+    private final URLBuilder urlBuilder;
     /** Parent frame container. */
     private final FrameContainer owner;
     /** Parent controller. */
@@ -53,12 +56,16 @@ public class ComponentInputFrame extends InputTextFrame {
      * Creates a new instance of CustomInputFrame.
      *
      * @param deps The dependencies required by text frames.
+     * @param urlBuilder URL builder to use when making components.
      * @param owner The frame container that owns this frame
      */
-    public ComponentInputFrame(final TextFrameDependencies deps,
+    public ComponentInputFrame(
+            final TextFrameDependencies deps,
+            final URLBuilder urlBuilder,
             final WritableFrameContainer owner) {
         super(deps, owner);
         this.controller = getController();
+        this.urlBuilder = urlBuilder;
         this.owner = owner;
         initComponents();
     }
@@ -68,8 +75,8 @@ public class ComponentInputFrame extends InputTextFrame {
      */
     private void initComponents() {
         setLayout(new MigLayout("fill"));
-        for (JComponent comp : new ComponentCreator().initFrameComponents(this,
-                controller, owner)) {
+        for (JComponent comp : new ComponentCreator()
+                .initFrameComponents(this, controller, urlBuilder, owner)) {
             add(comp, "wrap, grow");
         }
     }

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

@@ -62,7 +62,6 @@ import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.awt.Point;
 import java.awt.event.KeyEvent;
@@ -109,8 +108,6 @@ public abstract class TextFrame extends JPanel implements Window,
     private final PopupManager popupManager;
     /** Handler to use to open URLs. */
     private final URLHandler urlHandler;
-    /** Builder to use to construct URLs. */
-    private final URLBuilder urlBuilder;
     /** Controller to use for commands. */
     private final CommandController commandController;
     /** Boolean to determine if this frame should be popped out of main client. */
@@ -137,7 +134,6 @@ public abstract class TextFrame extends JPanel implements Window,
         this.controller = deps.controller;
         this.mainFrame = deps.mainFrame;
         this.popupManager = deps.popupManager;
-        this.urlBuilder = deps.urlBuilder;
         this.urlHandler = deps.urlHandler;
         this.commandController = deps.commandController;
         this.frameParent = owner;
@@ -580,7 +576,7 @@ public abstract class TextFrame extends JPanel implements Window,
      * @return This frame's IconManager
      */
     public IconManager getIconManager() {
-        return getContainer().getIconManager(urlBuilder);
+        return getContainer().getIconManager();
     }
 
     /**
@@ -618,7 +614,6 @@ public abstract class TextFrame extends JPanel implements Window,
         private final Provider<MainFrame> mainFrame;
         private final PopupManager popupManager;
         private final URLHandler urlHandler;
-        private final URLBuilder urlBuilder;
         private final CommandController commandController;
 
         @Inject
@@ -628,14 +623,12 @@ public abstract class TextFrame extends JPanel implements Window,
                 final Provider<MainFrame> mainFrame,
                 final PopupManager popupManager,
                 final URLHandler urlHandler,
-                final URLBuilder urlBuilder,
                 final CommandController commandController) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
             this.mainFrame = mainFrame;
             this.popupManager = popupManager;
             this.urlHandler = urlHandler;
-            this.urlBuilder = urlBuilder;
             this.commandController = commandController;
         }
     }

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

@@ -308,8 +308,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     private void addButton(final Window source) {
         final FrameToggleButton button = new FrameToggleButton(
                 source.getContainer().getName(),
-                source.getContainer().getIconManager(controller.getUrlBuilder())
-                        .getIcon(source.getContainer().getIcon()),
+                source.getContainer().getIconManager().getIcon(source.getContainer().getIcon()),
                 source);
         button.addActionListener(this);
         button.addMouseListener(this);
@@ -491,7 +490,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
             public void run() {
                 final FrameToggleButton button = getButton(window);
                 if (button != null) {
-                    button.setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
+                    button.setIcon(window.getIconManager().getIcon(icon));
                 }
             }
         });

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

@@ -63,7 +63,7 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
     public FrameContainerMenu(final FrameContainer frame,
             final SwingController controller) {
         super(frame.getName());
-        setIcon(frame.getIconManager(controller.getUrlBuilder()).getIcon(frame.getIcon()));
+        setIcon(frame.getIconManager().getIcon(frame.getIcon()));
         new WindowMenuScroller(this, controller.getGlobalConfig(),
                 controller.getDomain(), 0);
 
@@ -83,7 +83,7 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
             @Override
             public void run() {
                 if ((frame != null && window != null) && frame.equals(window)) {
-                    setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
+                    setIcon(window.getIconManager().getIcon(icon));
                 }
             }
         });

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

@@ -66,7 +66,7 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
             final FrameContainer frame,
             final WindowMenuFrameManager manager) {
         super(frame.getName(),
-                frame.getIconManager(controller.getUrlBuilder()).getIcon(frame.getIcon()));
+                frame.getIconManager().getIcon(frame.getIcon()));
 
         this.controller = controller;
         this.frame = frame;
@@ -85,7 +85,7 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
             @Override
             public void run() {
                 if (frame != null && window != null && frame.equals(window)) {
-                    setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
+                    setIcon(window.getIconManager().getIcon(icon));
                 }
             }
         });