Remove urlBuilder params.

dcc/src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -31,12 +31,11 @@ import com.dmdirc.addons.dcc.events.DccChatSocketopenedEvent;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-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.EventUtils;
-import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 
@@ -68,7 +67,6 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param targetNick          Nickname of target
      * @param tabCompleterFactory The factory to use to create tab completers.
      * @param messageSinkManager  The sink manager to use to dispatch messages.
-     * @param urlBuilder          The URL builder to use when finding icons.
      * @param eventBus            The bus to dispatch events on.
      */
     public ChatContainer(
@@ -82,13 +80,11 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final String targetNick,
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus) {
         super(parent, title, "dcc-chat-inactive", configManager, backBufferFactory,
                 new DCCCommandParser(configManager, commandController, eventBus),
                 messageSinkManager,
                 tabCompleterFactory,
-                urlBuilder,
                 eventBus,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),

dcc/src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -50,7 +50,6 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.awt.Window;
 import java.io.File;
@@ -79,8 +78,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
     private final MessageSinkManager messageSinkManager;
     /** The factory to use for tab completers. */
     private final TabCompleterFactory tabCompleterFactory;
-    /** The URL builder to use when finding icons. */
-    private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
     private final BackBufferFactory backBufferFactory;
@@ -96,7 +93,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
         super(controller);
@@ -105,7 +101,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
         this.tabCompleterFactory = tabCompleterFactory;
-        this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
     }
@@ -177,7 +172,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     target,
                     tabCompleterFactory,
                     messageSinkManager,
-                    urlBuilder,
                     eventBus);
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
@@ -246,7 +240,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                 final Parser parser = connection.getParser().get();
                 final TransferContainer container = new TransferContainer(myPlugin, send,
                         origin.getConfigManager(), backBufferFactory, "Send: " + target,
-                        target, connection, urlBuilder, eventBus);
+                        target, connection, eventBus);
                 windowManager.addWindow(myPlugin.getContainer(), container);
                 parser.sendCTCP(target, "DCC", "SEND \""
                         + selectedFile.getName() + "\" "
@@ -259,7 +253,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                 if (myPlugin.listen(send)) {
                     final TransferContainer container = new TransferContainer(myPlugin, send,
                             origin.getConfigManager(), backBufferFactory, "*Send: "
-                            + target, target, connection, urlBuilder, eventBus);
+                            + target, target, connection, eventBus);
                     windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + selectedFile.getName() + "\" "

dcc/src/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -27,10 +27,9 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-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 java.util.Collection;
 import java.util.Optional;
@@ -55,7 +54,6 @@ public abstract class DCCFrameContainer extends FrameContainer {
      * @param parser              Command parser to use for this window
      * @param messageSinkManager  The sink manager to use to dispatch messages.
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param urlBuilder          The URL builder to use when finding icons.
      * @param eventBus            The bus to dispatch events on.
      * @param components          The UI components that this frame requires
      */
@@ -68,10 +66,9 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final CommandParser parser,
             final MessageSinkManager messageSinkManager,
             final TabCompleterFactory tabCompleterFactory,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
-        super(parent, icon, title, title, configManager, backBufferFactory, urlBuilder, parser,
+        super(parent, icon, title, title, configManager, backBufferFactory, parser,
                 tabCompleterFactory.getTabCompleter(configManager),
                 messageSinkManager,
                 eventBus,

dcc/src/com/dmdirc/addons/dcc/DCCManager.java

@@ -50,13 +50,12 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 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 com.google.common.collect.Lists;
@@ -103,8 +102,6 @@ public class DCCManager {
     private final Window mainWindow;
     /** The configuration domain to use. */
     private final String domain;
-    /** The URL builder to use when finding icons. */
-    private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
 
@@ -135,7 +132,6 @@ public class DCCManager {
         this.tabCompleterFactory = tabCompleterFactory;
         this.domain = pluginInfo.getDomain();
         this.config = globalConfig;
-        this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
 
@@ -211,7 +207,7 @@ public class DCCManager {
             if (reverse && !token.isEmpty()) {
                 final TransferContainer container1 = new TransferContainer(this, send,
                         config, backBufferFactory, "*Receive: " + nickname, nickname, null,
-                        urlBuilder, eventBus);
+                        eventBus);
                 windowManager.addWindow(getContainer(), container1);
                 send.setToken(token);
                 if (resume) {
@@ -238,7 +234,7 @@ public class DCCManager {
             } else {
                 final TransferContainer container1 = new TransferContainer(this, send,
                         config, backBufferFactory, "Receive: " + nickname, nickname, null,
-                        urlBuilder, eventBus);
+                        eventBus);
                 windowManager.addWindow(getContainer(), container1);
                 if (resume) {
                     parser.sendCTCP(nickname, "DCC", "RESUME "
@@ -429,7 +425,6 @@ public class DCCManager {
                 nickname,
                 tabCompleterFactory,
                 messageSinkManager,
-                urlBuilder,
                 eventBus);
         windowManager.addWindow(getContainer(), f);
         f.addLine("DCCChatStarting", nickname, chat.getHost(), chat.getPort());
@@ -655,8 +650,7 @@ public class DCCManager {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, backBufferFactory, mainWindow,
-                urlBuilder, eventBus);
+        container = new PlaceholderContainer(this, config, backBufferFactory, mainWindow, eventBus);
         windowManager.addWindow(container);
     }
 

dcc/src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.util.URLBuilder;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
@@ -59,9 +58,8 @@ public class PlaceholderContainer extends FrameContainer {
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory,
             final Window parentWindow,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus) {
-        super(null, "dcc", "DCCs", "DCCs", config, backBufferFactory, urlBuilder, eventBus,
+        super(null, "dcc", "DCCs", "DCCs", config, backBufferFactory, eventBus,
                 Collections.singletonList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.parentWindow = parentWindow;

dcc/src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -35,7 +35,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.util.URLBuilder;
 
 import java.awt.Desktop;
 import java.io.File;
@@ -87,10 +86,10 @@ public class TransferContainer extends FrameContainer implements
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory, final String title,
             final String targetNick, @Nullable final Connection connection,
-            final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(plugin.getContainer(), dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                title, title, config, backBufferFactory, urlBuilder, eventBus,
+                title, title, config, backBufferFactory, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;

debug/src/com/dmdirc/addons/debug/commands/EventBusViewer.java

@@ -37,7 +37,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.URLBuilder;
 
 import java.lang.reflect.Method;
 
@@ -54,7 +53,6 @@ import net.engio.mbassy.listener.References;
  */
 public class EventBusViewer extends DebugCommand {
 
-    private final URLBuilder urlBuilder;
     private final AggregateConfigProvider globalConfig;
     private final WindowManager windowManager;
     private final DMDircMBassador globalEventBus;
@@ -67,13 +65,11 @@ public class EventBusViewer extends DebugCommand {
     public EventBusViewer(
             final Provider<Debug> commandProvider,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final URLBuilder urlBuilder,
             final WindowManager windowManager,
             final DMDircMBassador globalEventBus,
             final BackBufferFactory backBufferFactory) {
         super(commandProvider);
         this.globalConfig = globalConfig;
-        this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.globalEventBus = globalEventBus;
         this.backBufferFactory = backBufferFactory;
@@ -97,12 +93,11 @@ public class EventBusViewer extends DebugCommand {
 
         final CustomWindow window;
         if (isGlobal) {
-            window = new CustomWindow("Event bus", "Event bus", globalConfig, urlBuilder,
+            window = new CustomWindow("Event bus", "Event bus", globalConfig,
                     globalEventBus, backBufferFactory);
             windowManager.addWindow(window);
         } else {
-            window = new CustomWindow("Event bus", "Event bus", origin, urlBuilder,
-                    backBufferFactory);
+            window = new CustomWindow("Event bus", "Event bus", origin, backBufferFactory);
             windowManager.addWindow(origin, window);
         }
 

logging/src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -27,9 +27,8 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.logger.ErrorLevel;
-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 com.dmdirc.util.io.ReverseFileReader;
 
 import java.io.IOException;
@@ -49,12 +48,11 @@ public class HistoryWindow extends FrameContainer {
             final String title,
             final Path logFile,
             final FrameContainer parent,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final int numLines) {
         super(parent, "raw", title, title, parent.getConfigManager(), backBufferFactory,
-                urlBuilder, eventBus,
+                eventBus,
                 Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
 
         initBackBuffer();

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -55,7 +55,6 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.util.io.StreamUtils;
 
@@ -105,7 +104,6 @@ public class LoggingManager implements ConfigChangeListener {
     /** Map of open files. */
     private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(
             new HashMap<>());
-    private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
     private final Provider<String> directoryProvider;
     private final BackBufferFactory backBufferFactory;
@@ -128,14 +126,13 @@ public class LoggingManager implements ConfigChangeListener {
     @Inject
     public LoggingManager(@PluginDomain(LoggingPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final WindowManager windowManager, final URLBuilder urlBuilder, final DMDircMBassador eventBus,
+            final WindowManager windowManager, final DMDircMBassador eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider,
             final BackBufferFactory backBufferFactory,
             final LogFileLocator locator) {
         this.domain = domain;
         this.config = globalConfig;
         this.windowManager = windowManager;
-        this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.directoryProvider = directoryProvider;
         this.backBufferFactory = backBufferFactory;
@@ -587,7 +584,7 @@ public class LoggingManager implements ConfigChangeListener {
             return false;
         }
 
-        windowManager.addWindow(target, new HistoryWindow("History", log, target, urlBuilder,
+        windowManager.addWindow(target, new HistoryWindow("History", log, target,
                 eventBus, backBufferFactory, historyLines));
 
         return true;

parserdebug/src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -27,9 +27,8 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
-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.Arrays;
 import java.util.Optional;
@@ -54,12 +53,11 @@ public class DebugWindow extends FrameContainer {
             final String title,
             final Parser parser,
             final Connection connection,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
         super(connection.getWindowModel(), "raw", "Parser Debug", title,
                 connection.getWindowModel().getConfigManager(), backBufferFactory,
-                urlBuilder, eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+                eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;
         this.parser = parser;
         this.connection = connection;

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugManager.java

@@ -46,8 +46,6 @@ public class ParserDebugManager implements DebugInfoListener {
     private final DMDircMBassador eventBus;
     /** Map of parsers registered. */
     protected final Map<Parser, DebugWindow> registeredParsers;
-    /** URL Builder. */
-    private final URLBuilder urlBuilder;
     /** Window manager. */
     private final WindowManager windowManager;
     private final BackBufferFactory backBufferFactory;
@@ -58,7 +56,6 @@ public class ParserDebugManager implements DebugInfoListener {
             final WindowManager windowManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
@@ -102,7 +99,7 @@ public class ParserDebugManager implements DebugInfoListener {
         try {
             parser.getCallbackManager().addCallback(DebugInfoListener.class, this);
             final DebugWindow window = new DebugWindow(this, "Parser Debug", parser,
-                    connection, urlBuilder, eventBus, backBufferFactory);
+                    connection, eventBus, backBufferFactory);
             windowManager.addWindow(connection.getWindowModel(), window);
             registeredParsers.put(parser, window);
             window.addLine("======================", true);

redirect/src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -28,7 +28,6 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import java.util.Collections;
 import java.util.Date;
@@ -49,10 +48,9 @@ public class FakeWriteableFrameContainer extends FrameContainer {
             final FrameContainer target,
             final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
-            final URLBuilder urlBuilder,
             final BackBufferFactory backBufferFactory) {
         super(target, target.getIcon(), target.getName(), target.getTitle(),
-                target.getConfigManager(), backBufferFactory, urlBuilder,
+                target.getConfigManager(), backBufferFactory,
                 target.getCommandParser(), target.getTabCompleter(), messageSinkManager, eventBus,
                 Collections.<String>emptyList());
         this.target = target;

redirect/src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -33,11 +33,10 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
+import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.util.URLBuilder;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -55,8 +54,6 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             CommandType.TYPE_CHAT);
     /** The sink manager to use to dispatch messages. */
     private final MessageSinkManager messageSinkManager;
-    /** The URL builder to use when finding icons. */
-    private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
     private final BackBufferFactory backBufferFactory;
@@ -70,13 +67,11 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     public RedirectCommand(
             final CommandController controller,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final TabCompleterUtils tabCompleterUtils) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
-        this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
         this.tabCompleterUtils = tabCompleterUtils;
@@ -88,7 +83,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
         final Chat target = ((ChatCommandContext) context).getChat();
         target.getWindowModel().getCommandParser().parseCommand(
                 new FakeWriteableFrameContainer(target.getWindowModel(), messageSinkManager,
-                        eventBus, urlBuilder, backBufferFactory), args.getArgumentsAsString());
+                        eventBus, backBufferFactory), args.getArgumentsAsString());
     }
 
     @Override