Plugin support for FrameContainer changes.

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

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

@@ -30,6 +30,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 
@@ -56,17 +57,23 @@ 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 despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public ChatContainer(final DCCChat dcc,
+    public ChatContainer(
+            final DCCChat dcc,
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final String title, final String nick, final String targetNick,
+            final String title,
+            final String nick,
+            final String targetNick,
             final TabCompleterFactory tabCompleterFactory,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
         super(title, "dcc-chat-inactive", configManager,
                 new DCCCommandParser(configManager, commandController),
                 messageSinkManager,
                 tabCompleterFactory,
+                urlBuilder,
                 Arrays.asList(
                     WindowComponent.TEXTAREA.getIdentifier(),
                     WindowComponent.INPUTFIELD.getIdentifier()));

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

@@ -47,6 +47,7 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
+import com.dmdirc.util.URLBuilder;
 
 import java.io.File;
 import java.util.concurrent.Callable;
@@ -75,6 +76,8 @@ 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;
 
     /**
      * Creates a new instance of DCCCommand.
@@ -85,6 +88,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
      * @param tabCompleterFactory The factory to use for tab completers.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     @Inject
     public DCCCommand(
@@ -93,13 +97,15 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final DCCManager plugin,
             final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
-            final TabCompleterFactory tabCompleterFactory) {
+            final TabCompleterFactory tabCompleterFactory,
+            final URLBuilder urlBuilder) {
         super(controller);
         this.mainFrame = mainFrame;
         myPlugin = plugin;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
         this.tabCompleterFactory = tabCompleterFactory;
+        this.urlBuilder = urlBuilder;
     }
 
     /** {@inheritDoc} */
@@ -167,7 +173,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         if (myPlugin.listen(chat)) {
             final ChatContainer window = new ChatContainer(chat, origin.getConfigManager(),
                     getController(), "*Chat: " + target, myNickname, target, tabCompleterFactory,
-                    messageSinkManager);
+                    messageSinkManager, urlBuilder);
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
@@ -246,7 +252,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     final Parser parser = connection.getParser();
                     final TransferContainer container = new TransferContainer(myPlugin, send,
                             origin.getConfigManager(), "Send: " + target,
-                            target, connection);
+                            target, connection, urlBuilder);
                     windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + selectedFile.getName() + "\" "
@@ -259,7 +265,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     if (myPlugin.listen(send)) {
                         final TransferContainer container = new TransferContainer(myPlugin, send,
                                 origin.getConfigManager(), "*Send: "
-                                + target, target, connection);
+                                + target, target, connection, urlBuilder);
                         windowManager.addWindow(myPlugin.getContainer(), container);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + selectedFile.getName() + "\" "

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

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Collection;
 
@@ -52,15 +53,20 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
      * @param parser Command parser to use for this window
      * @param messageSinkManager The sink manager to use to despatch messages.
      * @param tabCompleterFactory The factory to use to create tab completers.
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param components The UI components that this frame requires
      */
     public DCCFrameContainer(
-            final String title, final String icon,
-            final AggregateConfigProvider configManager, final CommandParser parser,
+            final String title,
+            final String icon,
+            final AggregateConfigProvider configManager,
+            final CommandParser parser,
             final MessageSinkManager messageSinkManager,
             final TabCompleterFactory tabCompleterFactory,
+            final URLBuilder urlBuilder,
             final Collection<String> components) {
-        super(icon, title, title, configManager, parser, messageSinkManager, components);
+        super(icon, title, title, configManager, parser, messageSinkManager, urlBuilder,
+                components);
         this.tabCompleterFactory = tabCompleterFactory;
     }
 

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

@@ -57,6 +57,7 @@ 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.util.URLBuilder;
 
 import java.io.File;
 import java.io.IOException;
@@ -94,6 +95,8 @@ public class DCCManager implements ActionListener {
     private final MainFrame mainFrame;
     /** The configuration domain to use. */
     private final String domain;
+    /** The URL builder to use when finding icons. */
+    private final URLBuilder urlBuilder;
 
     /**
      * Creates a new instance of this plugin.
@@ -108,6 +111,7 @@ public class DCCManager implements ActionListener {
      * @param tabCompleterFactory The factory to use for tab completers.
      * @param windowFactory The window factory to register the DCC implementations with.
      * @param componentFrameFactory Factory to use to create new component frames for DCC windows.
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param baseDirectory The directory to create a downloads directory within.
      */
     @Inject
@@ -122,6 +126,7 @@ public class DCCManager implements ActionListener {
             final TabCompleterFactory tabCompleterFactory,
             final SwingWindowFactory windowFactory,
             final ComponentFrameFactory componentFrameFactory,
+            final URLBuilder urlBuilder,
             @Directory(DirectoryType.BASE) final String baseDirectory) {
         this.mainFrame = mainFrame;
         this.messageSinkManager = messageSinkManager;
@@ -131,6 +136,7 @@ public class DCCManager implements ActionListener {
         this.domain = pluginInfo.getDomain();
         this.config = globalConfig;
         this.pluginInfo = pluginInfo;
+        this.urlBuilder = urlBuilder;
 
         windowFactory.registerImplementation(
                 new HashSet<>(Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
@@ -224,7 +230,7 @@ public class DCCManager implements ActionListener {
                 final boolean resume = handleResume(jc);
                 if (reverse && !token.isEmpty()) {
                     TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, "*Receive: " + nickname, nickname, null);
+                            config, "*Receive: " + nickname, nickname, null, urlBuilder);
                     windowManager.addWindow(getContainer(), container);
                     send.setToken(token);
                     if (resume) {
@@ -250,7 +256,7 @@ public class DCCManager implements ActionListener {
                     }
                 } else {
                     TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, "Receive: " + nickname, nickname, null);
+                            config, "Receive: " + nickname, nickname, null, urlBuilder);
                     windowManager.addWindow(getContainer(), container);
                     if (resume) {
                         parser.sendCTCP(nickname, "DCC", "RESUME "
@@ -437,7 +443,7 @@ public class DCCManager implements ActionListener {
                     .getLocalClient().getNickname();
             final DCCFrameContainer f = new ChatContainer(chat, config, commandController,
                     "Chat: " + nickname, myNickname, nickname, tabCompleterFactory,
-                    messageSinkManager);
+                    messageSinkManager, urlBuilder);
             windowManager.addWindow(getContainer(), f);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());
@@ -686,7 +692,7 @@ public class DCCManager implements ActionListener {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, mainFrame);
+        container = new PlaceholderContainer(this, config, mainFrame, urlBuilder);
         windowManager.addWindow(container);
     }
 

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

@@ -27,6 +27,7 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.util.URLBuilder;
 
 import java.awt.Dialog.ModalityType;
 import java.util.Arrays;
@@ -47,13 +48,15 @@ public class PlaceholderContainer extends FrameContainer {
      * @param plugin The plugin which owns this placeholder
      * @param config Config manager
      * @param mainFrame Frame that will own new dialogs.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public PlaceholderContainer(
             final DCCManager plugin,
             final AggregateConfigProvider config,
-            final MainFrame mainFrame) {
-        super("dcc", "DCCs", "DCCs", config, Arrays.asList(
-                "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
+            final MainFrame mainFrame,
+            final URLBuilder urlBuilder) {
+        super("dcc", "DCCs", "DCCs", config, urlBuilder,
+                Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.mainFrame = mainFrame;
     }

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

@@ -32,6 +32,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
+import com.dmdirc.util.URLBuilder;
 
 import java.awt.Desktop;
 import java.io.File;
@@ -90,13 +91,14 @@ public class TransferContainer extends FrameContainer implements
      * @param title The title of this window
      * @param targetNick Nickname of target
      * @param connection The connection that the send was that initiated on
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config, final String title,
-            final String targetNick, final Connection connection) {
+            final String targetNick, final Connection connection, final URLBuilder urlBuilder) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                title, title, config,
+                title, title, config, urlBuilder,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.logging;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 
 import java.util.Arrays;
@@ -40,11 +41,16 @@ public class HistoryWindow extends FrameContainer {
      * @param title The title of the window
      * @param reader The reader to use to get the history
      * @param parent The window this history window was opened from
+     * @param urlBuilder The URL builder to use when finding icons.
      * @param numLines The number of lines to show
      */
-    public HistoryWindow(final String title, final ReverseFileReader reader,
-                         final FrameContainer parent, final int numLines) {
-        super("raw", title, title, parent.getConfigManager(),
+    public HistoryWindow(
+            final String title,
+            final ReverseFileReader reader,
+            final FrameContainer parent,
+            final URLBuilder urlBuilder,
+            final int numLines) {
+        super("raw", title, title, parent.getConfigManager(), urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         final int frameBufferSize = parent.getConfigManager().getOptionInt(

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

@@ -50,6 +50,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.util.io.StreamUtils;
 
@@ -121,6 +122,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
 
     /** Date format used for "File Opened At" log. */
     final DateFormat openedAtFormat = new SimpleDateFormat("EEEE MMMM dd, yyyy - HH:mm:ss");
+    private final URLBuilder urlBuilder;
 
     /**
      * Creates a new instance of this plugin.
@@ -130,15 +132,18 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * @param identityController The Identity Manager that controls the current config
      * @param commandController Command controller to register commands
      * @param windowManager The manager to add history windows to.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public LoggingPlugin(final PluginInfo pluginInfo,
             final ActionController actionController,
             final IdentityController identityController,
             final CommandController commandController,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final URLBuilder urlBuilder) {
         super(commandController);
         this.identityController = identityController;
         this.windowManager = windowManager;
+        this.urlBuilder = urlBuilder;
 
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;
@@ -884,7 +889,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
             return false;
         }
 
-        HistoryWindow window = new HistoryWindow("History", reader, target, historyLines);
+        final HistoryWindow window = new HistoryWindow("History", reader, target, urlBuilder,
+                historyLines);
         windowManager.addWindow(target, window);
 
         return true;

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

@@ -32,6 +32,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -55,15 +56,19 @@ public final class DebugPlugin extends BaseCommandPlugin implements
      * @param actionController The action controller to register listeners with
      * @param commandController Command controller to register commands
      * @param windowManager Window Manager
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public DebugPlugin(final ActionController actionController,
+    public DebugPlugin(
+            final ActionController actionController,
             final CommandController commandController,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final URLBuilder urlBuilder) {
         super(commandController);
 
         this.actionController = actionController;
 
-        registerCommand(new ParserDebugCommand(commandController, this, windowManager), ParserDebugCommand.INFO);
+        registerCommand(new ParserDebugCommand(commandController, this, windowManager, urlBuilder),
+                ParserDebugCommand.INFO);
     }
 
     /** {@inheritDoc} */

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

@@ -28,6 +28,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
 
@@ -50,9 +51,15 @@ public class DebugWindow extends FrameContainer {
      * @param title The title of this window
      * @param parser The parser this plugin is debugging
      * @param server The Server window this is a child of
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public DebugWindow(final DebugPlugin plugin, final String title, final Parser parser, final Server server) {
-        super("raw", "Parser Debug", title, server.getConfigManager(),
+    public DebugWindow(
+            final DebugPlugin plugin,
+            final String title,
+            final Parser parser,
+            final Server server,
+            final URLBuilder urlBuilder) {
+        super("raw", "Parser Debug", title, server.getConfigManager(), urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.plugin = plugin;
         this.parser = parser;

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

@@ -35,6 +35,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.util.URLBuilder;
 
 /**
  * The ParserDebug Command allows controlling of which parsers spam debug info.
@@ -51,6 +52,7 @@ public final class ParserDebugCommand extends Command {
     final DebugPlugin myPlugin;
     /** Window management. */
     private final WindowManager windowManager;
+    private final URLBuilder urlBuilder;
 
     /**
      * Creates a new instance of ParserDebugCommand.
@@ -58,11 +60,17 @@ public final class ParserDebugCommand extends Command {
      * @param controller The controller to use for command information.
      * @param plugin Plugin that owns this command
      * @param windowManager Window management
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public ParserDebugCommand(final CommandController controller, final DebugPlugin plugin, final WindowManager windowManager) {
+    public ParserDebugCommand(
+            final CommandController controller,
+            final DebugPlugin plugin,
+            final WindowManager windowManager,
+            final URLBuilder urlBuilder) {
         super(controller);
         myPlugin = plugin;
         this.windowManager = windowManager;
+        this.urlBuilder = urlBuilder;
     }
 
     /**
@@ -99,7 +107,7 @@ public final class ParserDebugCommand extends Command {
             try {
                 parser.getCallbackManager().addCallback(DebugInfoListener.class, myPlugin);
                 final DebugWindow window = new DebugWindow(myPlugin,
-                        "Parser Debug", parser, (Server) origin.getConnection());
+                        "Parser Debug", parser, (Server) origin.getConnection(), urlBuilder);
                 windowManager.addWindow((Server) origin.getConnection(), window);
                 myPlugin.registeredParsers.put(parser, window);
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");

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

@@ -28,6 +28,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.Formatter;
+import com.dmdirc.util.URLBuilder;
 
 import java.util.Collections;
 import java.util.Date;
@@ -46,13 +47,15 @@ public class FakeWriteableFrameContainer extends WritableFrameContainer {
      *
      * @param target The message target that output gets sent to
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public FakeWriteableFrameContainer(
             final MessageTarget target,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
         super(target.getIcon(), target.getName(), target.getTitle(),
-                target.getConfigManager(), target.getCommandParser(),
-                messageSinkManager, Collections.<String>emptyList());
+                target.getConfigManager(), target.getCommandParser(), messageSinkManager,
+                urlBuilder, Collections.<String>emptyList());
         this.target = target;
     }
 

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

@@ -35,6 +35,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.util.URLBuilder;
 
 /**
  * The redirect command allows the user to redirect the output from another
@@ -51,18 +52,23 @@ public class RedirectCommand extends Command implements IntelligentCommand {
 
     /** The sink manager to use to despatch messages. */
     private final MessageSinkManager messageSinkManager;
+    /** The URL builder to use when finding icons. */
+    private final URLBuilder urlBuilder;
 
     /**
      * Creates a new instance of this command.
      *
      * @param controller The controller to use for command information.
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public RedirectCommand(
             final CommandController controller,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
+        this.urlBuilder = urlBuilder;
     }
 
     /** {@inheritDoc} */
@@ -72,7 +78,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
         final MessageTarget target = ((ChatCommandContext) context)
                 .getChat();
         target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(
-                target, messageSinkManager), args.getArgumentsAsString());
+                target, messageSinkManager, urlBuilder), args.getArgumentsAsString());
     }
 
     /** {@inheritDoc} */

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.redirect;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
+import com.dmdirc.util.URLBuilder;
 
 /**
  * The redirect plugin allows the suer to redirect the output of commands that
@@ -37,12 +38,14 @@ public class RedirectPlugin extends BaseCommandPlugin {
      *
      * @param commandController Command controller to register commands
      * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param urlBuilder The URL builder to use when finding icons.
      */
     public RedirectPlugin(
             final CommandController commandController,
-            final MessageSinkManager messageSinkManager) {
+            final MessageSinkManager messageSinkManager,
+            final URLBuilder urlBuilder) {
         super(commandController);
-        registerCommand(new RedirectCommand(commandController, messageSinkManager),
+        registerCommand(new RedirectCommand(commandController, messageSinkManager, urlBuilder),
                 RedirectCommand.INFO);
     }
 }

src/com/dmdirc/addons/swingdebug/SwingDebugPlugin.java

@@ -108,7 +108,7 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysOut) {
             if (showSysOut.isSelected()) {
                 sysoutFrame = new SystemStreamContainer(SystemStreamType.Out,
-                        controller.getGlobalConfig(), this);
+                        controller.getGlobalConfig(), this, controller.getUrlBuilder());
                 windowManager.addWindow(sysoutFrame);
             } else {
                 sysoutFrame.close();
@@ -118,7 +118,7 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysErr) {
             if (showSysErr.isSelected()) {
                 syserrFrame = new SystemStreamContainer(SystemStreamType.Error,
-                        controller.getGlobalConfig(), this);
+                        controller.getGlobalConfig(), this, controller.getUrlBuilder());
                 windowManager.addWindow(syserrFrame);
             } else {
                 syserrFrame.close();

src/com/dmdirc/addons/swingdebug/SystemStreamContainer.java

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 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.io.IOException;
 import java.util.Arrays;
@@ -46,11 +47,14 @@ public class SystemStreamContainer extends FrameContainer {
      * @param stream Stream to wrap
      * @param config Config to wrap
      * @param plugin Parent plugin
+     * @param urlBuilder The URL builder to use when finding icons.
      */
-    public SystemStreamContainer(final SystemStreamType stream,
+    public SystemStreamContainer(
+            final SystemStreamType stream,
             final AggregateConfigProvider config,
-            final SwingDebugPlugin plugin) {
-        super("dmdirc", stream.toString(), stream.toString(), config,
+            final SwingDebugPlugin plugin,
+            final URLBuilder urlBuilder) {
+        super("dmdirc", stream.toString(), stream.toString(), config, urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.plugin = plugin;
         try {

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.util.URLBuilder;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -56,6 +57,7 @@ public class RedirectCommandTest {
     @Mock private CommandParser commandParser;
     @Mock private MessageSinkManager messageSinkManager;
     @Mock private WindowManager windowManager;
+    @Mock private URLBuilder urlBuilder;
 
     @Before
     public void setup() {
@@ -80,7 +82,8 @@ public class RedirectCommandTest {
 
     @Test
     public void testExecute() {
-        final RedirectCommand command = new RedirectCommand(commandController, messageSinkManager);
+        final RedirectCommand command = new RedirectCommand(commandController, messageSinkManager,
+                urlBuilder);
 
         command.execute(target, new CommandArguments(commandController, "/redirect /echo test"),
                 new ChatCommandContext(frameContainer, RedirectCommand.INFO, target));