Make URLBuilders optional in text labels.

All existing usages will omit a URL Builder, but there doesn't appear to be
any places where it's actually needed.

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

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.text;
 
 import com.dmdirc.util.URLBuilder;
 
+import javax.annotation.Nullable;
 import javax.swing.text.ViewFactory;
 import javax.swing.text.html.HTMLEditorKit;
 
@@ -38,9 +39,10 @@ public class DMDircHTMLEditorKit extends HTMLEditorKit {
     /**
      * Creates a new instance of {@link DMDircHTMLEditorKit}.
      *
-     * @param urlBuilder The URL builder to use to construct image URLs.
+     * @param urlBuilder The URL builder to use to construct image URLs. If {@code null}, then only
+     * standard URLs will be handled (not DMDirc-specific ones).
      */
-    public DMDircHTMLEditorKit(final URLBuilder urlBuilder) {
+    public DMDircHTMLEditorKit(@Nullable final URLBuilder urlBuilder) {
         defaultFactory = new DMDircHTMLFactory(urlBuilder);
     }
 

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.text;
 
 import com.dmdirc.util.URLBuilder;
 
+import javax.annotation.Nullable;
 import javax.swing.text.Element;
 import javax.swing.text.View;
 import javax.swing.text.html.HTMLEditorKit.HTMLFactory;
@@ -35,9 +36,16 @@ import javax.swing.text.html.ImageView;
 public class DMDircHTMLFactory extends HTMLFactory {
 
     /** The URL builder to use to construct image URLs. */
+    @Nullable
     private final URLBuilder urlBuilder;
 
-    public DMDircHTMLFactory(final URLBuilder urlBuilder) {
+    /**
+     * Creates a new instance of {@link DMDircHTMLFactory}.
+     *
+     * @param urlBuilder The URL builder to use for images. If {@code null}, then only standard
+     * URLs will be handled in image views (not DMDirc-specific ones).
+     */
+    public DMDircHTMLFactory(@Nullable final URLBuilder urlBuilder) {
         this.urlBuilder = urlBuilder;
     }
 
@@ -45,7 +53,7 @@ public class DMDircHTMLFactory extends HTMLFactory {
     @Override
     public View create(final Element elem) {
         final View view = super.create(elem);
-        if (view instanceof ImageView) {
+        if (view instanceof ImageView && urlBuilder != null) {
             return new DMDircImageView(urlBuilder, elem);
         }
         return view;

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

@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.Insets;
 
+import javax.annotation.Nullable;
 import javax.swing.JTextPane;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicTextPaneUI;
@@ -54,6 +55,9 @@ public class TextLabel extends JTextPane {
 
     /**
      * Creates a new instance of TextLabel.
+     *
+     * <p>Labels constructed without a {@link URLBuilder} will not be able to resolve
+     * DMDirc-specific URLs in image tags.
      */
     public TextLabel() {
         this(null, true);
@@ -62,6 +66,9 @@ public class TextLabel extends JTextPane {
     /**
      * Creates a new instance of TextLabel.
      *
+     * <p>Labels constructed without a {@link URLBuilder} will not be able to resolve
+     * DMDirc-specific URLs in image tags.
+     *
      * @param justified Justify the text?
      */
     public TextLabel(final boolean justified) {
@@ -71,6 +78,9 @@ public class TextLabel extends JTextPane {
     /**
      * Creates a new instance of TextLabel.
      *
+     * <p>Labels constructed without a {@link URLBuilder} will not be able to resolve
+     * DMDirc-specific URLs in image tags.
+     *
      * @param text Text to display
      */
     public TextLabel(final String text) {
@@ -80,12 +90,30 @@ public class TextLabel extends JTextPane {
     /**
      * Creates a new instance of TextLabel.
      *
+     * <p>Labels constructed without a {@link URLBuilder} will not be able to resolve
+     * DMDirc-specific URLs in image tags.
+     *
      * @param text Text to display
      * @param justified Justify the text?
      */
     public TextLabel(final String text, final boolean justified) {
+        this(null, text, justified);
+    }
+
+    /**
+     * Creates a new instance of TextLabel.
+     *
+     * @param urlBuilder The URL builder to use for embedded image URLs. If {@code null}, then only
+     * standard URLs will be handled in image tags (not DMDirc-specific ones).
+     * @param text Text to display
+     * @param justified Justify the text?
+     */
+    public TextLabel(
+            @Nullable final URLBuilder urlBuilder,
+            final String text,
+            final boolean justified) {
         super(new DefaultStyledDocument());
-        setEditorKit(new DMDircHTMLEditorKit(URLBuilder.getInstance()));
+        setEditorKit(new DMDircHTMLEditorKit(urlBuilder));
         setUI(new BasicTextPaneUI());
 
         final StyleSheet styleSheet = ((HTMLDocument) getDocument()).