Add ColourManagerFactory

Change-Id: I6ef45d10a4fe862854702eee671114ee09f01d4d
Depends-On: If1bc20d15561584c9296ad10f04957efb51c5966
Reviewed-on: http://gerrit.dmdirc.com/3865
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/Channel.java

@@ -41,6 +41,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 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.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
@@ -111,10 +112,12 @@ public class Channel extends MessageTarget implements GroupChat {
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         super(newServer, "channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
+                colourManagerFactory,
                 new ChannelCommandParser(newServer, commandController, eventBus),
                 tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,

src/com/dmdirc/ChannelFactory.java

@@ -27,6 +27,7 @@ import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import javax.inject.Inject;
@@ -43,22 +44,25 @@ public class ChannelFactory {
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
+    private final ColourManagerFactory colourManagerFactory;
 
     @Inject
     public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
+            final URLBuilder urlBuilder, final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     public Channel getChannel(final Server server,
             final ChannelInfo channelInfo,
             final ConfigProviderMigrator configMigrator) {
         return new Channel(server, channelInfo, configMigrator, tabCompleterFactory,
-                commandController, messageSinkManager, urlBuilder, eventBus);
+                commandController, messageSinkManager, urlBuilder, eventBus, colourManagerFactory);
     }
 }

src/com/dmdirc/CustomWindow.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import com.google.common.base.Optional;
@@ -48,9 +49,10 @@ public class CustomWindow extends FrameContainer {
             final String name,
             final String title,
             final FrameContainer parent,
-            final URLBuilder urlBuilder) {
-        super(parent, "custom", name, title, parent.getConfigManager(), urlBuilder,
-                parent.getEventBus(),
+            final URLBuilder urlBuilder,
+            final ColourManagerFactory colourManagerFactory) {
+        super(parent, "custom", name, title, parent.getConfigManager(), colourManagerFactory,
+                urlBuilder, parent.getEventBus(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
@@ -68,9 +70,10 @@ public class CustomWindow extends FrameContainer {
             final String title,
             final AggregateConfigProvider configProvider,
             final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus) {
-        super(null, "custom", name, title, configProvider, urlBuilder, eventBus,
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
+        super(null, "custom", name, title, configProvider, colourManagerFactory, urlBuilder,
+                eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
     @Override

src/com/dmdirc/FrameContainer.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CompositionState;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.input.TabCompleter;
@@ -105,6 +106,9 @@ 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 command parser used for commands in this container.
      * <p>
@@ -144,6 +148,7 @@ public abstract class FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider config,
+            final ColourManagerFactory colourManagerFactory,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
@@ -157,6 +162,7 @@ public abstract class FrameContainer {
         this.commandParser = Optional.absent();
         this.tabCompleter = Optional.absent();
         this.messageSinkManager = Optional.absent();
+        this.colourManagerFactory = colourManagerFactory;
 
         this.eventBusManager = new ChildEventBusManager(eventBus);
         this.eventBusManager.connect();
@@ -188,6 +194,7 @@ public abstract class FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider config,
+            final ColourManagerFactory colourManagerFactory,
             final URLBuilder urlBuilder,
             final CommandParser commandParser,
             final TabCompleter tabCompleter,
@@ -204,6 +211,7 @@ public abstract class FrameContainer {
         this.commandParser = Optional.of(commandParser);
         this.tabCompleter = Optional.of(tabCompleter);
         this.messageSinkManager = Optional.of(messageSinkManager);
+        this.colourManagerFactory = colourManagerFactory;
         commandParser.setOwner(this);
 
         this.eventBusManager = new ChildEventBusManager(eventBus);
@@ -404,7 +412,8 @@ public abstract class FrameContainer {
     public Styliser getStyliser() {
         synchronized (styliserSync) {
             if (styliser == null) {
-                styliser = new Styliser(getConnection(), getConfigManager());
+                styliser = new Styliser(getConnection(), getConfigManager(),
+                        colourManagerFactory.getColourManager(getConfigManager()));
             }
             return styliser;
         }

src/com/dmdirc/GlobalWindow.java

@@ -32,6 +32,7 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
@@ -60,8 +61,8 @@ public class GlobalWindow extends FrameContainer {
     public GlobalWindow(@GlobalConfig final AggregateConfigProvider config,
             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager, final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus) {
-        super(null, "icon", "Global", "(Global)", config, urlBuilder, parser,
+            final DMDircMBassador eventBus, final ColourManagerFactory colourManagerFactory) {
+        super(null, "icon", "Global", "(Global)", config, colourManagerFactory, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),

src/com/dmdirc/MessageTarget.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Collection;
@@ -60,14 +61,15 @@ public abstract class MessageTarget extends FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider config,
+            final ColourManagerFactory colourManagerFactory,
             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, urlBuilder, parser, tabCompleter,
-                messageSinkManager, eventBus, components);
+        super(parent, icon, name, title, config,colourManagerFactory, urlBuilder, parser,
+                tabCompleter, messageSinkManager, eventBus, components);
     }
 
     /**

src/com/dmdirc/Query.java

@@ -49,6 +49,7 @@ import com.dmdirc.parser.interfaces.callbacks.PrivateMessageListener;
 import com.dmdirc.parser.interfaces.callbacks.QuitListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 
@@ -91,10 +92,12 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final ColourManagerFactory colourManagerFactory) {
         super(newServer, "query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(),
+                colourManagerFactory,
                 new QueryCommandParser(newServer, commandController, newServer.getEventBus()),
                 tabCompleterFactory.getTabCompleter(newServer.getTabCompleter(),
                         newServer.getConfigManager(),

src/com/dmdirc/QueryFactory.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import javax.inject.Inject;
@@ -40,20 +41,22 @@ public class QueryFactory {
     private final CommandController commandController;
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
+    private final ColourManagerFactory colourManagerFactory;
 
     @Inject
     public QueryFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder, final ColourManagerFactory colourManagerFactory) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     public Query getQuery(final Server server, final String host) {
         return new Query(server, host, tabCompleterFactory, commandController,
-                messageSinkManager, urlBuilder);
+                messageSinkManager, urlBuilder, colourManagerFactory);
     }
 
 }

src/com/dmdirc/Raw.java

@@ -33,6 +33,7 @@ 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.components.WindowComponent;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
@@ -61,8 +62,10 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
             final Server newServer,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder) {
-        super(newServer, "raw", "Raw", "(Raw log)", newServer.getConfigManager(), urlBuilder,
+            final URLBuilder urlBuilder,
+            final ColourManagerFactory colourManagerFactory) {
+        super(newServer, "raw", "Raw", "(Raw log)", newServer.getConfigManager(),
+                colourManagerFactory, urlBuilder,
                 new ServerCommandParser(newServer.getConfigManager(), commandController, newServer.
                         getEventBus()),
                 newServer.getTabCompleter(),

src/com/dmdirc/RawFactory.java

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

src/com/dmdirc/Server.java

@@ -63,6 +63,7 @@ import com.dmdirc.ui.core.components.StatusBarManager;
 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.Formatter;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
@@ -231,11 +232,13 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final ConfigProvider userSettings,
             final ScheduledExecutorService executorService,
             final URI uri,
-            final ConfigProvider profile) {
+            final ConfigProvider profile,
+            final ColourManagerFactory colourManagerFactory) {
         super(null, "server-disconnected",
                 getHost(uri),
                 getHost(uri),
                 configMigrator.getConfigProvider(),
+                colourManagerFactory,
                 urlBuilder,
                 commandParser,
                 tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),

src/com/dmdirc/ServerFactoryImpl.java

@@ -30,6 +30,7 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.net.URI;
@@ -59,6 +60,7 @@ public class ServerFactoryImpl {
     private final DMDircMBassador eventBus;
     private final MessageEncoderFactory messageEncoderFactory;
     private final ConfigProvider userSettings;
+    private final ColourManagerFactory colourManagerFactory;
 
     @Inject
     public ServerFactoryImpl(
@@ -75,7 +77,8 @@ public class ServerFactoryImpl {
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
-            @ClientModule.UserConfig final ConfigProvider userSettings) {
+            @ClientModule.UserConfig final ConfigProvider userSettings,
+            final ColourManagerFactory colourManagerFactory) {
         this.manager = manager;
         this.parserFactory = parserFactory;
         this.tabCompleterFactory = tabCompleterFactory;
@@ -90,6 +93,7 @@ public class ServerFactoryImpl {
         this.eventBus = eventBus;
         this.messageEncoderFactory = messageEncoderFactory;
         this.userSettings = userSettings;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     public Server getServer(
@@ -102,6 +106,6 @@ public class ServerFactoryImpl {
                 tabCompleterFactory, identityFactory, messageSinkManager, statusBarManager,
                 windowManager, channelFactory.get(), queryFactory.get(), rawFactory.get(),
                 urlBuilder, eventBus, messageEncoderFactory, userSettings, executorService, uri,
-                profile);
+                profile, colourManagerFactory);
     }
 }

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

@@ -38,6 +38,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import javax.annotation.Nonnull;
@@ -61,6 +62,8 @@ 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;
 
     /**
      * Creates a new instance of this command.
@@ -77,13 +80,15 @@ public class OpenWindow extends Command implements IntelligentCommand {
             final WindowManager windowManager,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
-            @GlobalConfig final AggregateConfigProvider configProvider) {
+            @GlobalConfig final AggregateConfigProvider configProvider,
+            final ColourManagerFactory colourManagerFactory) {
         super(controller);
 
         this.windowManager = windowManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.configProvider = configProvider;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     @Override
@@ -125,11 +130,11 @@ public class OpenWindow extends Command implements IntelligentCommand {
                 final CustomWindow newWindow;
                 if (parent == null) {
                     newWindow = new CustomWindow(args.getArguments()[start], title,
-                            configProvider, urlBuilder, eventBus);
+                            configProvider, urlBuilder, eventBus, colourManagerFactory);
                     windowManager.addWindow(newWindow);
                 } else {
                     newWindow = new CustomWindow(args.getArguments()[start], title, parent,
-                            urlBuilder);
+                            urlBuilder, colourManagerFactory);
                     windowManager.addWindow(parent, newWindow);
                 }
             } else {

src/com/dmdirc/messages/CustomWindowMessageSink.java

@@ -26,6 +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.util.URLBuilder;
 
 import java.util.Date;
@@ -44,6 +45,8 @@ 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;
 
     /**
      * Creates a new custom window message sink.
@@ -54,9 +57,11 @@ public class CustomWindowMessageSink implements MessageSink {
     @Inject
     public CustomWindowMessageSink(
             final WindowManager windowManager,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final ColourManagerFactory colourManagerFactory) {
         this.windowManager = windowManager;
         this.urlBuilder = urlBuilder;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     @Override
@@ -74,7 +79,7 @@ public class CustomWindowMessageSink implements MessageSink {
 
         if (targetWindow == null) {
             targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
-                    (Server) source.getConnection(), urlBuilder);
+                    (Server) source.getConnection(), urlBuilder, colourManagerFactory);
             windowManager.addWindow((Server) source.getConnection(), targetWindow);
         }
 

src/com/dmdirc/ui/messages/ColourManagerFactory.java

@@ -0,0 +1,45 @@
+/*
+ * 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.messages;
+
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Factory to create {@link ColourManager}s.
+ */
+@Singleton
+public class ColourManagerFactory {
+
+    @Inject
+    public ColourManagerFactory() {
+        //Complicated constructor.
+    }
+
+    public ColourManager getColourManager(final AggregateConfigProvider configManager) {
+        return new ColourManager(configManager);
+    }
+
+}

src/com/dmdirc/ui/messages/Styliser.java

@@ -137,15 +137,15 @@ public class Styliser implements ConfigChangeListener {
      *
      * @param connection    The {@link Connection} that this styliser is for. May be {@code null}.
      * @param configManager the {@link AggregateConfigProvider} to get settings from.
+     * @param colourManager The {@link ColourManager} to get colours from.
      *
      * @since 0.6.3
      */
-    public Styliser(final Connection connection, final AggregateConfigProvider configManager) {
+    public Styliser(final Connection connection, final AggregateConfigProvider configManager,
+            final ColourManager colourManager) {
         this.connection = connection;
         this.configManager = configManager;
-
-        // TODO: This should probably be passed in, not created here.
-        this.colourManager = new ColourManager(configManager);
+        this.colourManager = colourManager;
 
         configManager.addChangeListener("ui", "linkcolour", this);
         configManager.addChangeListener("ui", "channelcolour", this);

test/com/dmdirc/ServerTest.java

@@ -33,6 +33,7 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.net.URI;
@@ -71,6 +72,7 @@ public class ServerTest {
     @Mock private DMDircMBassador eventBus;
     @Mock private ScheduledExecutorService executorService;
     @Mock private MessageEncoderFactory messageEncoderFactory;
+    @Mock private ColourManagerFactory colourManagerFactory;
 
     private Server server;
 
@@ -101,7 +103,8 @@ public class ServerTest {
                 userConfig,
                 executorService,
                 new URI("irc-test://255.255.255.255"),
-                profile);
+                profile,
+                colourManagerFactory);
     }
 
     @Test

test/com/dmdirc/WritableFrameContainerTest.java

@@ -28,6 +28,7 @@ import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
@@ -48,6 +49,7 @@ public class WritableFrameContainerTest {
     @Mock private MessageSinkManager messageSinkManager;
     @Mock private URLBuilder urlBuilder;
     @Mock private DMDircMBassador eventBus;
+    @Mock private ColourManagerFactory colourManagerFactory;
     private CommandManager commands;
 
     @Before
@@ -64,7 +66,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testGetNumLines() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, urlBuilder, eventBus);
+                messageSinkManager, urlBuilder, eventBus, colourManagerFactory);
 
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -94,7 +96,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testSplitLine() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, urlBuilder, eventBus);
+                messageSinkManager, urlBuilder, eventBus, colourManagerFactory);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -30,6 +30,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import com.dmdirc.DMDircMBassador;
@@ -45,8 +46,9 @@ public class TestWritableFrameContainer extends FrameContainer {
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
-        super(null, "raw", "Raw", "(Raw)", cm, urlBuilder,
+            final URLBuilder urlBuilder, final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
+        super(null, "raw", "Raw", "(Raw)", cm, colourManagerFactory, urlBuilder,
                 new GlobalCommandParser(cm, commandManager, eventBus),
                 new TabCompleter(mock(CommandController.class), cm),
                 messageSinkManager,

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -48,7 +48,7 @@ public class IntelligentLinkingTest {
         final Server server = mock(Server.class);
         when(server.getChannelPrefixes()).thenReturn("#&+");
 
-        styliser = new Styliser(server, manager);
+        styliser = new Styliser(server, manager, new ColourManager(manager));
     }
 
     @Test

test/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -64,7 +64,7 @@ public class StyliserStylesTest {
 
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
 
-        final Styliser styliser = new Styliser(null, manager);
+        final Styliser styliser = new Styliser(null, manager, new ColourManager(manager));
         styliser.addStyledString(doc, new String[]{input});
         final AttributedCharacterIterator aci = Utils.getAttributedString(styliser,
                 new String[]{input, }, "dialog", 12).

test/com/dmdirc/ui/messages/StyliserTest.java

@@ -83,7 +83,7 @@ public class StyliserTest {
         final String input2 = "abcdefghi";
 
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
-        final Styliser styliser = new Styliser(null, manager);
+        final Styliser styliser = new Styliser(null, manager, new ColourManager(manager));
 
         for (int i = 0; i < input2.length(); i++) {
             final Enumeration<?> res1 = styliser.getStyledString(new String[]{input1})