Revert FrameContainer UrlBuilder sillyness.

Makes more sense to just bite the bullet and have FrameContainers
require a URLBuilder so they can make an IconManager, rather than
have every caller pass one in.

Also removes the silly map which would've only ever had one entry,
and stops us making 19 million icon managers for giggles.

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

src/com/dmdirc/Channel.java

@@ -43,6 +43,7 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 import com.dmdirc.util.collections.ListenerList;
@@ -107,6 +108,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param commandController The controller to load commands from.
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public Channel(
             @Unbound final Server newServer,
@@ -114,11 +116,14 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
             @Unbound final ConfigProviderMigrator configMigrator,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
         super("channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
-                new ChannelCommandParser(newServer, commandController), messageSinkManager,
+                new ChannelCommandParser(newServer, commandController),
+                messageSinkManager,
+                urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                     WindowComponent.INPUTFIELD.getIdentifier(),
                     WindowComponent.TOPICBAR.getIdentifier(),

src/com/dmdirc/ClientModule.java

@@ -244,9 +244,10 @@ public class ClientModule {
     @Singleton
     public MessageSinkManager getMessageSinkManager(
             final StatusBarManager statusBarManager,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final URLBuilder urlBuilder) {
         final MessageSinkManager messageSinkManager = new MessageSinkManager();
-        messageSinkManager.loadDefaultSinks(statusBarManager, windowManager);
+        messageSinkManager.loadDefaultSinks(statusBarManager, windowManager, urlBuilder);
         return messageSinkManager;
     }
 

src/com/dmdirc/CustomWindow.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 
@@ -39,10 +40,14 @@ public class CustomWindow extends FrameContainer {
      * @param name The name of this custom window
      * @param title The title of this custom window
      * @param parent The parent of this custom window
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public CustomWindow(final String name, final String title,
-            final FrameContainer parent) {
-        super("custom", name, title, parent.getConfigManager(),
+    public CustomWindow(
+            final String name,
+            final String title,
+            final FrameContainer parent,
+            final URLBuilder urlBuilder) {
+        super("custom", name, title, parent.getConfigManager(), urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
@@ -52,10 +57,14 @@ public class CustomWindow extends FrameContainer {
      * @param name The name of this custom window
      * @param title The parent of this custom window
      * @param configProvider The config provider to read settings from.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public CustomWindow(final String name, final String title,
-            final AggregateConfigProvider configProvider) {
-        super("custom", name, title, configProvider,
+    public CustomWindow(
+            final String name,
+            final String title,
+            final AggregateConfigProvider configProvider,
+            final URLBuilder urlBuilder) {
+        super("custom", name, title, configProvider, urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 

src/com/dmdirc/FrameContainer.java

@@ -42,11 +42,9 @@ import com.dmdirc.util.collections.ListenerList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -99,8 +97,8 @@ public abstract class FrameContainer {
     /** Object used to synchronise styliser access. */
     private final Object documentSync = new Object();
 
-    /** Previously-constructed iconmanagers. */
-    private final Map<URLBuilder, IconManager> iconManagers = new HashMap<>();
+    /** The icon manager to use for this container. */
+    private final IconManager iconManager;
 
     /**
      * Instantiate new frame container.
@@ -109,17 +107,22 @@ public abstract class FrameContainer {
      * @param name The name of this container
      * @param title The title of this container
      * @param config The config manager for this container
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param components The UI components that this frame requires
      * @since 0.6.4
      */
     protected FrameContainer(
-            final String icon, final String name,
-            final String title, final AggregateConfigProvider config,
+            final String icon,
+            final String name,
+            final String title,
+            final AggregateConfigProvider config,
+            final URLBuilder urlBuilder,
             final Collection<String> components) {
         this.configManager = config;
         this.name = name;
         this.title = title;
         this.components = new HashSet<>(components);
+        this.iconManager = new IconManager(configManager, urlBuilder);
 
         setIcon(icon);
     }
@@ -220,11 +223,9 @@ public abstract class FrameContainer {
      * Gets an icon manager for this container.
      *
      * @return An icon manager for this container.
-     * @deprecated Use {@link #getIconManager(com.dmdirc.util.URLBuilder)}.
      */
-    @Deprecated
     public IconManager getIconManager() {
-        return getIconManager(URLBuilder.getInstance());
+        return iconManager;
     }
 
     /**
@@ -232,12 +233,11 @@ public abstract class FrameContainer {
      *
      * @param urlBuilder The builder to use to construct icon URLs.
      * @return An icon manager for this container.
+     * @deprecated Don't bother passing in a URL builder. That was a bad idea.
      */
+    @Deprecated
     public IconManager getIconManager(final URLBuilder urlBuilder) {
-        if (!iconManagers.containsKey(urlBuilder)) {
-            iconManagers.put(urlBuilder, new IconManager(getConfigManager(), urlBuilder));
-        }
-        return iconManagers.get(urlBuilder);
+        return iconManager;
     }
 
     /**

src/com/dmdirc/GlobalWindow.java

@@ -35,6 +35,7 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 
@@ -57,13 +58,15 @@ public class GlobalWindow extends WritableFrameContainer {
      * @param parser The command parser to use to parse input.
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public GlobalWindow(
             final AggregateConfigProvider config,
             final CommandParser parser,
             final TabCompleterFactory tabCompleterFactory,
-            final MessageSinkManager messageSinkManager) {
-        super("icon", "Global", "(Global)", config, parser, messageSinkManager,
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
+        super("icon", "Global", "(Global)", config, parser, messageSinkManager, urlBuilder,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
@@ -107,6 +110,8 @@ public class GlobalWindow extends WritableFrameContainer {
         private final Provider<MessageSinkManager> messageSinkManagerProvider;
         /** The provider to use to retrieve a global command parser. */
         private final Provider<GlobalCommandParser> globalCommandParserProvider;
+        /** The URL builder to use when finding icons. */
+        private final URLBuilder urlBuilder;
 
         /** The global window that's in use, if any. */
         private GlobalWindow globalWindow;
@@ -119,6 +124,7 @@ public class GlobalWindow extends WritableFrameContainer {
          * @param windowManagerProvider The provider to use to retrieve a window manager.
          * @param messageSinkManagerProvider The provider to use to retrieve a sink manager.
          * @param globalCommandParserProvider The provider to use to retrieve a global command parser.
+         * @param urlBuilder The URL builder to use when finding icons.
          */
         @Inject
         public GlobalWindowManager(
@@ -126,12 +132,14 @@ public class GlobalWindow extends WritableFrameContainer {
                 final TabCompleterFactory tabCompleterFactory,
                 final Provider<WindowManager> windowManagerProvider,
                 final Provider<MessageSinkManager> messageSinkManagerProvider,
-                final Provider<GlobalCommandParser> globalCommandParserProvider) {
+                final Provider<GlobalCommandParser> globalCommandParserProvider,
+                final URLBuilder urlBuilder) {
             this.globalConfig = globalConfig;
             this.tabCompleterFactory = tabCompleterFactory;
             this.windowManagerProvider = windowManagerProvider;
             this.messageSinkManagerProvider = messageSinkManagerProvider;
             this.globalCommandParserProvider = globalCommandParserProvider;
+            this.urlBuilder = urlBuilder;
         }
 
         /** {@inheritDoc} */
@@ -159,7 +167,8 @@ public class GlobalWindow extends WritableFrameContainer {
                         globalWindow = new GlobalWindow(globalConfig,
                                 globalCommandParserProvider.get(),
                                 tabCompleterFactory,
-                                messageSinkManagerProvider.get());
+                                messageSinkManagerProvider.get(),
+                                urlBuilder);
                         addCloseListener(globalWindow);
                         windowManagerProvider.get().addWindow(globalWindow);
                     }

src/com/dmdirc/MessageTarget.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Collection;
 
@@ -43,14 +44,20 @@ public abstract class MessageTarget extends WritableFrameContainer {
      * @param config The config manager to use for this target
      * @param parser The command parser for this container
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param components The UI components that this frame requires
      * @since 0.6.4
      */
-    public MessageTarget(final String icon, final String name,
-            final String title, final AggregateConfigProvider config,
-            final CommandParser parser, final MessageSinkManager messageSinkManager,
+    public MessageTarget(
+            final String icon,
+            final String name,
+            final String title,
+            final AggregateConfigProvider config,
+            final CommandParser parser,
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder,
             final Collection<String> components) {
-        super(icon, name, title, config, parser, messageSinkManager, components);
+        super(icon, name, title, config, parser, messageSinkManager, urlBuilder, components);
     }
 
     /**

src/com/dmdirc/Query.java

@@ -44,6 +44,7 @@ import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
@@ -82,17 +83,20 @@ public class Query extends MessageTarget implements PrivateActionListener,
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param commandController The controller to load commands from.
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public Query(
             @Unbound final Server newServer,
             @Unbound final String newHost,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
         super("query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(), new QueryCommandParser(newServer, commandController),
                 messageSinkManager,
+                urlBuilder,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

src/com/dmdirc/Raw.java

@@ -34,6 +34,7 @@ import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
@@ -57,14 +58,17 @@ public class Raw extends WritableFrameContainer
      * @param newServer the server to monitor
      * @param commandController The controller to load commands from.
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public Raw(
             @Unbound final Server newServer,
             final CommandController commandController,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
         super("raw", "Raw", "(Raw log)", newServer.getConfigManager(),
                 new ServerCommandParser(newServer.getConfigManager(), commandController),
                 messageSinkManager,
+                urlBuilder,
                 Arrays.asList(
                     WindowComponent.TEXTAREA.getIdentifier(),
                     WindowComponent.INPUTFIELD.getIdentifier()));

src/com/dmdirc/Server.java

@@ -60,6 +60,7 @@ import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Formatter;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
@@ -86,6 +87,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import javax.net.ssl.TrustManager;
 
 import org.slf4j.LoggerFactory;
+
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -222,6 +224,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
      * @param channelFactory The factory to use to create channels.
      * @param queryFactory The factory to use to create queries.
      * @param rawFactory The factory to use to create raw windows.
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param userSettings The config provider to write user settings to.
      * @param uri The address of the server to connect to
      * @param profile The profile to use
@@ -239,6 +242,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             final ChannelFactory channelFactory,
             final QueryFactory queryFactory,
             final RawFactory rawFactory,
+            final URLBuilder urlBuilder,
             @SuppressWarnings("qualifiers") @UserConfig final ConfigProvider userSettings,
             @Unbound final URI uri,
             @Unbound final ConfigProvider profile) {
@@ -248,6 +252,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 configMigrator.getConfigProvider(),
                 commandParser,
                 messageSinkManager,
+                urlBuilder,
                 Arrays.asList(
                     WindowComponent.TEXTAREA.getIdentifier(),
                     WindowComponent.INPUTFIELD.getIdentifier(),

src/com/dmdirc/WritableFrameContainer.java

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -63,6 +64,7 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * @param config The config manager for this container
      * @param parser The command parser for this container
      * @param messageSinkManager The sink manager to use to despatch messages
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param components The UI components that this frame requires
      * @since 0.6.4
      */
@@ -73,8 +75,9 @@ public abstract class WritableFrameContainer extends FrameContainer {
             final AggregateConfigProvider config,
             final CommandParser parser,
             final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder,
             final Collection<String> components) {
-        super(icon, name, title, config, components);
+        super(icon, name, title, config, urlBuilder, components);
 
         this.commandParser = parser;
         this.messageSinkManager = messageSinkManager;

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.util.URLBuilder;
 
 import javax.inject.Inject;
 
@@ -53,6 +54,8 @@ public class OpenWindow extends Command implements IntelligentCommand {
 
     /** Window management. */
     private final WindowManager windowManager;
+    /** The URL builder to use when finding icons. */
+    private final URLBuilder urlBuilder;
 
     /** The config provider to retrieve settings from. */
     private final AggregateConfigProvider configProvider;
@@ -62,16 +65,19 @@ public class OpenWindow extends Command implements IntelligentCommand {
      *
      * @param controller The controller to use for command information.
      * @param windowManager Window management
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param configProvider The config provider to retrieve settings from.
      */
     @Inject
     public OpenWindow(
             final CommandController controller,
             final WindowManager windowManager,
+            final URLBuilder urlBuilder,
             @GlobalConfig final AggregateConfigProvider configProvider) {
         super(controller);
 
         this.windowManager = windowManager;
+        this.urlBuilder = urlBuilder;
         this.configProvider = configProvider;
     }
 
@@ -114,10 +120,12 @@ public class OpenWindow extends Command implements IntelligentCommand {
             if (window == null) {
                 CustomWindow newWindow;
                 if (parent == null) {
-                    newWindow = new CustomWindow(args.getArguments()[start], title, configProvider);
+                    newWindow = new CustomWindow(args.getArguments()[start], title,
+                            configProvider, urlBuilder);
                     windowManager.addWindow(newWindow);
                 } else {
-                    newWindow = new CustomWindow(args.getArguments()[start], title, parent);
+                    newWindow = new CustomWindow(args.getArguments()[start], title, parent,
+                            urlBuilder);
                     windowManager.addWindow(parent, newWindow);
                 }
             } else {

src/com/dmdirc/messages/CustomWindowMessageSink.java

@@ -27,6 +27,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -41,14 +42,20 @@ public class CustomWindowMessageSink implements MessageSink {
     private static final Pattern PATTERN = Pattern.compile("window:(.*)");
     /** Window management. */
     private final WindowManager windowManager;
+    /** The URL builder to use when finding icons. */
+    private final URLBuilder urlBuilder;
 
     /**
      * Creates a new custom window message sink.
      *
      * @param windowManager Window management
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public CustomWindowMessageSink(final WindowManager windowManager) {
+    public CustomWindowMessageSink(
+            final WindowManager windowManager,
+            final URLBuilder urlBuilder) {
         this.windowManager = windowManager;
+        this.urlBuilder = urlBuilder;
     }
 
     /** {@inheritDoc} */
@@ -67,8 +74,8 @@ public class CustomWindowMessageSink implements MessageSink {
                 .findCustomWindow((Server) source.getConnection(), patternMatches[0]);
 
         if (targetWindow == null) {
-            targetWindow = new CustomWindow(patternMatches[0],
-                    patternMatches[0], (Server) source.getConnection());
+            targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
+                    (Server) source.getConnection(), urlBuilder);
             windowManager.addWindow((Server) source.getConnection(), targetWindow);
         }
 

src/com/dmdirc/messages/MessageSinkManager.java

@@ -27,6 +27,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -127,14 +128,16 @@ public class MessageSinkManager {
      *
      * @param statusBarManager The status bar manager to give to status-bar related sinks.
      * @param windowManager The window manager to give to sinks that iterate windows.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public void loadDefaultSinks(
             final StatusBarManager statusBarManager,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final URLBuilder urlBuilder) {
         addSink(new AllMessageSink());
         addSink(new ChannelMessageSink());
         addSink(new CommonChanelsMessageSink());
-        addSink(new CustomWindowMessageSink(windowManager));
+        addSink(new CustomWindowMessageSink(windowManager, urlBuilder));
         addSink(new ForkMessageSink());
         addSink(new FormatMessageSink());
         addSink(new GroupMessageSink());

test/com/dmdirc/ServerTest.java

@@ -31,6 +31,7 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
 
 import java.net.URI;
 
@@ -60,6 +61,7 @@ public class ServerTest {
     @Mock private QueryFactory queryFactory;
     @Mock private RawFactory rawFactory;
     @Mock private StatusBarManager statusBarManager;
+    @Mock private URLBuilder urlBuilder;
 
     private Server server;
 
@@ -82,6 +84,7 @@ public class ServerTest {
                 channelFactory,
                 queryFactory,
                 rawFactory,
+                urlBuilder,
                 userConfig,
                 new URI("irc-test://255.255.255.255"),
                 profile);

test/com/dmdirc/WritableFrameContainerTest.java

@@ -27,6 +27,7 @@ import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 
@@ -43,6 +44,7 @@ public class WritableFrameContainerTest {
     @Mock private AggregateConfigProvider acp;
     @Mock private ServerManager serverManager;
     @Mock private MessageSinkManager messageSinkManager;
+    @Mock private URLBuilder urlBuilder;
     private CommandManager commands;
 
     @Before
@@ -59,7 +61,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testGetNumLines() {
         final WritableFrameContainer container10
-                = new TestWritableFrameContainer(10, acp, commands, messageSinkManager);
+                = new TestWritableFrameContainer(10, acp, commands, messageSinkManager, urlBuilder);
 
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -89,7 +91,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testSplitLine() {
         final WritableFrameContainer container10
-                = new TestWritableFrameContainer(10, acp, commands, messageSinkManager);
+                = new TestWritableFrameContainer(10, acp, commands, messageSinkManager, urlBuilder);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -30,6 +30,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Collections;
 
@@ -41,9 +42,9 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
 
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager, final URLBuilder urlBuilder) {
         super("raw", "Raw", "(Raw)", cm,
-                new GlobalCommandParser(cm, commandManager), messageSinkManager,
+                new GlobalCommandParser(cm, commandManager), messageSinkManager, urlBuilder,
                 Collections.<String>emptySet());
 
         this.lineLength = lineLength;