Remove urlBuilder params.

From everywhere.

src/com/dmdirc/Channel.java

@@ -49,7 +49,6 @@ import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.RollingList;
 import com.dmdirc.util.colours.Colour;
 import com.dmdirc.util.colours.ColourUtils;
@@ -112,7 +111,6 @@ public class Channel extends FrameContainer implements GroupChat {
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager) {
@@ -120,7 +118,6 @@ public class Channel extends FrameContainer implements GroupChat {
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                urlBuilder,
                 new ChannelCommandParser(connection.getWindowModel(), commandController, eventBus),
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,

src/com/dmdirc/ChannelFactory.java

@@ -28,10 +28,9 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -45,7 +44,6 @@ public class ChannelFactory {
     private final TabCompleterFactory tabCompleterFactory;
     private final CommandController commandController;
     private final MessageSinkManager messageSinkManager;
-    private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
     private final BackBufferFactory backBufferFactory;
     private final GroupChatUserManager groupChatUserManager;
@@ -54,13 +52,11 @@ public class ChannelFactory {
     @Inject
     public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final DMDircMBassador eventBus,
-            final BackBufferFactory backBufferFactory,
+            final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager, final WindowManager windowManager) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
-        this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
         this.groupChatUserManager = groupChatUserManager;
@@ -71,7 +67,7 @@ public class ChannelFactory {
             final ChannelInfo channelInfo,
             final ConfigProviderMigrator configMigrator) {
         final Channel channel = new Channel(connection, channelInfo, configMigrator,
-                tabCompleterFactory, commandController, messageSinkManager, urlBuilder, eventBus,
+                tabCompleterFactory, commandController, messageSinkManager, eventBus,
                 backBufferFactory, groupChatUserManager);
         windowManager.addWindow(connection.getWindowModel(), channel);
         connection.getWindowModel().getEventBus().publish(new ChannelOpenedEvent(channel));

src/com/dmdirc/CustomWindow.java

@@ -24,9 +24,8 @@ package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.util.URLBuilder;
+import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -43,10 +42,9 @@ public class CustomWindow extends FrameContainer {
             final String name,
             final String title,
             final FrameContainer parent,
-            final URLBuilder urlBuilder,
             final BackBufferFactory backBufferFactory) {
         super(parent, "custom", name, title, parent.getConfigManager(), backBufferFactory,
-                urlBuilder, parent.getEventBus(),
+                parent.getEventBus(),
                 Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
         initBackBuffer();
     }
@@ -58,10 +56,9 @@ public class CustomWindow extends FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider configProvider,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        super(null, "custom", name, title, configProvider, backBufferFactory, urlBuilder,
+        super(null, "custom", name, title, configProvider, backBufferFactory,
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
         initBackBuffer();
     }

src/com/dmdirc/FrameContainer.java

@@ -42,7 +42,6 @@ import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.UnreadStatusManager;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.ChildEventBusManager;
-import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.util.ArrayList;
@@ -125,7 +124,6 @@ public abstract class FrameContainer {
             final String title,
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
         this.parent = Optional.ofNullable(parent);
@@ -159,7 +157,6 @@ public abstract class FrameContainer {
             final String title,
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory,
-            final URLBuilder urlBuilder,
             final CommandParser commandParser,
             final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,

src/com/dmdirc/GlobalWindow.java

@@ -30,11 +30,10 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -55,9 +54,9 @@ public class GlobalWindow extends FrameContainer {
     @Inject
     public GlobalWindow(@GlobalConfig final AggregateConfigProvider config,
             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
-            final MessageSinkManager messageSinkManager, final URLBuilder urlBuilder,
+            final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory) {
-        super(null, "icon", "Global", "(Global)", config, backBufferFactory, urlBuilder, parser,
+        super(null, "icon", "Global", "(Global)", config, backBufferFactory, parser,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),

src/com/dmdirc/Query.java

@@ -52,7 +52,6 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.EventUtils;
-import com.dmdirc.util.URLBuilder;
 
 import java.awt.Toolkit;
 import java.util.Arrays;
@@ -80,14 +79,12 @@ public class Query extends FrameContainer implements PrivateActionListener,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder,
             final BackBufferFactory backBufferFactory) {
         super(connection.getWindowModel(), "query",
                 user.getNickname(),
                 user.getNickname(),
                 connection.getWindowModel().getConfigManager(),
                 backBufferFactory,
-                urlBuilder,
                 new QueryCommandParser(connection.getWindowModel(), commandController,
                         connection.getWindowModel().getEventBus()),
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),

src/com/dmdirc/QueryFactory.java

@@ -27,10 +27,9 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -44,26 +43,23 @@ public class QueryFactory {
     private final TabCompleterFactory tabCompleterFactory;
     private final CommandController commandController;
     private final MessageSinkManager messageSinkManager;
-    private final URLBuilder urlBuilder;
     private final BackBufferFactory backBufferFactory;
     private final WindowManager windowManager;
 
     @Inject
     public QueryFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final BackBufferFactory backBufferFactory,
-            final WindowManager windowManager) {
+            final BackBufferFactory backBufferFactory, final WindowManager windowManager) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
-        this.urlBuilder = urlBuilder;
         this.backBufferFactory = backBufferFactory;
         this.windowManager = windowManager;
     }
 
     public Query getQuery(final Connection connection, final User user) {
         final Query query = new Query(connection, user, tabCompleterFactory, commandController,
-                messageSinkManager, urlBuilder, backBufferFactory);
+                messageSinkManager, backBufferFactory);
         windowManager.addWindow(connection.getWindowModel(), query);
         connection.getWindowModel().getEventBus().publish(new QueryOpenedEvent(query));
         return query;

src/com/dmdirc/Server.java

@@ -57,7 +57,6 @@ import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.HighlightManager;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.net.NoRouteToHostException;
 import java.net.SocketException;
@@ -182,7 +181,6 @@ public class Server extends FrameContainer implements Connection {
             final IdentityFactory identityFactory,
             final MessageSinkManager messageSinkManager,
             final QueryFactory queryFactory,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             final ConfigProvider userSettings,
@@ -197,7 +195,6 @@ public class Server extends FrameContainer implements Connection {
                 getHost(uri),
                 configMigrator.getConfigProvider(),
                 backBufferFactory,
-                urlBuilder,
                 commandParser,
                 tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),
                         CommandType.TYPE_SERVER, CommandType.TYPE_GLOBAL),

src/com/dmdirc/ServerFactoryImpl.java

@@ -30,7 +30,6 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.net.URI;
 import java.util.concurrent.ScheduledExecutorService;
@@ -50,7 +49,6 @@ public class ServerFactoryImpl {
     private final IdentityFactory identityFactory;
     private final MessageSinkManager messageSinkManager;
     private final Provider<QueryFactory> queryFactory;
-    private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
     private final MessageEncoderFactory messageEncoderFactory;
     private final ConfigProvider userSettings;
@@ -65,7 +63,6 @@ public class ServerFactoryImpl {
             final IdentityFactory identityFactory,
             final MessageSinkManager messageSinkManager,
             final Provider<QueryFactory> queryFactory,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             @ClientModule.UserConfig final ConfigProvider userSettings,
@@ -77,7 +74,6 @@ public class ServerFactoryImpl {
         this.identityFactory = identityFactory;
         this.messageSinkManager = messageSinkManager;
         this.queryFactory = queryFactory;
-        this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.messageEncoderFactory = messageEncoderFactory;
         this.userSettings = userSettings;
@@ -94,8 +90,8 @@ public class ServerFactoryImpl {
             final Profile profile) {
         return new Server(configMigrator, commandParser, parserFactory,
                 tabCompleterFactory, identityFactory, messageSinkManager,
-                queryFactory.get(), urlBuilder, eventBus,
-                messageEncoderFactory, userSettings, groupChatManagerFactory, executorService,
-                uri, profile, backBufferFactory, userManager);
+                queryFactory.get(), eventBus, messageEncoderFactory, userSettings,
+                groupChatManagerFactory, executorService, uri, profile, backBufferFactory,
+                userManager);
     }
 }

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

@@ -37,9 +37,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.util.URLBuilder;
+import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.util.Optional;
 
@@ -58,8 +57,6 @@ public class OpenWindow extends Command implements IntelligentCommand {
             CommandType.TYPE_GLOBAL);
     /** Window management. */
     private final WindowManager windowManager;
-    /** The URL builder to use when finding icons. */
-    private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
     /** The config provider to retrieve settings from. */
@@ -74,14 +71,12 @@ public class OpenWindow extends Command implements IntelligentCommand {
     public OpenWindow(
             final CommandController controller,
             final WindowManager windowManager,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             @GlobalConfig final AggregateConfigProvider configProvider,
             final BackBufferFactory backBufferFactory) {
         super(controller);
 
         this.windowManager = windowManager;
-        this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.configProvider = configProvider;
         this.backBufferFactory = backBufferFactory;
@@ -127,11 +122,11 @@ public class OpenWindow extends Command implements IntelligentCommand {
                 final CustomWindow newWindow;
                 if (parent == null) {
                     newWindow = new CustomWindow(args.getArguments()[start], title,
-                            configProvider, urlBuilder, eventBus, backBufferFactory);
+                            configProvider, eventBus, backBufferFactory);
                     windowManager.addWindow(newWindow);
                 } else {
                     newWindow = new CustomWindow(args.getArguments()[start], title, parent,
-                            urlBuilder, backBufferFactory);
+                            backBufferFactory);
                     windowManager.addWindow(parent, newWindow);
                 }
             } else {

src/com/dmdirc/ui/messages/sink/CustomWindowMessageSink.java

@@ -26,7 +26,6 @@ import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.util.URLBuilder;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -42,8 +41,6 @@ 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;
     /** Back buffer Factory. */
     private final BackBufferFactory backBufferFactory;
 
@@ -53,10 +50,8 @@ public class CustomWindowMessageSink implements MessageSink {
     @Inject
     public CustomWindowMessageSink(
             final WindowManager windowManager,
-            final URLBuilder urlBuilder,
             final BackBufferFactory backBufferFactory) {
         this.windowManager = windowManager;
-        this.urlBuilder = urlBuilder;
         this.backBufferFactory = backBufferFactory;
     }
 
@@ -77,7 +72,7 @@ public class CustomWindowMessageSink implements MessageSink {
 
         if (targetWindow == null) {
             targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
-                    connectionContainer, urlBuilder, backBufferFactory);
+                    connectionContainer, backBufferFactory);
             windowManager.addWindow(connectionContainer, targetWindow);
         }
 

test/com/dmdirc/WritableFrameContainerTest.java

@@ -29,7 +29,6 @@ import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 
@@ -50,7 +49,6 @@ public class WritableFrameContainerTest {
     @Mock private ConfigBinder configBinder;
     @Mock private ConnectionManager connectionManager;
     @Mock private MessageSinkManager messageSinkManager;
-    @Mock private URLBuilder urlBuilder;
     @Mock private DMDircMBassador eventBus;
     @Mock private BackBufferFactory backBufferFactory;
     @Mock private Provider<GlobalWindow> globalWindowProvider;
@@ -68,7 +66,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testGetNumLines() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, urlBuilder, eventBus, backBufferFactory);
+                messageSinkManager, eventBus, backBufferFactory);
 
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -98,7 +96,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testSplitLine() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, urlBuilder, eventBus, backBufferFactory);
+                messageSinkManager, eventBus, backBufferFactory);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -29,10 +29,9 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -46,9 +45,9 @@ public class TestWritableFrameContainer extends FrameContainer {
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final DMDircMBassador eventBus,
+            final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        super(null, "raw", "Raw", "(Raw)", cm, backBufferFactory, urlBuilder,
+        super(null, "raw", "Raw", "(Raw)", cm, backBufferFactory,
                 new GlobalCommandParser(cm, commandManager, eventBus),
                 new TabCompleter(mock(CommandController.class), cm),
                 messageSinkManager,