Add a qualifier for ColourManager.

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

src/com/dmdirc/ClientModule.java

@@ -180,7 +180,8 @@ public class ClientModule {
 
     @Provides
     @Singleton
-    public ColourManager getColourManager(final ColourManagerFactory colourManagerFactory,
+    @GlobalConfig
+    public ColourManager getGlobalColourManager(final ColourManagerFactory colourManagerFactory,
             @GlobalConfig final  AggregateConfigProvider globalConfig) {
         return colourManagerFactory.getColourManager(globalConfig);
     }

src/com/dmdirc/actions/ColourActionComparison.java

@@ -22,9 +22,10 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.ClientModule;
 import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.util.colours.Colour;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -47,7 +48,7 @@ public class ColourActionComparison {
      * @param colourManager The colour manager to use.
      */
     @Inject
-    public ColourActionComparison(final Provider<ColourManager> colourManager) {
+    public ColourActionComparison(@ClientModule.GlobalConfig final Provider<ColourManager> colourManager) {
         this.equalsComparison = new Equals();
         this.notEqualsComparison = new NotEquals();
         this.colourManager = colourManager;

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -35,10 +35,10 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.util.colours.Colour;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -54,18 +54,19 @@ public class SetNickColour extends Command implements IntelligentCommand {
             + "set the specified person's display colour",
             CommandType.TYPE_CHANNEL);
     /** Manager to use to convert colours. */
-    private final ColourManager colourManager;
+    private final ColourManagerFactory colourManagerFactory;
 
     /**
      * Creates a new instance of the {@link SetNickColour} command.
      *
-     * @param controller    The command controller that owns this command.
-     * @param colourManager The colour manager to use to convert colours.
+     * @param controller           The command controller that owns this command.
+     * @param colourManagerFactory The colour manager factory to use to convert colours.
      */
     @Inject
-    public SetNickColour(final CommandController controller, final ColourManager colourManager) {
+    public SetNickColour(final CommandController controller,
+            final ColourManagerFactory colourManagerFactory) {
         super(controller);
-        this.colourManager = colourManager;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     @Override
@@ -112,8 +113,8 @@ public class SetNickColour extends Command implements IntelligentCommand {
             channel.refreshClients();
         } else {
             // We're setting the colour
-            final Colour newColour = colourManager.getColourFromString(args.getArguments()[offset],
-                    null);
+            final Colour newColour = colourManagerFactory.getColourManager(origin.getConfigManager())
+                    .getColourFromString(args.getArguments()[offset], null);
             if (newColour == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "Invalid colour specified.");
                 return;

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

@@ -31,9 +31,9 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
+import com.dmdirc.util.colours.Colour;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -48,18 +48,19 @@ public class Notify extends Command implements IntelligentCommand {
             "notify <colour> - sets the notification colour for this window",
             CommandType.TYPE_GLOBAL);
     /** Manager to use to convert colours. */
-    private final ColourManager colourManager;
+    private final ColourManagerFactory colourManagerFactory;
 
     /**
      * Creates a new instance of the {@link Notify} command.
      *
-     * @param controller    The controller to use for command information.
-     * @param colourManager The colour manager to use to convert colours.
+     * @param controller           The controller to use for command information.
+     * @param colourManagerFactory The colour manager factory to use to convert colours.
      */
     @Inject
-    public Notify(final CommandController controller, final ColourManager colourManager) {
+    public Notify(final CommandController controller,
+            final ColourManagerFactory colourManagerFactory) {
         super(controller);
-        this.colourManager = colourManager;
+        this.colourManagerFactory = colourManagerFactory;
     }
 
     @Override
@@ -70,7 +71,8 @@ public class Notify extends Command implements IntelligentCommand {
             return;
         }
 
-        final Colour colour = colourManager.getColourFromString(args.getArguments()[0], null);
+        final Colour colour = colourManagerFactory.getColourManager(origin.getConfigManager())
+                .getColourFromString(args.getArguments()[0], null);
 
         if (colour == null) {
             showUsage(origin, args.isSilent(), "notify",

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

@@ -87,7 +87,7 @@ public class PluginInjectorInitialiser {
             final LifecycleController lifecycleController,
             final CorePluginExtractor corePluginExtractor,
             final URLBuilder urlBuilder,
-            final ColourManager colourManager,
+            @GlobalConfig final ColourManager colourManager,
             final ActionSubstitutorFactory actionSubstitutorFactory,
             final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager) {

src/com/dmdirc/ui/core/feedback/FeedbackSender.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.core.feedback;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusBar;
 import com.dmdirc.ui.StatusMessage;
@@ -44,7 +43,7 @@ public class FeedbackSender implements Runnable {
     private final Downloader downloader;
 
     public FeedbackSender(
-            @GlobalConfig final AggregateConfigProvider config,
+            final AggregateConfigProvider config,
             final Downloader downloader,
             final StatusBar statusBar,
             final String name,

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.ColourManagerFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,19 +34,24 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyChar;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SetNickColourTest {
 
     @Mock private Channel channel;
-    @Mock private ColourManager colourManager;
+    @Mock private ColourManagerFactory colourManagerFactory;
     @Mock private CommandController controller;
     private SetNickColour command;
 
     @Before
     public void setUp() {
-        command = new SetNickColour(controller, colourManager);
+        command = new SetNickColour(controller, colourManagerFactory);
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');
     }