Remove UrlBuilder.buildUrl calls.

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

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

@@ -190,6 +190,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** The colour manager to use to parse colours. */
     @Getter
     private final ColourManager colourManager;
+    /** The URL builder to use. */
+    @Getter
+    private final URLBuilder urlBuilder;
 
     /**
      * Instantiates a new SwingController.
@@ -243,6 +246,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.themeManager = themeManager;
         this.windowManager = windowManager;
         this.colourManager = colourManager;
+        this.urlBuilder = urlBuilder;
 
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getUserSettings();

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java

@@ -93,9 +93,13 @@ public class AddonInfo {
     /**
      * Creates a new addon info class with the specified entries.
      *
+     * @param configManager The config provider to use to find settings.
+     * @param urlBuilder The URL builder to use to retrieve image URLs.
      * @param entry List of entries
      */
-    public AddonInfo(final AggregateConfigProvider configManager,
+    public AddonInfo(
+            final AggregateConfigProvider configManager,
+            final URLBuilder urlBuilder,
             final Map<String, String> entry) {
         id = Integer.parseInt(entry.get("id"));
         title = entry.get("title");
@@ -113,12 +117,12 @@ public class AddonInfo {
         verified = entry.get("verified").equals("yes");
         date = Integer.parseInt(entry.get("date"));
         if (entry.get("screenshot").equals("yes")) {
-            screenshot = new ImageIcon(URLBuilder.buildURL(
+            screenshot = new ImageIcon(urlBuilder.getUrl(
                     "http://addons.dmdirc.com/addonimg/" + id));
             screenshot.setImage(screenshot.getImage().
                     getScaledInstance(150, 150, Image.SCALE_SMOOTH));
         } else {
-            screenshot = new ImageIcon(URLBuilder.buildURL(
+            screenshot = new ImageIcon(urlBuilder.getUrl(
                     "dmdirc://com/dmdirc/res/logo.png"));
         }
         try {

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -122,15 +122,13 @@ public class DataLoaderWorker
                 + File.separator + "addons.feed");
         try {
             data.read();
-        } catch (final IOException ex) {
-            return Collections.<AddonInfo>emptyList();
-        } catch (final InvalidConfigFileException ex) {
+        } catch (final IOException | InvalidConfigFileException ex) {
             return Collections.<AddonInfo>emptyList();
         }
 
-        final List<AddonInfo> list = new ArrayList<AddonInfo>();
+        final List<AddonInfo> list = new ArrayList<>();
         for (final Map<String, String> entry : data.getKeyDomains().values()) {
-            list.add(new AddonInfo(controller.getGlobalConfig(), entry));
+            list.add(new AddonInfo(controller.getGlobalConfig(), controller.getUrlBuilder(), entry));
         }
         return list;
     }

src/com/dmdirc/addons/ui_swing/components/text/DMDircHTMLEditorKit.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.text;
 
+import com.dmdirc.util.URLBuilder;
+
 import javax.swing.text.ViewFactory;
 import javax.swing.text.html.HTMLEditorKit;
 
@@ -31,7 +33,16 @@ import javax.swing.text.html.HTMLEditorKit;
 public class DMDircHTMLEditorKit extends HTMLEditorKit {
 
     private static final long serialVersionUID = 1;
-    private final ViewFactory defaultFactory = new DMDircHTMLFactory();
+    private final ViewFactory defaultFactory;
+
+    /**
+     * Creates a new instance of {@link DMDircHTMLEditorKit}.
+     *
+     * @param urlBuilder The URL builder to use to construct image URLs.
+     */
+    public DMDircHTMLEditorKit(final URLBuilder urlBuilder) {
+        defaultFactory = new DMDircHTMLFactory(urlBuilder);
+    }
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/addons/ui_swing/components/text/DMDircHTMLFactory.java

@@ -22,22 +22,30 @@
 
 package com.dmdirc.addons.ui_swing.components.text;
 
+import com.dmdirc.util.URLBuilder;
+
 import javax.swing.text.Element;
 import javax.swing.text.View;
 import javax.swing.text.html.HTMLEditorKit.HTMLFactory;
 import javax.swing.text.html.ImageView;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * DMDircHTML factory extends HTMLFactory to use DMDircImageView.
  */
+@RequiredArgsConstructor
 public class DMDircHTMLFactory extends HTMLFactory {
 
+    /** The URL builder to use to construct image URLs. */
+    private final URLBuilder urlBuilder;
+
     /** {@inheritDoc} */
     @Override
     public View create(final Element elem) {
         final View view = super.create(elem);
         if (view instanceof ImageView) {
-            return new DMDircImageView(elem);
+            return new DMDircImageView(urlBuilder, elem);
         }
         return view;
     }

src/com/dmdirc/addons/ui_swing/components/text/DMDircImageView.java

@@ -35,13 +35,19 @@ import javax.swing.text.html.ImageView;
  */
 public class DMDircImageView extends ImageView {
 
+    /** The URL builder to use to construct image URLs. */
+    private final URLBuilder urlBuilder;
+
     /**
      * Creates a new DMDirc image view.
      *
      * @param elem element to view
+     * @param urlBuilder The URL builder to use to construct image URLs.
      */
-    public DMDircImageView(final Element elem) {
+    public DMDircImageView(final URLBuilder urlBuilder, final Element elem) {
         super(elem);
+
+        this.urlBuilder = urlBuilder;
     }
 
     /**
@@ -54,6 +60,6 @@ public class DMDircImageView extends ImageView {
         final String src = (String) getElement().getAttributes().
                 getAttribute(HTML.Attribute.SRC);
 
-        return src == null ? null : URLBuilder.buildURL(src);
+        return src == null ? null : urlBuilder.getUrl(src);
     }
 }

src/com/dmdirc/addons/ui_swing/components/text/TextLabel.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.text;
 
+import com.dmdirc.util.URLBuilder;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Insets;
@@ -83,7 +85,7 @@ public class TextLabel extends JTextPane {
      */
     public TextLabel(final String text, final boolean justified) {
         super(new DefaultStyledDocument());
-        setEditorKit(new DMDircHTMLEditorKit());
+        setEditorKit(new DMDircHTMLEditorKit(URLBuilder.getInstance()));
         setUI(new BasicTextPaneUI());
 
         final StyleSheet styleSheet = ((HTMLDocument) getDocument()).

src/com/dmdirc/addons/ui_swing/textpane/BackgroundPainter.java

@@ -76,6 +76,9 @@ public class BackgroundPainter extends LayerUI<JComponent> {
     @Getter(value = AccessLevel.PROTECTED)
     private final String optionKey;
 
+    /** The URL builder to use to find icons. */
+    private final URLBuilder urlBuilder;
+
     /**
      * Config manager to bind to and retrieve settings from.
      */
@@ -99,10 +102,13 @@ public class BackgroundPainter extends LayerUI<JComponent> {
      * @param imageKey Key for background image
      * @param optionKey Key for background type
      */
-    public BackgroundPainter(final AggregateConfigProvider configManager,
+    public BackgroundPainter(
+            final AggregateConfigProvider configManager,
+            final URLBuilder urlBuilder,
             final String domain, final String imageKey,
             final String optionKey) {
         this.configManager = configManager;
+        this.urlBuilder = urlBuilder;
         this.domain = domain;
         this.imageKey = imageKey;
         this.optionKey = optionKey;
@@ -119,7 +125,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
         if (value == null || value.isEmpty()) {
             backgroundImage = null;
         } else {
-            new ImageLoader(URLBuilder.buildURL(value)).executeInExecutor();
+            new ImageLoader(urlBuilder.getUrl(value)).executeInExecutor();
         }
     }
 

src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -102,8 +102,8 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         newLineIndicator.setVisible(false);
 
         setLayout(new MigLayout("fill, hidemode 3"));
-        backgroundPainter = new BackgroundPainter(frame.getContainer()
-                .getConfigManager(), "plugin-ui_swing", "textpanebackground",
+        backgroundPainter = new BackgroundPainter(frame.getContainer().getConfigManager(),
+                controller.getUrlBuilder(), "plugin-ui_swing", "textpanebackground",
                 "textpanebackgroundoption");
         canvas = new TextPaneCanvas(this, document);
         final JXLayer<JComponent> layer = new JXLayer<JComponent>(canvas);