Add a qualifier for ColourManager.

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

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourManager.java

@@ -69,7 +69,7 @@ public class NickColourManager implements ConfigChangeListener {
     private boolean setnicklist;
 
     @Inject
-    public NickColourManager(final ColourManager colourManager,
+    public NickColourManager(@GlobalConfig final ColourManager colourManager,
             @PluginDomain(NickColourPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig, final DMDircMBassador eventBus) {
         this.domain = domain;

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -88,7 +88,8 @@ public class NickColourPanel extends JPanel implements ActionListener,
      */
     public NickColourPanel(
             final Window parentWindow, final IconManager iconManager,
-            final ColourManager colourManager, final ConfigProvider userSettings,
+            final ColourManager colourManager,
+            final ConfigProvider userSettings,
             final AggregateConfigProvider config, final String domain) {
         this.parentWindow = parentWindow;
         this.iconManager = iconManager;

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -56,7 +56,8 @@ public class NickColourPlugin extends BasePlugin {
     private NickColourManager nickColourManager;
 
     public NickColourPlugin(final PluginInfo pluginInfo, final SwingController controller,
-            final IconManager iconManager, final ColourManager colourManager) {
+            final IconManager iconManager,
+            final ColourManager colourManager) {
         this.pluginInfo = pluginInfo;
         this.mainWindow = controller.getMainFrame();
         this.iconManager = iconManager;

ui_swing/src/com/dmdirc/addons/ui_swing/PrefsComponentFactory.java

@@ -90,7 +90,7 @@ public final class PrefsComponentFactory {
     public PrefsComponentFactory(
             final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager,
-            final ColourManager colourManager) {
+            @GlobalConfig final ColourManager colourManager) {
         this.iconManager = iconManager;
         this.colourManager = colourManager;
         this.eventBus = eventBus;

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

@@ -32,7 +32,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 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.Window;
 import java.awt.datatransfer.Clipboard;
@@ -52,7 +52,7 @@ public class TopicBarFactory {
     private final Provider<Window> parentWindow;
     private final AggregateConfigProvider globalConfig;
     private final String domain;
-    private final ColourManager colourManager;
+    private final ColourManagerFactory colourManagerFactory;
     private final PluginManager pluginManager;
     private final Clipboard clipboard;
     private final CommandController commandController;
@@ -63,7 +63,7 @@ public class TopicBarFactory {
             @MainWindow final Provider<Window> parentWindow,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SwingController.class) final String domain,
-            final ColourManager colourManager,
+            final ColourManagerFactory colourManagerFactory,
             final PluginManager pluginManager,
             final Clipboard clipboard,
             final CommandController commandController,
@@ -71,7 +71,7 @@ public class TopicBarFactory {
         this.parentWindow = parentWindow;
         this.globalConfig = globalConfig;
         this.domain = domain;
-        this.colourManager = colourManager;
+        this.colourManagerFactory = colourManagerFactory;
         this.pluginManager = pluginManager;
         this.clipboard = clipboard;
         this.commandController = commandController;
@@ -82,8 +82,10 @@ public class TopicBarFactory {
             final Channel channel,
             final ChannelFrame window,
             final IconManager iconManager) {
-        return new TopicBar(parentWindow.get(), globalConfig, domain, colourManager, pluginManager,
-                clipboard, commandController, channel, window, iconManager, eventBus);
+        return new TopicBar(parentWindow.get(), globalConfig, domain,
+                colourManagerFactory.getColourManager(channel.getConfigManager()),
+                pluginManager, clipboard, commandController, channel, window, iconManager,
+                eventBus);
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerDialog.java

@@ -74,7 +74,8 @@ public class ColourPickerDialog extends JDialog {
      * @since 0.6
      */
     public ColourPickerDialog(final Component centerObject,
-            final ColourManager colourManager, final IconManager iconManager,
+            final ColourManager colourManager,
+            final IconManager iconManager,
             final boolean showIRC, final boolean showHex, final Window window) {
         super(window, ModalityType.MODELESS);
         this.centerObject = centerObject;

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

@@ -92,8 +92,8 @@ public class SwingInputField extends JComponent implements InputField,
             @MainWindow final Window mainWindow,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @GlobalConfig final IconManager iconManager,
-            final ColourManager colourManager) {
-
+            @GlobalConfig final ColourManager colourManager) {
+        // TODO: Add IconManagerFactory, use ColourManagerFactory and pass in the parent container
         this.parentWindow = mainWindow;
         this.globalConfig = globalConfig;
         this.iconManager = iconManager;

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

@@ -116,7 +116,8 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
     @Inject
     public TreeFrameManager(final WindowManager windowManager,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final ColourManager colourManager, final ActiveFrameManager activeFrameManager,
+            @GlobalConfig final ColourManager colourManager, final ActiveFrameManager
+            activeFrameManager,
             final SwingWindowFactory windowFactory,
             @PluginDomain(SwingController.class) final String domain,
             final DMDircMBassador eventBus, @SwingEventBus final DMDircMBassador swingEventBus) {