Plugin support for core FrameContainer change.

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

@@ -29,13 +29,13 @@ import com.dmdirc.addons.dcc.events.DccChatSelfmessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSocketclosedEvent;
 import com.dmdirc.addons.dcc.events.DccChatSocketopenedEvent;
 import com.dmdirc.addons.dcc.io.DCCChat;
-import com.dmdirc.ui.messages.ColourManagerFactory;
-import com.dmdirc.util.EventUtils;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
+import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
@@ -75,7 +75,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             @Nullable final FrameContainer parent,
             final DCCChat dcc,
             final AggregateConfigProvider configManager,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             final CommandController commandController,
             final String title,
             final String nick,
@@ -84,7 +84,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus) {
-        super(parent, title, "dcc-chat-inactive", configManager, colourManagerFactory,
+        super(parent, title, "dcc-chat-inactive", configManager, backBufferFactory,
                 new DCCCommandParser(configManager, commandController, eventBus),
                 messageSinkManager,
                 tabCompleterFactory,

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

@@ -44,10 +44,10 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
@@ -82,19 +82,10 @@ public class DCCCommand extends Command implements IntelligentCommand {
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
 
     /**
      * Creates a new instance of DCCCommand.
-     *
-     * @param controller          The controller to use for command information.
-     * @param mainWindow          The main client window, to use as a parent for dialogs.
-     * @param plugin              The DCC Plugin that this command belongs to
-     * @param messageSinkManager  The sink manager to use to dispatch messages.
-     * @param windowManager       Window management
-     * @param tabCompleterFactory The factory to use for tab completers.
-     * @param urlBuilder          The URL builder to use when finding icons.
-     * @param eventBus            The bus to dispatch events on.
      */
     @Inject
     public DCCCommand(
@@ -106,7 +97,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final TabCompleterFactory tabCompleterFactory,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(controller);
         this.mainWindow = mainWindow;
         myPlugin = plugin;
@@ -115,7 +106,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         this.tabCompleterFactory = tabCompleterFactory;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     @Override
@@ -178,7 +169,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     myPlugin.getContainer(),
                     chat,
                     origin.getConfigManager(),
-                    colourManagerFactory,
+                    backBufferFactory,
                     getController(),
                     "*Chat: " + target,
                     myNickname,
@@ -253,7 +244,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     myPlugin.getDomain(), "send.reverse")) {
                 final Parser parser = connection.getParser();
                 final TransferContainer container = new TransferContainer(myPlugin, send,
-                        origin.getConfigManager(), colourManagerFactory, "Send: " + target,
+                        origin.getConfigManager(), backBufferFactory, "Send: " + target,
                         target, connection, urlBuilder, eventBus);
                 windowManager.addWindow(myPlugin.getContainer(), container);
                 parser.sendCTCP(target, "DCC", "SEND \""
@@ -266,7 +257,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                 final Parser parser = connection.getParser();
                 if (myPlugin.listen(send)) {
                     final TransferContainer container = new TransferContainer(myPlugin, send,
-                            origin.getConfigManager(), colourManagerFactory, "*Send: "
+                            origin.getConfigManager(), backBufferFactory, "*Send: "
                             + target, target, connection, urlBuilder, eventBus);
                     windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""

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

@@ -27,9 +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.sink.MessageSinkManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleterFactory;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Collection;
@@ -64,14 +64,14 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final String title,
             final String icon,
             final AggregateConfigProvider configManager,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             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, colourManagerFactory, urlBuilder, parser,
+        super(parent, icon, title, title, configManager, backBufferFactory, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(configManager),
                 messageSinkManager,
                 eventBus,

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

@@ -49,6 +49,7 @@ 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.core.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
@@ -85,7 +86,7 @@ import net.engio.mbassy.listener.Handler;
 @Singleton
 public class DCCManager {
 
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
     /** Our DCC Container window. */
     private PlaceholderContainer container;
     /** Config manager to read settings from. */
@@ -109,21 +110,6 @@ public class DCCManager {
 
     /**
      * Creates a new instance of this plugin.
-     *
-     * @param mainWindow            The window that will parent any new dialogs.
-     * @param pluginInfo            This plugin's plugin info
-     * @param identityController    The Identity controller that provides the current config
-     * @param globalConfig          The configuration to read settings from.
-     * @param commandController     Command controller to register commands
-     * @param messageSinkManager    The sink manager to use to dispatch messages.
-     * @param windowManager         Window Management
-     * @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 eventBus              The bus to dispatch events on.
-     * @param commandParser         The command parser to use for DCC windows.
-     * @param baseDirectory         The directory to create a downloads directory within.
      */
     @Inject
     public DCCManager(
@@ -141,7 +127,7 @@ public class DCCManager {
             final DMDircMBassador eventBus,
             final GlobalCommandParser commandParser,
             @Directory(DirectoryType.BASE) final String baseDirectory,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         this.mainWindow = mainWindow;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
@@ -151,7 +137,7 @@ public class DCCManager {
         this.config = globalConfig;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
 
         windowFactory.registerImplementation(
                 new SwingWindowFactory.WindowProvider() {
@@ -225,7 +211,7 @@ public class DCCManager {
             final boolean resume = handleResume(jc);
             if (reverse && !token.isEmpty()) {
                 final TransferContainer container1 = new TransferContainer(DCCManager.this, send,
-                        config, colourManagerFactory, "*Receive: " + nickname, nickname, null,
+                        config, backBufferFactory, "*Receive: " + nickname, nickname, null,
                         urlBuilder, eventBus);
                 windowManager.addWindow(getContainer(), container1);
                 send.setToken(token);
@@ -251,8 +237,8 @@ public class DCCManager {
                     }
                 }
             } else {
-                final TransferContainer container1 = new TransferContainer(DCCManager.this, send,
-                        config, colourManagerFactory, "Receive: " + nickname, nickname, null,
+                final TransferContainer container1 = new TransferContainer(this, send,
+                        config, backBufferFactory, "Receive: " + nickname, nickname, null,
                         urlBuilder, eventBus);
                 windowManager.addWindow(getContainer(), container1);
                 if (resume) {
@@ -317,7 +303,7 @@ public class DCCManager {
                         mainWindow, "This file exists already"
                         + ", do you want to resume an exisiting download?",
                         "Resume Download?", JOptionPane.YES_NO_OPTION);
-                return (result == JOptionPane.YES_OPTION);
+                return result == JOptionPane.YES_OPTION;
             }
         }
         return false;
@@ -437,7 +423,7 @@ public class DCCManager {
                 getContainer(),
                 chat,
                 config,
-                colourManagerFactory,
+                backBufferFactory,
                 commandController,
                 "Chat: " + nickname,
                 myNickname,
@@ -671,7 +657,7 @@ public class DCCManager {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, colourManagerFactory, mainWindow,
+        container = new PlaceholderContainer(this, config, backBufferFactory, mainWindow,
                 urlBuilder, eventBus);
         windowManager.addWindow(container);
     }

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

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

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

@@ -34,7 +34,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.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Desktop;
@@ -79,24 +79,15 @@ public class TransferContainer extends FrameContainer implements
 
     /**
      * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
-     *
-     * @param plugin     the DCC Plugin responsible for this window
-     * @param dcc        The DCCTransfer object this window wraps around
-     * @param config     Config manager
-     * @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.
-     * @param eventBus   The bus to dispatch events on.
      */
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config,
-            final ColourManagerFactory colourManagerFactory, final String title,
+            final BackBufferFactory backBufferFactory, final String title,
             final String targetNick, final Connection connection,
             final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
         super(plugin.getContainer(), dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
-                title, title, config, colourManagerFactory, urlBuilder, eventBus,
+                title, title, config, backBufferFactory, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;

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

@@ -35,7 +35,7 @@ import com.dmdirc.events.DMDircEvent;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
 
@@ -57,16 +57,10 @@ public class EventBusViewer extends DebugCommand {
     private final AggregateConfigProvider globalConfig;
     private final WindowManager windowManager;
     private final DMDircMBassador globalEventBus;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
 
     /**
      * Creates a new instance of the command.
-     *
-     * @param commandProvider The provider to use to access the main debug command.
-     * @param globalConfig    The global configuration to use for new windows.
-     * @param urlBuilder      The URL builder to use in new windows.
-     * @param windowManager   The manager to register new windows with.
-     * @param globalEventBus  The bus to use when the user specifies the --global flag.
      */
     @Inject
     public EventBusViewer(
@@ -75,13 +69,13 @@ public class EventBusViewer extends DebugCommand {
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
             final DMDircMBassador globalEventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(commandProvider);
         this.globalConfig = globalConfig;
         this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.globalEventBus = globalEventBus;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     @Override
@@ -103,11 +97,11 @@ public class EventBusViewer extends DebugCommand {
         final CustomWindow window;
         if (isGlobal) {
             window = new CustomWindow("Event bus", "Event bus", globalConfig, urlBuilder,
-                    globalEventBus, colourManagerFactory);
+                    globalEventBus, backBufferFactory);
             windowManager.addWindow(window);
         } else {
             window = new CustomWindow("Event bus", "Event bus", origin, urlBuilder,
-                    colourManagerFactory);
+                    backBufferFactory);
             windowManager.addWindow(origin, window);
         }
 

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

@@ -27,8 +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.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 
@@ -44,13 +44,6 @@ public class HistoryWindow extends FrameContainer {
 
     /**
      * Creates a new HistoryWindow.
-     *
-     * @param title      The title of the window
-     * @param logFile    The logfile to read and display
-     * @param parent     The window this history window was opened from
-     * @param urlBuilder The URL builder to use when finding icons.
-     * @param eventBus   The bus to dispatch events on.
-     * @param numLines   The number of lines to show
      */
     public HistoryWindow(
             final String title,
@@ -58,9 +51,9 @@ public class HistoryWindow extends FrameContainer {
             final FrameContainer parent,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             final int numLines) {
-        super(parent, "raw", title, title, parent.getConfigManager(), colourManagerFactory,
+        super(parent, "raw", title, title, parent.getConfigManager(), backBufferFactory,
                 urlBuilder, eventBus,
                 Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
 

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

@@ -55,7 +55,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
@@ -110,7 +110,7 @@ public class LoggingManager implements ConfigChangeListener {
     private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
     private final Provider<String> directoryProvider;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
     private final LogFileLocator locator;
     /** Timer used to close idle files. */
     private Timer idleFileTimer;
@@ -132,7 +132,7 @@ public class LoggingManager implements ConfigChangeListener {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager, final URLBuilder urlBuilder, final DMDircMBassador eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             final LogFileLocator locator) {
         this.domain = domain;
         this.config = globalConfig;
@@ -140,7 +140,7 @@ public class LoggingManager implements ConfigChangeListener {
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.directoryProvider = directoryProvider;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
         this.locator = locator;
     }
 
@@ -599,7 +599,7 @@ public class LoggingManager implements ConfigChangeListener {
         }
 
         windowManager.addWindow(target, new HistoryWindow("History", log, target, urlBuilder,
-                eventBus, colourManagerFactory, historyLines));
+                eventBus, backBufferFactory, historyLines));
 
         return true;
     }

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

@@ -27,8 +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.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
@@ -48,13 +48,6 @@ public class DebugWindow extends FrameContainer {
 
     /**
      * Creates a new instance of DebugWindow.
-     *
-     * @param listener   The debug listener for this window
-     * @param title      The title of this window
-     * @param parser     The parser this plugin is debugging
-     * @param connection The connection this window is associated with.
-     * @param urlBuilder The URL builder to use when finding icons.
-     * @param eventBus   The bus to dispatch events on.
      */
     public DebugWindow(
             final DebugInfoListener listener,
@@ -63,9 +56,9 @@ public class DebugWindow extends FrameContainer {
             final Connection connection,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(connection.getWindowModel(), "raw", "Parser Debug", title,
-                connection.getWindowModel().getConfigManager(), colourManagerFactory,
+                connection.getWindowModel().getConfigManager(), backBufferFactory,
                 urlBuilder, eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;
         this.parser = parser;

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

@@ -29,7 +29,7 @@ import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Date;
@@ -50,18 +50,18 @@ public class ParserDebugManager implements DebugInfoListener {
     private final URLBuilder urlBuilder;
     /** Window manager. */
     private final WindowManager windowManager;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
 
     @Inject
     public ParserDebugManager(
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.eventBus = eventBus;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
         registeredParsers = new HashMap<>();
     }
 
@@ -102,7 +102,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, colourManagerFactory);
+                    connection, urlBuilder, eventBus, backBufferFactory);
             windowManager.addWindow(connection.getWindowModel(), window);
             registeredParsers.put(parser, window);
             window.addLine("======================", true);

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

@@ -25,9 +25,9 @@ package com.dmdirc.addons.redirect;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.messages.Formatter;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Collections;
@@ -44,20 +44,15 @@ public class FakeWriteableFrameContainer extends FrameContainer {
 
     /**
      * Creates a new instance of FakeInputWindow.
-     *
-     * @param target             The message target that output gets sent to
-     * @param messageSinkManager The sink manager to use to dispatch messages.
-     * @param eventBus           The bus to dispatch events on.
-     * @param urlBuilder         The URL builder to use when finding icons.
      */
     public FakeWriteableFrameContainer(
             final FrameContainer target,
             final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
             final URLBuilder urlBuilder,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(target, target.getIcon(), target.getName(), target.getTitle(),
-                target.getConfigManager(), colourManagerFactory, urlBuilder,
+                target.getConfigManager(), backBufferFactory, urlBuilder,
                 target.getCommandParser(), target.getTabCompleter(), messageSinkManager, eventBus,
                 Collections.<String>emptyList());
         this.target = target;

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

@@ -32,10 +32,10 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
 import javax.annotation.Nonnull;
@@ -58,17 +58,12 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
     private final DMDircMBassador eventBus;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
     /** Tab-completer utilities. */
     private final TabCompleterUtils tabCompleterUtils;
 
     /**
      * Creates a new instance of this command.
-     *
-     * @param controller         The controller to use for command information.
-     * @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.
      */
     @Inject
     public RedirectCommand(
@@ -76,13 +71,13 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             final TabCompleterUtils tabCompleterUtils) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
         this.tabCompleterUtils = tabCompleterUtils;
     }
 
@@ -91,7 +86,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final FrameContainer target = ((ChatCommandContext) context).getChat();
         target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(
-                target, messageSinkManager, eventBus, urlBuilder, colourManagerFactory),
+                target, messageSinkManager, eventBus, urlBuilder, backBufferFactory),
                 args.getArgumentsAsString());
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.redirect;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
@@ -31,15 +32,13 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterUtils;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
-import com.dmdirc.DMDircMBassador;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -68,7 +67,7 @@ public class RedirectCommandTest {
     @Mock private WindowManager windowManager;
     @Mock private URLBuilder urlBuilder;
     @Mock private DMDircMBassador eventBus;
-    @Mock private ColourManagerFactory colourManagerFactory;
+    @Mock private BackBufferFactory backBufferFactory;
     @Mock private TabCompleterUtils tabCompleterUtils;
 
     @Before
@@ -96,7 +95,7 @@ public class RedirectCommandTest {
     @Test
     public void testExecute() {
         final RedirectCommand command = new RedirectCommand(commandController, messageSinkManager,
-                urlBuilder, eventBus, colourManagerFactory, tabCompleterUtils);
+                urlBuilder, eventBus, backBufferFactory, tabCompleterUtils);
 
         command.execute(target, new CommandArguments(commandController, "/redirect /echo test"),
                 new ChatCommandContext(frameContainer, RedirectCommand.INFO, target));