Fix most getIconManager() calls.

Change-Id: I8070f50bf1e22459f8a33bdc88bb64ec95c4b021
Depends-On: Id672fec154a19c999b078b3980681937f62bfb41
Reviewed-on: http://gerrit.dmdirc.com/2841
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -120,7 +120,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
         searchBox = new ValidatingJTextField(parent.getController()
                 .getIconManager(), validator);
         wrapIndicator = new JLabel("Search wrapped",
-                parent.getContainer().getIconManager().getIcon("linewrap"),
+                parent.getIconManager().getIcon("linewrap"),
                 JLabel.LEFT);
 
         nextButton.setText("Later");

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

@@ -123,7 +123,7 @@ public class TopicBar extends JComponent implements ActionListener,
                 new ReplacePasteAction("(\r\n|\n|\r)", " "));
         topicEdit = new ImageButton<>("edit",
                 channelFrame.getIconManager().getIcon("edit-inactive"),
-                channelFrame.getContainer().getIconManager().getIcon("edit"));
+                channelFrame.getIconManager().getIcon("edit"));
         topicCancel = new ImageButton<>("cancel",
                 channelFrame.getIconManager().getIcon("close"),
                 channelFrame.getIconManager().getIcon("close-active"));

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

@@ -109,7 +109,7 @@ public class DesktopWindowFrame extends JFrame implements FrameInfoListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setIconImage(window.getIconManager().getImage(icon));
+                setIconImage(windowWindow.getIconManager().getImage(icon));
             }
         });
     }

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

@@ -559,7 +559,7 @@ public abstract class TextFrame extends JPanel implements Window,
      * @return This frame's IconManager
      */
     public IconManager getIconManager() {
-        return getContainer().getIconManager();
+        return getContainer().getIconManager(controller.getUrlBuilder());
     }
 
     /**

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

@@ -307,8 +307,9 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     private void addButton(final Window source) {
         final FrameToggleButton button = new FrameToggleButton(
-                source.getContainer().getName(), source.getContainer()
-                .getIconManager().getIcon(source.getContainer().getIcon()),
+                source.getContainer().getName(),
+                source.getContainer().getIconManager(controller.getUrlBuilder())
+                        .getIcon(source.getContainer().getIcon()),
                 source);
         button.addActionListener(this);
         button.addMouseListener(this);
@@ -490,7 +491,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
             public void run() {
                 final FrameToggleButton button = getButton(window);
                 if (button != null) {
-                    button.setIcon(window.getIconManager().getIcon(icon));
+                    button.setIcon(window.getIconManager(controller.getUrlBuilder()).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().getIcon(frame.getIcon()));
+        setIcon(frame.getIconManager(controller.getUrlBuilder()).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().getIcon(icon));
+                    setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
                 }
             }
         });

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

@@ -65,7 +65,8 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
     public FrameContainerMenuItem(final SwingController controller,
             final FrameContainer frame,
             final WindowMenuFrameManager manager) {
-        super(frame.getName(), frame.getIconManager().getIcon(frame.getIcon()));
+        super(frame.getName(),
+                frame.getIconManager(controller.getUrlBuilder()).getIcon(frame.getIcon()));
 
         this.controller = controller;
         this.frame = frame;
@@ -84,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().getIcon(icon));
+                    setIcon(window.getIconManager(controller.getUrlBuilder()).getIcon(icon));
                 }
             }
         });