Use ColourManagerFactory

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

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

@@ -29,6 +29,7 @@ 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;
@@ -74,6 +75,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             @Nullable final FrameContainer parent,
             final DCCChat dcc,
             final AggregateConfigProvider configManager,
+            final ColourManagerFactory colourManagerFactory,
             final CommandController commandController,
             final String title,
             final String nick,
@@ -82,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,
+        super(parent, title, "dcc-chat-inactive", configManager, colourManagerFactory,
                 new DCCCommandParser(configManager, commandController, eventBus),
                 messageSinkManager,
                 tabCompleterFactory,

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

@@ -48,6 +48,7 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Window;
@@ -82,6 +83,7 @@ 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;
 
     /**
      * Creates a new instance of DCCCommand.
@@ -104,7 +106,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
             final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         super(controller);
         this.mainWindow = mainWindow;
         myPlugin = plugin;
@@ -113,6 +116,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         this.tabCompleterFactory = tabCompleterFactory;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     @Override
@@ -179,6 +183,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     myPlugin.getContainer(),
                     chat,
                     origin.getConfigManager(),
+                    colourManagerFactory,
                     getController(),
                     "*Chat: " + target,
                     myNickname,
@@ -259,7 +264,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(), "Send: " + target,
+                            origin.getConfigManager(), colourManagerFactory, "Send: " + target,
                             target, connection, urlBuilder, eventBus);
                     windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""
@@ -272,7 +277,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(), "*Send: "
+                                origin.getConfigManager(), colourManagerFactory, "*Send: "
                                 + target, target, connection, urlBuilder, eventBus);
                         windowManager.addWindow(myPlugin.getContainer(), container);
                         parser.sendCTCP(target, "DCC", "SEND \""

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

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Collection;
@@ -62,13 +63,14 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final String title,
             final String icon,
             final AggregateConfigProvider configManager,
+            final ColourManagerFactory colourManagerFactory,
             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, urlBuilder, parser,
+        super(parent, icon, title, title, configManager, colourManagerFactory, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(configManager),
                 messageSinkManager,
                 eventBus,

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

@@ -52,6 +52,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Window;
@@ -76,6 +77,7 @@ import net.engio.mbassy.listener.Handler;
 @Singleton
 public class DCCManager {
 
+    private final ColourManagerFactory colourManagerFactory;
     /** Our DCC Container window. */
     private PlaceholderContainer container;
     /** Config manager to read settings from. */
@@ -130,7 +132,8 @@ public class DCCManager {
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
             final GlobalCommandParser commandParser,
-            @Directory(DirectoryType.BASE) final String baseDirectory) {
+            @Directory(DirectoryType.BASE) final String baseDirectory,
+            final ColourManagerFactory colourManagerFactory) {
         this.mainWindow = mainWindow;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
@@ -140,6 +143,7 @@ public class DCCManager {
         this.config = globalConfig;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
+        this.colourManagerFactory = colourManagerFactory;
 
         windowFactory.registerImplementation(
                 new SwingWindowFactory.WindowProvider() {
@@ -212,7 +216,8 @@ public class DCCManager {
                 final boolean resume = handleResume(jc);
                 if (reverse && !token.isEmpty()) {
                     final TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, "*Receive: " + nickname, nickname, null, urlBuilder, eventBus);
+                            config, colourManagerFactory, "*Receive: " + nickname, nickname, null,
+                            urlBuilder, eventBus);
                     windowManager.addWindow(getContainer(), container);
                     send.setToken(token);
                     if (resume) {
@@ -238,7 +243,8 @@ public class DCCManager {
                     }
                 } else {
                     final TransferContainer container = new TransferContainer(DCCManager.this, send,
-                            config, "Receive: " + nickname, nickname, null, urlBuilder, eventBus);
+                            config, colourManagerFactory, "Receive: " + nickname, nickname, null,
+                            urlBuilder, eventBus);
                     windowManager.addWindow(getContainer(), container);
                     if (resume) {
                         parser.sendCTCP(nickname, "DCC", "RESUME "
@@ -420,6 +426,7 @@ public class DCCManager {
                 getContainer(),
                 chat,
                 config,
+                colourManagerFactory,
                 commandController,
                 "Chat: " + nickname,
                 myNickname,
@@ -649,7 +656,8 @@ public class DCCManager {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, mainWindow, urlBuilder, eventBus);
+        container = new PlaceholderContainer(this, config, colourManagerFactory, mainWindow,
+                urlBuilder, eventBus);
         windowManager.addWindow(container);
     }
 

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

@@ -27,6 +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.util.URLBuilder;
 
 import java.awt.Dialog.ModalityType;
@@ -55,10 +56,11 @@ public class PlaceholderContainer extends FrameContainer {
     public PlaceholderContainer(
             final DCCManager plugin,
             final AggregateConfigProvider config,
+            final ColourManagerFactory colourManagerFactory,
             final Window parentWindow,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus) {
-        super(null, "dcc", "DCCs", "DCCs", config, urlBuilder, eventBus,
+        super(null, "dcc", "DCCs", "DCCs", config, colourManagerFactory, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.parentWindow = parentWindow;

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

@@ -34,6 +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.util.URLBuilder;
 
 import java.awt.Desktop;
@@ -88,12 +89,13 @@ public class TransferContainer extends FrameContainer implements
      * @param eventBus   The bus to dispatch events on.
      */
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
-            final AggregateConfigProvider config, final String title,
+            final AggregateConfigProvider config,
+            final ColourManagerFactory colourManagerFactory, 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, urlBuilder, eventBus,
+                title, title, config, colourManagerFactory, 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,6 +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.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
 
@@ -56,6 +57,7 @@ public class EventBusViewer extends DebugCommand {
     private final AggregateConfigProvider globalConfig;
     private final WindowManager windowManager;
     private final DMDircMBassador globalEventBus;
+    private final ColourManagerFactory colourManagerFactory;
 
     /**
      * Creates a new instance of the command.
@@ -72,12 +74,14 @@ public class EventBusViewer extends DebugCommand {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
-            final DMDircMBassador globalEventBus) {
+            final DMDircMBassador globalEventBus,
+            final ColourManagerFactory colourManagerFactory) {
         super(commandProvider);
         this.globalConfig = globalConfig;
         this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.globalEventBus = globalEventBus;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     @Override
@@ -98,12 +102,12 @@ public class EventBusViewer extends DebugCommand {
 
         final CustomWindow window;
         if (isGlobal) {
-            window = new CustomWindow("Event bus", "Event bus", globalConfig,
-                    urlBuilder, globalEventBus);
+            window = new CustomWindow("Event bus", "Event bus", globalConfig, urlBuilder,
+                    globalEventBus, colourManagerFactory);
             windowManager.addWindow(window);
         } else {
-            window = new CustomWindow("Event bus", "Event bus", origin,
-                    urlBuilder);
+            window = new CustomWindow("Event bus", "Event bus", origin, urlBuilder,
+                    colourManagerFactory);
             windowManager.addWindow(origin, window);
         }
 

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

@@ -26,6 +26,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 
@@ -54,8 +55,10 @@ public class HistoryWindow extends FrameContainer {
             final FrameContainer parent,
             final URLBuilder urlBuilder,
             final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory,
             final int numLines) {
-        super(parent, "raw", title, title, parent.getConfigManager(), urlBuilder, eventBus,
+        super(parent, "raw", title, title, parent.getConfigManager(), colourManagerFactory,
+                urlBuilder, eventBus,
                 Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
 
         final int frameBufferSize = parent.getConfigManager().getOptionInt(

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

@@ -56,6 +56,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.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
@@ -108,6 +109,7 @@ public class LoggingManager implements ConfigChangeListener {
     private final URLBuilder urlBuilder;
     private final DMDircMBassador eventBus;
     private final Provider<String> directoryProvider;
+    private final ColourManagerFactory colourManagerFactory;
     /** Timer used to close idle files. */
     private Timer idleFileTimer;
     /** Cached boolean settings. */
@@ -131,13 +133,15 @@ public class LoggingManager implements ConfigChangeListener {
     public LoggingManager(@PluginDomain(LoggingPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager, final URLBuilder urlBuilder, final DMDircMBassador eventBus,
-            @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider) {
+            @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider,
+            final ColourManagerFactory colourManagerFactory) {
         this.domain = domain;
         this.config = globalConfig;
         this.windowManager = windowManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
         this.directoryProvider = directoryProvider;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     public void load() {
@@ -769,7 +773,7 @@ public class LoggingManager implements ConfigChangeListener {
         }
 
         final HistoryWindow window = new HistoryWindow("History", reader, target, urlBuilder,
-                eventBus, historyLines);
+                eventBus, colourManagerFactory, historyLines);
         windowManager.addWindow(target, window);
 
         return true;

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

@@ -28,6 +28,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
@@ -60,9 +61,10 @@ public class DebugWindow extends FrameContainer {
             final Parser parser,
             final Connection connection,
             final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         super(connection.getWindowModel(), "raw", "Parser Debug", title,
-                connection.getWindowModel().getConfigManager(),
+                connection.getWindowModel().getConfigManager(), colourManagerFactory,
                 urlBuilder, eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;
         this.parser = parser;

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

@@ -29,6 +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.util.URLBuilder;
 
 import java.util.Date;
@@ -49,15 +50,18 @@ public class ParserDebugManager implements DebugInfoListener {
     private final URLBuilder urlBuilder;
     /** Window manager. */
     private final WindowManager windowManager;
+    private final ColourManagerFactory colourManagerFactory;
 
     @Inject
     public ParserDebugManager(
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.eventBus = eventBus;
+        this.colourManagerFactory = colourManagerFactory;
         registeredParsers = new HashMap<>();
     }
 
@@ -98,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);
+                    connection, urlBuilder, eventBus, colourManagerFactory);
             windowManager.addWindow(connection.getWindowModel(), window);
             registeredParsers.put(parser, window);
             window.addLine("======================", true);

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

@@ -26,6 +26,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.util.URLBuilder;
 
@@ -52,10 +53,11 @@ public class FakeWriteableFrameContainer extends FrameContainer {
             final FrameContainer target,
             final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final ColourManagerFactory colourManagerFactory) {
         super(target, target.getIcon(), target.getName(), target.getTitle(),
-                target.getConfigManager(), urlBuilder, target.getCommandParser(),
-                target.getTabCompleter(), messageSinkManager, eventBus,
+                target.getConfigManager(), colourManagerFactory, urlBuilder,
+                target.getCommandParser(), target.getTabCompleter(), messageSinkManager, eventBus,
                 Collections.<String>emptyList());
         this.target = target;
     }

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

@@ -35,6 +35,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import javax.annotation.Nonnull;
@@ -57,6 +58,7 @@ 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;
 
     /**
      * Creates a new instance of this command.
@@ -71,11 +73,13 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             final CommandController controller,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;
         this.eventBus = eventBus;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     @Override
@@ -83,7 +87,8 @@ 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), args.getArgumentsAsString());
+                target, messageSinkManager, eventBus, urlBuilder, colourManagerFactory),
+                args.getArgumentsAsString());
     }
 
     @Override

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

@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import com.dmdirc.DMDircMBassador;
@@ -66,6 +67,7 @@ public class RedirectCommandTest {
     @Mock private WindowManager windowManager;
     @Mock private URLBuilder urlBuilder;
     @Mock private DMDircMBassador eventBus;
+    @Mock private ColourManagerFactory colourManagerFactory;
 
     @Before
     public void setup() {
@@ -92,7 +94,7 @@ public class RedirectCommandTest {
     @Test
     public void testExecute() {
         final RedirectCommand command = new RedirectCommand(commandController, messageSinkManager,
-                urlBuilder, eventBus);
+                urlBuilder, eventBus, colourManagerFactory);
 
         command.execute(target, new CommandArguments(commandController, "/redirect /echo test"),
                 new ChatCommandContext(frameContainer, RedirectCommand.INFO, target));

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/Perform.java

@@ -27,6 +27,7 @@ import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -61,10 +62,11 @@ public class Perform extends JPanel implements ServerListListener {
             final IconManager iconManager,
             final AggregateConfigProvider globalConfig,
             final PerformWrapper wrapper,
-            final ServerListModel model) {
+            final ServerListModel model,
+            final ColourManagerFactory colourManagerFactory) {
 
         this.model = model;
-        performPanel = new PerformPanel(iconManager, globalConfig, wrapper);
+        performPanel = new PerformPanel(iconManager, colourManagerFactory, globalConfig, wrapper);
 
         addListeners();
         if (model.getSelectedItemPerformDescription() != null) {

serverlistdialog/src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -32,6 +32,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
 import java.awt.color.ColorSpace;
@@ -99,7 +100,8 @@ public class ServerListDialog extends StandardDialog implements
             final ServerListModel serverListModel,
             @MainWindow final Window parentWindow,
             final Settings settingsPanel,
-            final IdentityController identityController) {
+            final IdentityController identityController,
+            final ColourManagerFactory colourManagerFactory) {
         super(parentWindow, ModalityType.MODELESS);
 
         setTitle("Server List");
@@ -121,7 +123,8 @@ public class ServerListDialog extends StandardDialog implements
                 new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
                         null)));
         profileLayer = new JXLayer<>(new Profiles(model, identityController), profileLock);
-        performLayer = new JXLayer<>(new Perform(iconManager, globalConfig, performWrapper, model),
+        performLayer = new JXLayer<>(new Perform(iconManager, globalConfig, performWrapper, model,
+                colourManagerFactory),
                 performLock);
         settingsLayer = new JXLayer<>(settingsPanel, settingsLock);
         infoLayer = new JXLayer<>(new Info(model, urlHandler), infoLock);

ui_swing/src/com/dmdirc/addons/ui_swing/components/NickList.java

@@ -33,6 +33,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Dimension;
 import java.awt.Font;
@@ -72,10 +73,11 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
      * @param frame  Frame
      * @param config Config
      */
-    public NickList(final ChannelFrame frame, final AggregateConfigProvider config) {
+    public NickList(final ChannelFrame frame, final AggregateConfigProvider config,
+            final ColourManagerFactory colourManagerFactory) {
         this.frame = frame;
         this.config = config;
-        this.colourManager = new ColourManager(config);
+        this.colourManager = colourManagerFactory.getColourManager(config);
 
         nickList = new JList<>();
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -66,6 +66,10 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
     private static final long serialVersionUID = 6;
     /** Frame parent. */
     private final TextFrame parent;
+    /** Colour Manager. */
+    private final ColourManager colourManager;
+    /** Config to read from. */
+    private final AggregateConfigProvider config;
     /** Close button. */
     private ImageButton<Object> closeButton;
     /** Next match button. */
@@ -92,10 +96,13 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
      * @param iconManager Icon manager to retrieve icons from
      */
     public SwingSearchBar(final TextFrame newParent,
-            final IconManager iconManager) {
+            final IconManager iconManager,
+            final ColourManager colourManager) {
         listeners = new ListenerList();
 
         this.parent = newParent;
+        this.config = parent.getContainer().getConfigManager();
+        this.colourManager = colourManager;
 
         getInputMap(JComponent.WHEN_FOCUSED).
                 put(KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0), "searchAction");
@@ -394,7 +401,6 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
     /** Sets the colours used in this document. */
     private void setColours() {
         final AggregateConfigProvider config = parent.getContainer().getConfigManager();
-        final ColourManager colourManager = new ColourManager(config);
 
         searchBox.setForeground(UIUtilities.convertColour(
                 colourManager.getColourFromString(

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -40,6 +40,7 @@ import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -109,7 +110,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         this.dialogProvider = dialogProvider;
         this.channel = owner;
 
-        initComponents(topicBarFactory);
+        initComponents(topicBarFactory, deps.colourManagerFactory);
 
         globalConfig.addChangeListener("ui", "channelSplitPanePosition", this);
         globalConfig.addChangeListener(domain, "shownicklist", this);
@@ -123,12 +124,14 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * Initialises the components in this frame.
      *
      * @param topicBarFactory The factory to use to produce topic bars.
+     * @param colourManagerFactory The colour manager factory
      */
-    private void initComponents(final TopicBarFactory topicBarFactory) {
+    private void initComponents(final TopicBarFactory topicBarFactory,
+            final ColourManagerFactory colourManagerFactory) {
         topicBar = topicBarFactory.getTopicBar((Channel) getContainer(), this,
                 getContainer().getIconManager());
 
-        nicklist = new NickList(this, getContainer().getConfigManager());
+        nicklist = new NickList(this, getContainer().getConfigManager(), colourManagerFactory);
         settingsMI = new JMenuItem("Settings");
         settingsMI.addActionListener(this);
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -40,7 +40,6 @@ import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.InputHandler;
-import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.BorderLayout;
 import java.awt.Point;
@@ -71,8 +70,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     private static final long serialVersionUID = 3;
     /** Config provider for this frame. */
     private final AggregateConfigProvider config;
-    /** Colour manager for this frame. */
-    private final ColourManager colourManager;
     /** Input field panel. */
     protected JPanel inputPanel;
     /** The InputHandler for our input field. */
@@ -114,7 +111,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         super(owner, owner.getCommandParser(), deps);
 
         config = owner.getConfigManager();
-        colourManager = new ColourManager(config);
         parentWindow = deps.mainWindow;
         pluginManager = deps.pluginManager;
         pasteDialogFactory = deps.pasteDialog;

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -60,6 +60,7 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Point;
 import java.awt.Window;
@@ -94,6 +95,8 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
     private static final long serialVersionUID = 5;
     /** The channel object that owns this frame. */
     protected final FrameContainer frameParent;
+    /** Colour manager. */
+    protected final ColourManager colourManager;
     /** Frame output pane. */
     private TextPane textPane;
     /** search bar. */
@@ -135,10 +138,11 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
         this.eventBus = deps.eventBus;
         this.commandParser = commandParser;
         this.clipboard = deps.clipboard;
+        this.colourManager = deps.colourManagerFactory.getColourManager(owner.getConfigManager());
 
         final AggregateConfigProvider config = owner.getConfigManager();
 
-        initComponents(deps.textPaneFactory);
+        initComponents(deps.textPaneFactory, colourManager);
         setFocusable(true);
 
         getTextPane().addTextPaneListener(this);
@@ -225,10 +229,11 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
     /**
      * Initialises the components for this frame.
      */
-    private void initComponents(final TextPaneFactory textPaneFactory) {
+    private void initComponents(final TextPaneFactory textPaneFactory,
+            final ColourManager colourManager) {
         setTextPane(textPaneFactory.getTextPane(this));
 
-        searchBar = new SwingSearchBar(this, iconManager);
+        searchBar = new SwingSearchBar(this, iconManager, colourManager);
         searchBar.setVisible(false);
 
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
@@ -523,7 +528,6 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
      * Updates colour settings from their config values.
      */
     private void updateColours() {
-        final ColourManager colourManager = new ColourManager(getContainer().getConfigManager());
         getTextPane().setForeground(UIUtilities.convertColour(
                 colourManager.getColourFromString(
                         getContainer().getConfigManager().getOptionString(
@@ -560,6 +564,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
         final ActiveFrameManager activeFrameManager;
         final Clipboard clipboard;
         final CommandController commandController;
+        final ColourManagerFactory colourManagerFactory;
 
         @Inject
         public TextFrameDependencies(
@@ -574,7 +579,8 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
                 @GlobalConfig final AggregateConfigProvider globalConfig,
                 final ActiveFrameManager activeFrameManager,
                 final Clipboard clipboard,
-                final CommandController commandController) {
+                final CommandController commandController,
+                final ColourManagerFactory colourManagerFactory) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
             this.mainWindow = mainWindow;
@@ -587,6 +593,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
             this.activeFrameManager = activeFrameManager;
             this.clipboard = clipboard;
             this.commandController = commandController;
+            this.colourManagerFactory = colourManagerFactory;
         }
 
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

@@ -27,6 +27,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.KeyboardFocusManager;
 import java.awt.event.ActionEvent;
@@ -49,6 +50,8 @@ public class TextAreaInputField extends JTextArea implements InputField,
     protected ColourPickerDialog colourPicker;
     /** Icon manager. */
     private final IconManager iconManager;
+    /** Colour manager. */
+    private final ColourManager colourManager;
     /** Global config. */
     private final AggregateConfigProvider config;
 
@@ -61,10 +64,12 @@ public class TextAreaInputField extends JTextArea implements InputField,
      * @param columns     The number of columns to use
      */
     public TextAreaInputField(final IconManager iconManager,
-            final AggregateConfigProvider config, final int rows, final int columns) {
+            final ColourManagerFactory colourManagerFactory, final AggregateConfigProvider config,
+            final int rows, final int columns) {
         super(rows, columns);
         this.iconManager = iconManager;
         this.config = config;
+        colourManager = colourManagerFactory.getColourManager(config);
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener(this);
     }
@@ -77,10 +82,12 @@ public class TextAreaInputField extends JTextArea implements InputField,
      * @param text        The text to contain initially
      */
     public TextAreaInputField(final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config, final String text) {
         super(text);
         this.iconManager = iconManager;
         this.config = config;
+        colourManager = colourManagerFactory.getColourManager(config);
         KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .addPropertyChangeListener(this);
     }
@@ -99,7 +106,7 @@ public class TextAreaInputField extends JTextArea implements InputField,
     public void showColourPicker(final boolean irc, final boolean hex) {
         if (config.getOptionBool("general", "showcolourdialog")) {
             colourPicker = new ColourPickerDialog(TextAreaInputField.this,
-                    new ColourManager(config), iconManager, irc, hex);
+                    colourManager, iconManager, irc, hex);
             colourPicker.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(final ActionEvent actionEvent) {

ui_swing/src/com/dmdirc/addons/ui_swing/components/performpanel/PerformPanel.java

@@ -27,6 +27,7 @@ import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -71,9 +72,11 @@ public class PerformPanel extends JPanel {
      */
     public PerformPanel(
             final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
             final PerformWrapper performWrapper) {
-        this(iconManager, config, performWrapper, Collections.<PerformDescription>emptyList());
+        this(iconManager, colourManagerFactory, config, performWrapper,
+                Collections.<PerformDescription>emptyList());
     }
 
     /**
@@ -89,6 +92,7 @@ public class PerformPanel extends JPanel {
      */
     public PerformPanel(
             final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
             final PerformWrapper performWrapper,
             final Collection<PerformDescription> performs) {
@@ -99,7 +103,7 @@ public class PerformPanel extends JPanel {
             addPerform(perform);
         }
         setLayout(new MigLayout("ins 0, fill"));
-        performSpace = new TextAreaInputField(iconManager, config, "");
+        performSpace = new TextAreaInputField(iconManager, colourManagerFactory, config, "");
         add(new JScrollPane(performSpace), "grow, push");
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialog.java

@@ -30,6 +30,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -94,6 +95,7 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
      */
     public ActionEditorDialog(
             final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
             final ActionSubstitutorFactory subsFactory,
             final ActionFactory actionFactory,
@@ -108,7 +110,7 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
         this.action = null;
         this.actionFactory = actionFactory;
 
-        initComponents(iconManager, config, subsFactory);
+        initComponents(iconManager, config, subsFactory, colourManagerFactory);
         addListeners();
         doComponents();
         layoutComponents();
@@ -128,6 +130,7 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
      */
     public ActionEditorDialog(
             final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
             final ActionSubstitutorFactory subsFactory,
             final ActionFactory actionFactory,
@@ -142,7 +145,7 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
         this.action = action;
         this.actionFactory = actionFactory;
 
-        initComponents(iconManager, config, subsFactory);
+        initComponents(iconManager, config, subsFactory, colourManagerFactory);
         addListeners();
         doComponents();
         layoutComponents();
@@ -179,11 +182,12 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
 
     /** Initialises the components. */
     private void initComponents(final IconManager iconManager,
-            final AggregateConfigProvider config, final ActionSubstitutorFactory subsFactory) {
+            final AggregateConfigProvider config, final ActionSubstitutorFactory subsFactory,
+            final ColourManagerFactory colourManagerFactory) {
         orderButtons(new JButton(), new JButton());
         name = new ActionNamePanel(iconManager, "", group);
         triggers = new ActionTriggersPanel(iconManager);
-        response = new ActionResponsePanel(iconManager, config);
+        response = new ActionResponsePanel(iconManager, colourManagerFactory, config);
         conditions = new ActionConditionsPanel(iconManager);
         substitutions = new ActionSubstitutionsPanel(subsFactory);
         advanced = new ActionAdvancedPanel();

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialogFactory.java

@@ -29,6 +29,7 @@ import com.dmdirc.actions.ActionSubstitutorFactory;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -43,31 +44,34 @@ public class ActionEditorDialogFactory {
     private final AggregateConfigProvider config;
     private final ActionSubstitutorFactory subsFactory;
     private final ActionFactory actionFactory;
+    private final ColourManagerFactory colourManagerFactory;
 
     @Inject
     public ActionEditorDialogFactory(
             @ClientModule.GlobalConfig final IconManager iconManager,
             @ClientModule.GlobalConfig final AggregateConfigProvider config,
             final ActionSubstitutorFactory subsFactory,
-            final ActionFactory actionFactory) {
+            final ActionFactory actionFactory,
+            final ColourManagerFactory colourManagerFactory) {
         this.iconManager = iconManager;
         this.config = config;
         this.subsFactory = subsFactory;
         this.actionFactory = actionFactory;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     public ActionEditorDialog getActionEditorDialog(
             final ActionsManagerDialog parentWindow,
             final String group) {
-        return new ActionEditorDialog(iconManager, config, subsFactory, actionFactory,
-                parentWindow, group);
+        return new ActionEditorDialog(iconManager, colourManagerFactory, config, subsFactory,
+                actionFactory, parentWindow, group);
     }
 
     public ActionEditorDialog getActionEditorDialog(
             final ActionsManagerDialog parentWindow,
             final Action action) {
-        return new ActionEditorDialog(iconManager, config, subsFactory, actionFactory,
-                parentWindow, action);
+        return new ActionEditorDialog(iconManager, colourManagerFactory, config, subsFactory,
+                actionFactory, parentWindow, action);
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionResponsePanel.java

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.util.TreeSet;
 
@@ -60,21 +61,16 @@ public class ActionResponsePanel extends JPanel {
      * @param iconManager Icon manager
      * @param config      Config
      */
-    public ActionResponsePanel(final IconManager iconManager, final AggregateConfigProvider config) {
-
-
-        initComponents(iconManager, config);
+    public ActionResponsePanel(final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory, final AggregateConfigProvider config) {
+        initComponents(iconManager, colourManagerFactory, config);
         addListeners();
         layoutComponents();
     }
 
-    /**
-     * Initialises the components.
-     *
-     * @param controller Swing controller
-     */
-    private void initComponents(final IconManager iconManager, final AggregateConfigProvider config) {
-        response = new TextAreaInputField(iconManager, config, "");
+    private void initComponents(final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory, final AggregateConfigProvider config) {
+        response = new TextAreaInputField(iconManager, colourManagerFactory, config, "");
         scrollPane = new JScrollPane(response);
         response.setRows(4);
         formatter = new JComboBox<>(new DefaultComboBoxModel<String>());

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -36,6 +36,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -88,6 +89,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     private final CommandController commandController;
     /** The event bus to post errors to. */
     private final DMDircMBassador eventBus;
+    /** Colour manager factory. */
+    private final ColourManagerFactory colourManagerFactory;
 
     /**
      * Creates a new instance of ChannelSettingsDialog.
@@ -115,7 +118,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.userConfig = checkNotNull(userConfig);
@@ -126,6 +130,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
         this.clipboard = clipboard;
         this.commandController = checkNotNull(commandController);
         this.eventBus = eventBus;
+        this.colourManagerFactory = colourManagerFactory;
 
         identity = identityFactory.createChannelConfig(channel.getConnection().getNetwork(),
                 channel.getChannelInfo().getName());
@@ -167,7 +172,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     private void initTopicTab() {
         topicModesPane = new TopicPane(channel, channel.getIconManager(),
                 commandController, serviceManager,
-                this, channelWindow, clipboard, eventBus);
+                this, channelWindow, clipboard, eventBus, colourManagerFactory);
         tabbedPane.addTab("Topic", topicModesPane);
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -35,6 +35,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import com.google.common.base.Optional;
 
@@ -94,7 +95,8 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
     public TopicDisplayPane(final Channel channel, final IconManager iconManager,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
-            final CommandController commandController, final DMDircMBassador eventBus) {
+            final CommandController commandController, final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         this.clipboard = clipboard;
         this.channel = channel;
         this.parent = parent;
@@ -102,7 +104,8 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         this.channelWindow = channelWindow;
         this.eventBus = eventBus;
 
-        initComponents(iconManager, channel.getConfigManager(), serviceManager, commandController);
+        initComponents(iconManager, channel.getConfigManager(), serviceManager, commandController,
+                colourManagerFactory);
         addListeners();
         layoutComponents();
 
@@ -113,9 +116,10 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
             final IconManager iconManager,
             final AggregateConfigProvider config,
             final ServiceManager serviceManager,
-            final CommandController commandController) {
+            final CommandController commandController,
+            final ColourManagerFactory colourManagerFactory) {
         topicLengthLabel = new JLabel();
-        topicText = new TextAreaInputField(iconManager, config, 100, 4);
+        topicText = new TextAreaInputField(iconManager, colourManagerFactory, config, 100, 4);
         topicWho = new TextLabel();
         topicWho.setOpaque(false);
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import com.google.common.base.Optional;
 
@@ -74,7 +75,8 @@ public class TopicPane extends JPanel implements ActionListener {
             final CommandController commandController,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.channel = channel;
         this.parent = parent;
@@ -84,7 +86,7 @@ public class TopicPane extends JPanel implements ActionListener {
         setVisible(false);
 
         removeAll();
-        initTopicsPanel(iconManager, serviceManager, commandController, eventBus);
+        initTopicsPanel(iconManager, serviceManager, commandController, eventBus, colourManagerFactory);
         layoutComponents();
 
         topicHistoryPane.addActionListener(this);
@@ -96,9 +98,10 @@ public class TopicPane extends JPanel implements ActionListener {
             final IconManager iconManager,
             final ServiceManager serviceManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         topicDisplayPane = new TopicDisplayPane(channel, iconManager, serviceManager, parent,
-                channelWindow, clipboard, commandController, eventBus);
+                channelWindow, clipboard, commandController, eventBus, colourManagerFactory);
         topicHistoryPane = new TopicHistoryPane(channel);
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -33,6 +33,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -99,7 +100,8 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
             final DMDircMBassador eventBus,
             final InputTextFrame newParent,
             final String text,
-            final Window parentWindow) {
+            final Window parentWindow,
+            final ColourManagerFactory colourManagerFactory) {
         super(parentWindow, ModalityType.MODELESS);
 
         parent = newParent;
@@ -109,7 +111,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         this.pluginManager = pluginManager;
         this.commandController = commandController;
 
-        initComponents(eventBus, text);
+        initComponents(eventBus, text, colourManagerFactory);
         initListeners();
 
         setFocusTraversalPolicy(new PasteDialogFocusTraversalPolicy(
@@ -125,9 +127,10 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
      *
      * @param text text to show in the dialog
      */
-    private void initComponents(final DMDircMBassador eventBus, final String text) {
+    private void initComponents(final DMDircMBassador eventBus, final String text,
+            final ColourManagerFactory colourManagerFactory) {
         scrollPane = new JScrollPane();
-        textField = new TextAreaInputField(iconManager, config, text);
+        textField = new TextAreaInputField(iconManager, colourManagerFactory, config, text);
         editButton = new JButton("Edit");
         infoLabel = new TextLabel();
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialogFactory.java

@@ -29,6 +29,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
 
@@ -46,6 +47,7 @@ public class PasteDialogFactory {
     private final PluginManager pluginManager;
     private final CommandController commandController;
     private final DMDircMBassador eventBus;
+    private final ColourManagerFactory colourManagerFactory;
 
     @Inject
     public PasteDialogFactory(
@@ -53,18 +55,20 @@ public class PasteDialogFactory {
             @ClientModule.GlobalConfig final AggregateConfigProvider config,
             final PluginManager pluginManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         this.iconManager = iconManager;
         this.config = config;
         this.pluginManager = pluginManager;
         this.commandController = commandController;
         this.eventBus = eventBus;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     public PasteDialog getPasteDialog(final InputTextFrame newParent, final String text,
             final Window parentWindow) {
         return new PasteDialog(iconManager, config, pluginManager, commandController, eventBus,
-                newParent, text, parentWindow);
+                newParent, text, parentWindow, colourManagerFactory);
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/serversetting/PerformTab.java

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.renderers.PerformRenderer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -69,6 +70,7 @@ public class PerformTab extends JPanel implements ActionListener {
      */
     public PerformTab(
             final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
             final PerformWrapper wrapper,
             final Connection connection) {
@@ -77,7 +79,7 @@ public class PerformTab extends JPanel implements ActionListener {
         this.connection = connection;
 
         setOpaque(UIUtilities.getTabbedPaneOpaque());
-        initComponents(iconManager, config);
+        initComponents(iconManager, colourManagerFactory, config);
         addListeners();
     }
 
@@ -88,6 +90,7 @@ public class PerformTab extends JPanel implements ActionListener {
      * @param config      Config to read settings from
      */
     private void initComponents(final IconManager iconManager,
+            final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config) {
         setLayout(new MigLayout("fill"));
 
@@ -119,7 +122,8 @@ public class PerformTab extends JPanel implements ActionListener {
         performList.add(serverPerform);
         performList.add(serverProfilePerform);
 
-        performPanel = new PerformPanel(iconManager, config, wrapper, performList);
+        performPanel = new PerformPanel(iconManager, colourManagerFactory, config, wrapper,
+                performList);
         performPanel.switchPerform(networkPerform);
         add(performPanel, "grow, push");
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -34,6 +34,7 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -83,7 +84,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final Connection connection,
-            final Window parentWindow) {
+            final Window parentWindow,
+            final ColourManagerFactory colourManagerFactory) {
         super(parentWindow, ModalityType.MODELESS);
         this.connection = connection;
         this.performWrapper = performWrapper;
@@ -92,7 +94,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
         setTitle("Server settings");
         setResizable(false);
 
-        initComponents(parentWindow, connection.getWindowModel().getConfigManager(), compFactory);
+        initComponents(parentWindow, connection.getWindowModel().getConfigManager(), compFactory,
+                colourManagerFactory);
         initListeners();
     }
 
@@ -106,7 +109,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
     private void initComponents(
             final Window parentWindow,
             final AggregateConfigProvider config,
-            final PrefsComponentFactory compFactory) {
+            final PrefsComponentFactory compFactory,
+            final ColourManagerFactory colourManagerFactory) {
         orderButtons(new JButton(), new JButton());
 
         tabbedPane = new JTabbedPane();
@@ -116,8 +120,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
         ignoreList = new IgnoreListPanel(connection.getWindowModel().getIconManager(),
                 connection, parentWindow);
 
-        performPanel = new PerformTab(connection.getWindowModel().getIconManager(), config,
-                performWrapper, connection);
+        performPanel = new PerformTab(connection.getWindowModel().getIconManager(),
+                colourManagerFactory, config, performWrapper, connection);
 
         settingsPanel = new SettingsPanel(connection.getWindowModel().getIconManager(), compFactory,
                 "These settings are specific to this network, any settings specified here will "

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewTreeCellRenderer.java

@@ -77,7 +77,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
         this.config = config;
         this.colourManager = colourManager;
 
-        styliser = new Styliser(null, config);
+        styliser = new Styliser(null, config, colourManager);
 
         setColours();
 

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -55,6 +55,7 @@ import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
 import com.dmdirc.ui.core.feedback.CoreFeedbackDialogModel;
 import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -156,12 +157,13 @@ public class DialogModule {
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
-            @MainWindow final Window parentWindow) {
+            @MainWindow final Window parentWindow,
+            final ColourManagerFactory colourManagerFactory) {
         return new KeyedDialogProvider<Connection, ServerSettingsDialog>() {
             @Override
             protected ServerSettingsDialog getInstance(final Connection key) {
                 return new ServerSettingsDialog(preferencesManager, compFactory, performWrapper,
-                        key, parentWindow);
+                        key, parentWindow, colourManagerFactory);
             }
         };
     }
@@ -178,13 +180,14 @@ public class DialogModule {
             @MainWindow final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final ColourManagerFactory colourManagerFactory) {
         return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
             @Override
             protected ChannelSettingsDialog getInstance(final Channel key) {
                 return new ChannelSettingsDialog(identityFactory, windowFactory,
-                        userConfig, serviceManager, preferencesManager,
-                        compFactory, key, parentWindow, clipboard, commandController, eventBus);
+                        userConfig, serviceManager, preferencesManager, compFactory, key,
+                        parentWindow, clipboard, commandController, eventBus, colourManagerFactory);
             }
         };
     }