Give the BackBuffer an EventFormatter.

Urgh.

src/com/dmdirc/Channel.java

@@ -34,15 +34,15 @@ import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
@@ -113,11 +113,11 @@ public class Channel extends MessageTarget implements GroupChat {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(newServer, "channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
-                colourManagerFactory,
+                backBufferFactory,
                 new ChannelCommandParser(newServer, commandController, eventBus),
                 tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,

src/com/dmdirc/ChannelFactory.java

@@ -24,10 +24,10 @@ package com.dmdirc;
 
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.parser.interfaces.ChannelInfo;
+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 javax.inject.Inject;
@@ -44,25 +44,25 @@ public class ChannelFactory {
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
 
     @Inject
     public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder, final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     public Channel getChannel(final Server server,
             final ChannelInfo channelInfo,
             final ConfigProviderMigrator configMigrator) {
         return new Channel(server, channelInfo, configMigrator, tabCompleterFactory,
-                commandController, messageSinkManager, urlBuilder, eventBus, colourManagerFactory);
+                commandController, messageSinkManager, urlBuilder, eventBus, backBufferFactory);
     }
 }

src/com/dmdirc/CustomWindow.java

@@ -24,8 +24,8 @@ package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+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.Collections;
@@ -38,31 +38,20 @@ public class CustomWindow extends FrameContainer {
 
     /**
      * Creates a new custom window as a child of the specified window.
-     *
-     * @param name       The name of this custom window
-     * @param title      The title of this custom window
-     * @param parent     The parent of this custom window
-     * @param urlBuilder The URL builder to use when finding icons.
      */
     public CustomWindow(
             final String name,
             final String title,
             final FrameContainer parent,
             final URLBuilder urlBuilder,
-            final ColourManagerFactory colourManagerFactory) {
-        super(parent, "custom", name, title, parent.getConfigManager(), colourManagerFactory,
+            final BackBufferFactory backBufferFactory) {
+        super(parent, "custom", name, title, parent.getConfigManager(), backBufferFactory,
                 urlBuilder, parent.getEventBus(),
                 Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
     /**
      * Creates a new custom window as a top-level window.
-     *
-     * @param name           The name of this custom window
-     * @param title          The parent of this custom window
-     * @param configProvider The config provider to read settings from.
-     * @param urlBuilder     The URL builder to use when finding icons.
-     * @param eventBus       The bus to dispatch events on.
      */
     public CustomWindow(
             final String name,
@@ -70,8 +59,8 @@ public class CustomWindow extends FrameContainer {
             final AggregateConfigProvider configProvider,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
-        super(null, "custom", name, title, configProvider, colourManagerFactory, urlBuilder,
+            final BackBufferFactory backBufferFactory) {
+        super(null, "custom", name, title, configProvider, backBufferFactory, urlBuilder,
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 

src/com/dmdirc/FrameContainer.java

@@ -35,15 +35,15 @@ import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.ui.core.BackBuffer;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.core.BackBuffer;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.ChildEventBusManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
@@ -98,8 +98,8 @@ public abstract class FrameContainer {
     private final IconManager iconManager;
     /** Whether or not this container is writable. */
     private final boolean writable;
-    /** The colour manager factory. */
-    private final ColourManagerFactory colourManagerFactory;
+    /** The back buffer factory. */
+    private final BackBufferFactory backBufferFactory;
     /** The back buffer for this container. */
     private BackBuffer backBuffer;
     /** Lock for access to {@link #backBuffer}. */
@@ -126,17 +126,6 @@ public abstract class FrameContainer {
 
     /**
      * Instantiate new frame container.
-     *
-     * @param parent     The parent of this frame container, if any.
-     * @param icon       The icon to use for this container
-     * @param name       The name of this container
-     * @param title      The title of this container
-     * @param config     The config manager for this container
-     * @param urlBuilder The URL builder to use when finding icons.
-     * @param eventBus   The bus to dispatch events on.
-     * @param components The UI components that this frame requires
-     *
-     * @since 0.6.4
      */
     protected FrameContainer(
             @Nullable final FrameContainer parent,
@@ -144,7 +133,7 @@ public abstract class FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider config,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
@@ -158,7 +147,7 @@ public abstract class FrameContainer {
         this.commandParser = Optional.empty();
         this.tabCompleter = Optional.empty();
         this.messageSinkManager = Optional.empty();
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
 
         eventBusManager = new ChildEventBusManager(eventBus);
         eventBusManager.connect();
@@ -169,20 +158,6 @@ public abstract class FrameContainer {
 
     /**
      * Instantiate new frame container that accepts user input.
-     *
-     * @param parent             The parent of this frame container, if any.
-     * @param icon               The icon to use for this container
-     * @param name               The name of this container
-     * @param title              The title of this container
-     * @param config             The config manager for this container
-     * @param urlBuilder         The URL builder to use when finding icons.
-     * @param commandParser      The command parser to use for input.
-     * @param tabCompleter       The tab completer to use.
-     * @param messageSinkManager The manager to use to dispatch notifications.
-     * @param eventBus           The bus to dispatch events on.
-     * @param components         The UI components that this frame requires
-     *
-     * @since 0.6.4
      */
     protected FrameContainer(
             @Nullable final FrameContainer parent,
@@ -190,7 +165,7 @@ public abstract class FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider config,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             final URLBuilder urlBuilder,
             final CommandParser commandParser,
             final TabCompleter tabCompleter,
@@ -207,7 +182,7 @@ public abstract class FrameContainer {
         this.commandParser = Optional.of(commandParser);
         this.tabCompleter = Optional.of(tabCompleter);
         this.messageSinkManager = Optional.of(messageSinkManager);
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
         commandParser.setOwner(this);
 
         eventBusManager = new ChildEventBusManager(eventBus);
@@ -426,7 +401,7 @@ public abstract class FrameContainer {
     public BackBuffer getBackBuffer() {
         synchronized (backBufferLock) {
             if (backBuffer == null) {
-                backBuffer = new BackBuffer(this, colourManagerFactory);
+                backBuffer = backBufferFactory.getBackBuffer(this);
                 backBuffer.startAddingEvents();
             }
         }

src/com/dmdirc/GlobalWindow.java

@@ -28,11 +28,11 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 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.Arrays;
@@ -50,20 +50,13 @@ public class GlobalWindow extends FrameContainer {
 
     /**
      * Creates a new instance of GlobalWindow.
-     *
-     * @param config              The ConfigManager to retrieve settings from.
-     * @param parser              The command parser to use to parse input.
-     * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param messageSinkManager  The sink manager to use to dispatch messages.
-     * @param urlBuilder          The URL builder to use when finding icons.
-     * @param eventBus            The bus to dispatch events on.
      */
     @Inject
     public GlobalWindow(@GlobalConfig final AggregateConfigProvider config,
             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager, final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus, final ColourManagerFactory colourManagerFactory) {
-        super(null, "icon", "Global", "(Global)", config, colourManagerFactory, urlBuilder, parser,
+            final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory) {
+        super(null, "icon", "Global", "(Global)", config, backBufferFactory, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),

src/com/dmdirc/MessageTarget.java

@@ -24,9 +24,9 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Collection;
@@ -40,20 +40,6 @@ public abstract class MessageTarget extends FrameContainer {
 
     /**
      * Creates a new MessageTarget.
-     *
-     * @param parent             The parent of this frame container, if any.
-     * @param icon               The icon to use for this target
-     * @param name               The name of this target
-     * @param title              The title of this target
-     * @param config             The config manager to use for this target
-     * @param parser             The command parser for this container
-     * @param tabCompleter       The tab completer to use
-     * @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.
-     * @param components         The UI components that this frame requires
-     *
-     * @since 0.6.4
      */
     public MessageTarget(
             @Nullable final FrameContainer parent,
@@ -61,14 +47,14 @@ public abstract class MessageTarget extends FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider config,
-            final ColourManagerFactory colourManagerFactory,
+            final BackBufferFactory backBufferFactory,
             final CommandParser parser,
             final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
-        super(parent, icon, name, title, config,colourManagerFactory, urlBuilder, parser,
+        super(parent, icon, name, title, config, backBufferFactory, urlBuilder, parser,
                 tabCompleter, messageSinkManager, eventBus, components);
     }
 

src/com/dmdirc/Query.java

@@ -36,7 +36,6 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.common.CompositionState;
@@ -47,9 +46,10 @@ import com.dmdirc.parser.interfaces.callbacks.NickChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateActionListener;
 import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 
@@ -94,11 +94,11 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(newServer, "query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(),
-                colourManagerFactory,
+                backBufferFactory,
                 new QueryCommandParser(newServer, commandController, newServer.getEventBus()),
                 tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
                         newServer.getConfigManager(),

src/com/dmdirc/QueryFactory.java

@@ -23,9 +23,9 @@
 package com.dmdirc;
 
 import com.dmdirc.interfaces.CommandController;
-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 javax.inject.Inject;
@@ -41,22 +41,22 @@ public class QueryFactory {
     private final CommandController commandController;
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
 
     @Inject
     public QueryFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final ColourManagerFactory colourManagerFactory) {
+            final URLBuilder urlBuilder, final BackBufferFactory backBufferFactory) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     public Query getQuery(final Server server, final String host) {
         return new Query(server, host, tabCompleterFactory, commandController,
-                messageSinkManager, urlBuilder, colourManagerFactory);
+                messageSinkManager, urlBuilder, backBufferFactory);
     }
 
 }

src/com/dmdirc/Raw.java

@@ -31,8 +31,8 @@ import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
 import com.dmdirc.parser.interfaces.callbacks.DataOutListener;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
@@ -53,20 +53,15 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
 
     /**
      * Creates a new instance of Raw.
-     *
-     * @param newServer          the server to monitor
-     * @param commandController  The controller to load commands from.
-     * @param messageSinkManager The sink manager to use to dispatch messages.
-     * @param urlBuilder         The URL builder to use when finding icons.
      */
     public Raw(
             final Server newServer,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(newServer, "raw", "Raw", "(Raw log)", newServer.getConfigManager(),
-                colourManagerFactory, urlBuilder,
+                backBufferFactory, urlBuilder,
                 new ServerCommandParser(newServer.getConfigManager(), commandController, newServer.
                         getEventBus()),
                 newServer.getTabCompleter(),

src/com/dmdirc/RawFactory.java

@@ -23,8 +23,8 @@
 package com.dmdirc;
 
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import javax.inject.Inject;
@@ -39,22 +39,22 @@ public class RawFactory {
     private final CommandController commandController;
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
 
     @Inject
     public RawFactory(final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     public Raw getRaw(final Server server) {
         return new Raw(server, commandController, messageSinkManager, urlBuilder,
-                colourManagerFactory);
+                backBufferFactory);
     }
 
 }

src/com/dmdirc/Server.java

@@ -60,6 +60,7 @@ import com.dmdirc.tls.CertificateManager;
 import com.dmdirc.tls.CertificateProblemListener;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -188,27 +189,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
     /**
      * Creates a new server which will connect to the specified URL with the specified profile.
-     *
-     * @since 0.6.3
-     * @param manager               The server manager that owns this server.
-     * @param configMigrator        The migrateable configuration manager to read config settings
-     *                              from.
-     * @param commandParser         The parser to use for commands in this server's window.
-     * @param parserFactory         The factory to use to generate parsers.
-     * @param tabCompleterFactory   The factory to use for tab completers.
-     * @param identityFactory       The factory to use to create identities.
-     * @param messageSinkManager    The sink manager to use to dispatch messages.
-     * @param windowManager         Window Manager
-     * @param channelFactory        The factory to use to create channels.
-     * @param queryFactory          The factory to use to create queries.
-     * @param rawFactory            The factory to use to create raw windows.
-     * @param urlBuilder            The URL builder to use when finding icons.
-     * @param eventBus              The event bus to dispatch events onto.
-     * @param messageEncoderFactory The message encoder factory to create a message encoder with.
-     * @param userSettings          The config provider to write user settings to.
-     * @param executorService       The service to use to schedule events.
-     * @param uri                   The address of the server to connect to
-     * @param profile               The profile to use
      */
     public Server(
             final ServerManager manager,
@@ -229,12 +209,12 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final ScheduledExecutorService executorService,
             final URI uri,
             final Profile profile,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(null, "server-disconnected",
                 getHost(uri),
                 getHost(uri),
                 configMigrator.getConfigProvider(),
-                colourManagerFactory,
+                backBufferFactory,
                 urlBuilder,
                 commandParser,
                 tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),

src/com/dmdirc/ServerFactoryImpl.java

@@ -28,8 +28,8 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.WindowManager;
+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;
 
@@ -59,7 +59,7 @@ public class ServerFactoryImpl {
     private final DMDircMBassador eventBus;
     private final MessageEncoderFactory messageEncoderFactory;
     private final ConfigProvider userSettings;
-    private final ColourManagerFactory colourManagerFactory;
+    private final BackBufferFactory backBufferFactory;
 
     @Inject
     public ServerFactoryImpl(
@@ -76,7 +76,7 @@ public class ServerFactoryImpl {
             final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             @ClientModule.UserConfig final ConfigProvider userSettings,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         this.manager = manager;
         this.parserFactory = parserFactory;
         this.tabCompleterFactory = tabCompleterFactory;
@@ -90,7 +90,7 @@ public class ServerFactoryImpl {
         this.eventBus = eventBus;
         this.messageEncoderFactory = messageEncoderFactory;
         this.userSettings = userSettings;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     public Server getServer(
@@ -103,6 +103,6 @@ public class ServerFactoryImpl {
                 tabCompleterFactory, identityFactory, messageSinkManager, windowManager,
                 channelFactory.get(), queryFactory.get(), rawFactory.get(),urlBuilder, eventBus,
                 messageEncoderFactory, userSettings, executorService, uri, profile,
-                colourManagerFactory);
+                backBufferFactory);
     }
 }

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

@@ -36,8 +36,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import javax.annotation.Nonnull;
@@ -61,17 +61,11 @@ public class OpenWindow extends Command implements IntelligentCommand {
     private final DMDircMBassador eventBus;
     /** The config provider to retrieve settings from. */
     private final AggregateConfigProvider configProvider;
-    /** Colour manager factory. */
-    private final ColourManagerFactory colourManagerFactory;
+    /** Back buffer factory. */
+    private final BackBufferFactory backBufferFactory;
 
     /**
      * Creates a new instance of this command.
-     *
-     * @param controller     The controller to use for command information.
-     * @param windowManager  Window management
-     * @param urlBuilder     The URL builder to use when finding icons.
-     * @param eventBus       The bus to dispatch events on.
-     * @param configProvider The config provider to retrieve settings from.
      */
     @Inject
     public OpenWindow(
@@ -80,14 +74,14 @@ public class OpenWindow extends Command implements IntelligentCommand {
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             @GlobalConfig final AggregateConfigProvider configProvider,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         super(controller);
 
         this.windowManager = windowManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.configProvider = configProvider;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     @Override
@@ -129,11 +123,11 @@ public class OpenWindow extends Command implements IntelligentCommand {
                 final CustomWindow newWindow;
                 if (parent == null) {
                     newWindow = new CustomWindow(args.getArguments()[start], title,
-                            configProvider, urlBuilder, eventBus, colourManagerFactory);
+                            configProvider, urlBuilder, eventBus, backBufferFactory);
                     windowManager.addWindow(newWindow);
                 } else {
                     newWindow = new CustomWindow(args.getArguments()[start], title, parent,
-                            urlBuilder, colourManagerFactory);
+                            urlBuilder, backBufferFactory);
                     windowManager.addWindow(parent, newWindow);
                 }
             } else {

src/com/dmdirc/ui/core/BackBuffer.java

@@ -24,7 +24,9 @@ package com.dmdirc.ui.core;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.EventFormatter;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -36,8 +38,12 @@ public class BackBuffer {
     private final IRCDocument document;
     private final Styliser styliser;
     private final DMDircMBassador eventBus;
+    private final EventFormatter formatter;
 
-    public BackBuffer(final FrameContainer owner, final ColourManagerFactory colourManagerFactory) {
+    public BackBuffer(
+            final FrameContainer owner,
+            final ColourManagerFactory colourManagerFactory,
+            final EventFormatter formatter) {
         this.styliser = new Styliser(
                 owner.getOptionalConnection().orElse(null),
                 owner.getConfigManager(),
@@ -45,6 +51,7 @@ public class BackBuffer {
                 owner.getEventBus());
         this.document = new IRCDocument(owner.getConfigManager(), styliser, owner.getEventBus());
         this.eventBus = owner.getEventBus();
+        this.formatter = formatter;
     }
 
     /**
@@ -61,6 +68,15 @@ public class BackBuffer {
         eventBus.unsubscribe(this);
     }
 
+    /**
+     * Handles a displayable event received on the event bus.
+     *
+     * @param event The event to be displayed.
+     */
+    public void handleDisplayableEvent(final DisplayableEvent event) {
+
+    }
+
     public IRCDocument getDocument() {
         return document;
     }

src/com/dmdirc/ui/core/BackBufferFactory.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.core;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.EventFormatter;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory for {@link BackBuffer}s.
+ */
+@Singleton
+public class BackBufferFactory {
+
+    private final ColourManagerFactory colourManagerFactory;
+    private final EventFormatter formatter;
+
+    @Inject
+    public BackBufferFactory(
+            final ColourManagerFactory colourManagerFactory,
+            final EventFormatter formatter) {
+        this.colourManagerFactory = colourManagerFactory;
+        this.formatter = formatter;
+    }
+
+    public BackBuffer getBackBuffer(final FrameContainer owner) {
+        return new BackBuffer(owner, colourManagerFactory, formatter);
+    }
+
+}

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

@@ -26,7 +26,7 @@ import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 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;
@@ -45,23 +45,20 @@ public class CustomWindowMessageSink implements MessageSink {
     private final WindowManager windowManager;
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
-    /** Colour Manager Factory. */
-    private final ColourManagerFactory colourManagerFactory;
+    /** Back buffer Factory. */
+    private final BackBufferFactory backBufferFactory;
 
     /**
      * Creates a new custom window message sink.
-     *
-     * @param windowManager Window management
-     * @param urlBuilder    The URL builder to use when finding icons.
      */
     @Inject
     public CustomWindowMessageSink(
             final WindowManager windowManager,
             final URLBuilder urlBuilder,
-            final ColourManagerFactory colourManagerFactory) {
+            final BackBufferFactory backBufferFactory) {
         this.windowManager = windowManager;
         this.urlBuilder = urlBuilder;
-        this.colourManagerFactory = colourManagerFactory;
+        this.backBufferFactory = backBufferFactory;
     }
 
     @Override
@@ -79,7 +76,7 @@ public class CustomWindowMessageSink implements MessageSink {
 
         if (targetWindow == null) {
             targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
-                    (Server) source.getConnection(), urlBuilder, colourManagerFactory);
+                    (Server) source.getConnection(), urlBuilder, backBufferFactory);
             windowManager.addWindow((Server) source.getConnection(), targetWindow);
         }
 

test/com/dmdirc/ServerTest.java

@@ -29,11 +29,11 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
-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.TabCompleterFactory;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
 import java.net.URI;
@@ -71,7 +71,7 @@ public class ServerTest {
     @Mock private DMDircMBassador eventBus;
     @Mock private ScheduledExecutorService executorService;
     @Mock private MessageEncoderFactory messageEncoderFactory;
-    @Mock private ColourManagerFactory colourManagerFactory;
+    @Mock private BackBufferFactory backBufferFactory;
 
     private Server server;
 
@@ -102,7 +102,7 @@ public class ServerTest {
                 executorService,
                 new URI("irc-test://255.255.255.255"),
                 profile,
-                colourManagerFactory);
+                backBufferFactory);
     }
 
     @Test

test/com/dmdirc/WritableFrameContainerTest.java

@@ -26,7 +26,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
@@ -50,7 +50,7 @@ public class WritableFrameContainerTest {
     @Mock private MessageSinkManager messageSinkManager;
     @Mock private URLBuilder urlBuilder;
     @Mock private DMDircMBassador eventBus;
-    @Mock private ColourManagerFactory colourManagerFactory;
+    @Mock private BackBufferFactory backBufferFactory;
     @Mock private Provider<GlobalWindow> globalWindowProvider;
     private CommandManager commands;
 
@@ -65,7 +65,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testGetNumLines() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, urlBuilder, eventBus, colourManagerFactory);
+                messageSinkManager, urlBuilder, eventBus, backBufferFactory);
 
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -95,7 +95,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testSplitLine() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, urlBuilder, eventBus, colourManagerFactory);
+                messageSinkManager, urlBuilder, eventBus, backBufferFactory);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -22,19 +22,18 @@
 
 package com.dmdirc.harness;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 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.sink.MessageSinkManager;
+import com.dmdirc.ui.core.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
-import com.dmdirc.DMDircMBassador;
-
 import java.util.Collections;
 import java.util.Optional;
 
@@ -48,8 +47,8 @@ public class TestWritableFrameContainer extends FrameContainer {
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder, final DMDircMBassador eventBus,
-            final ColourManagerFactory colourManagerFactory) {
-        super(null, "raw", "Raw", "(Raw)", cm, colourManagerFactory, urlBuilder,
+            final BackBufferFactory backBufferFactory) {
+        super(null, "raw", "Raw", "(Raw)", cm, backBufferFactory, urlBuilder,
                 new GlobalCommandParser(cm, commandManager, eventBus),
                 new TabCompleter(mock(CommandController.class), cm),
                 messageSinkManager,