Tidy up some ColourManager refs and inject.

Change-Id: Ic3a60962dbfcebf195df000e38639619186c40b9
Reviewed-on: http://gerrit.dmdirc.com/2698
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/ClientModule.java

@@ -46,6 +46,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WarningDialog;
 import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.Version;
@@ -338,6 +339,20 @@ public class ClientModule {
         return wrapper;
     }
 
+    /**
+     * Gets the colour manager.
+     *
+     * @param controller The identity controller to read settings from.
+     * @return A colour manager for the client.
+     */
+    @Provides
+    @Singleton
+    public ColourManager getColourManager(final IdentityController controller) {
+        final ColourManager manager = new ColourManager(controller.getGlobalConfiguration());
+        ColourManager.setColourManager(manager);
+        return manager;
+    }
+
     /**
      * Called when the global config cannot be loaded due to an error. This
      * method informs the user of the problem and installs a new default config

src/com/dmdirc/commandparser/CommandLoader.java

@@ -71,6 +71,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.messages.ColourManager;
 
 import javax.inject.Inject;
 
@@ -94,6 +95,9 @@ public class CommandLoader {
     /** The action controller to pass to action-aware commands. */
     private final ActionController actionController;
 
+    /** The colour manager to pass to colourful commands. */
+    private final ColourManager colourManager;
+
     /**
      * Creates a new instance of {@link CommandLoader}.
      *
@@ -101,6 +105,7 @@ public class CommandLoader {
      * @param serverManager The server manager to pass to server-related commands.
      * @param pluginManager The plugin manager to pass to plugin-dependent commands.
      * @param identityManager The identity manager to pass to config-related commands.
+     * @param colourManager The colour manager to give to colourful commands.
      */
     @Inject
     public CommandLoader(
@@ -108,12 +113,14 @@ public class CommandLoader {
             final ServerManager serverManager,
             final PluginManager pluginManager,
             final IdentityManager identityManager,
-            final ActionController actionController) {
+            final ActionController actionController,
+            final ColourManager colourManager) {
         this.lifecycleController = lifecycleController;
         this.serverManager = serverManager;
         this.pluginManager = pluginManager;
         this.identityManager = identityManager;
         this.actionController = actionController;
+        this.colourManager = colourManager;
     }
 
     /**
@@ -133,7 +140,7 @@ public class CommandLoader {
         manager.registerCommand(new Mode(), Mode.INFO);
         manager.registerCommand(new Names(), Names.INFO);
         manager.registerCommand(new Part(), Part.INFO);
-        manager.registerCommand(new SetNickColour(), SetNickColour.INFO);
+        manager.registerCommand(new SetNickColour(colourManager), SetNickColour.INFO);
         manager.registerCommand(new ShowTopic(), ShowTopic.INFO);
 
         // Server commands
@@ -171,7 +178,7 @@ public class CommandLoader {
         manager.registerCommand(new Help(), Help.INFO);
         manager.registerCommand(new Ifplugin(pluginManager), Ifplugin.INFO);
         manager.registerCommand(new NewServer(serverManager, pluginManager, identityManager), NewServer.INFO);
-        manager.registerCommand(new Notify(), Notify.INFO);
+        manager.registerCommand(new Notify(colourManager), Notify.INFO);
         manager.registerCommand(new LoadPlugin(pluginManager), LoadPlugin.INFO);
         manager.registerCommand(new UnloadPlugin(pluginManager), UnloadPlugin.INFO);
         manager.registerCommand(new OpenWindow(), OpenWindow.INFO);

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

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.ui.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -50,6 +51,29 @@ 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;
+
+    /**
+     * Creates a new instance of the {@link SetNickColour} command.
+     *
+     * @param colourManager The colour manager to use to convert colours.
+     */
+    public SetNickColour(final ColourManager colourManager) {
+        this.colourManager = colourManager;
+    }
+
+    /**
+     * 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.
+     */
+    public SetNickColour(final CommandController controller, final ColourManager colourManager) {
+        super(controller);
+        this.colourManager = colourManager;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
@@ -94,7 +118,7 @@ public class SetNickColour extends Command implements IntelligentCommand {
             channel.refreshClients();
         } else {
             // We're setting the colour
-            final Colour newColour = ColourManager.parseColour(args.getArguments()[offset], null);
+            final Colour newColour = colourManager.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

@@ -45,6 +45,18 @@ 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;
+
+    /**
+     * Creates a new instance of the {@link Notify} command.
+     *
+     * @param colourManager The colour manager to use to convert colours.
+     */
+    public Notify(final ColourManager colourManager) {
+        this.colourManager = colourManager;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
@@ -54,7 +66,7 @@ public class Notify extends Command implements IntelligentCommand {
             return;
         }
 
-        final Colour colour = ColourManager.parseColour(args.getArguments()[0], null);
+        final Colour colour = colourManager.getColourFromString(args.getArguments()[0], null);
 
         if (colour == null) {
             showUsage(origin, args.isSilent(), "notify",

src/com/dmdirc/config/ConfigSource.java

@@ -36,6 +36,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.inject.Provider;
+
 /**
  * Defines methods to get options from a config source in various forms.
  * <p>
@@ -56,7 +58,7 @@ public abstract class ConfigSource {
 
     /** A permissive validator to use when callers don't specify one. */
     private static final Validator<String> PERMISSIVE_VALIDATOR
-            = new PermissiveValidator<String>();
+            = new PermissiveValidator<>();
 
     /** A validator for integer settings. */
     private static final Validator<String> INT_VALIDATOR
@@ -66,6 +68,29 @@ public abstract class ConfigSource {
     private static final Validator<String> COLOUR_VALIDATOR
             = new OptionalValidator(new ColourValidator());
 
+    /** Manager to use to convert colours. */
+    private final Provider<ColourManager> colourManager;
+
+    /**
+     * Creates a new instance of {@link ConfigSource}.
+     *
+     * @param colourManager The colour manager to use to convert colours.
+     */
+    public ConfigSource(final Provider<ColourManager> colourManager) {
+        this.colourManager = colourManager;
+    }
+
+    /**
+     * Creates a new instance of {@link ConfigSource} using the singleton
+     * colour manager.
+     *
+     * @deprecated Should pass in a {@link ColourManager}.
+     */
+    @Deprecated
+    public ConfigSource() {
+        this(ColourManager.getColourManagerProvider());
+    }
+
     /**
      * Retrieves the specified option from this config source.
      *
@@ -226,7 +251,7 @@ public abstract class ConfigSource {
 
         @SuppressWarnings("unchecked")
         final Validator<String> newValidator = required && fallbacks.length == 0
-                ? new ValidatorChain<String>(new DisabledOptionValidator(), validator)
+                ? new ValidatorChain<>(new DisabledOptionValidator(), validator)
                 : validator;
 
         if (!hasOption(domain, option, newValidator)
@@ -282,7 +307,7 @@ public abstract class ConfigSource {
             final String ... fallbacks) {
         final String value = getOptionString(domain, option, true, COLOUR_VALIDATOR, fallbacks);
 
-        return value == null ? null : ColourManager.parseColour(value, null);
+        return value == null ? null : colourManager.get().getColourFromString(value, null);
     }
 
     /**
@@ -306,7 +331,7 @@ public abstract class ConfigSource {
      */
     public List<String> getOptionList(final String domain, final String option,
             final boolean trimEmpty) {
-        final List<String> res = new ArrayList<String>();
+        final List<String> res = new ArrayList<>();
 
         if (hasOption(domain, option, PERMISSIVE_VALIDATOR)) {
             for (String line : getOption(domain, option).split("\n")) {

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

@@ -32,11 +32,13 @@ import com.dmdirc.ui.Colour;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Provider;
+
 /**
  * The colour manager manages the colour scheme for the IRC client. It allows
  * other components to use IRC colour codes instead of absolute colours.
  */
-public final class ColourManager {
+public class ColourManager {
 
     /** Default colours used for the standard 16 IRC colours. */
     private static final Colour[] DEFAULT_COLOURS = {
@@ -161,7 +163,7 @@ public final class ColourManager {
      */
     @Deprecated
     public static Colour parseColour(final String spec) {
-        return parseColour(spec, Colour.WHITE);
+        return instance.getColourFromString(spec, Colour.WHITE);
     }
 
     /**
@@ -268,6 +270,7 @@ public final class ColourManager {
      *
      * @return An instance of the colour manager.
      */
+    @Deprecated
     public static synchronized ColourManager getColourManager() {
         if (instance == null) {
             instance = new ColourManager(IdentityManager.getIdentityManager().getGlobalConfiguration());
@@ -276,4 +279,31 @@ public final class ColourManager {
         return instance;
     }
 
+    /**
+     * Gets a provider of a colour manager for use in the future.
+     *
+     * @return A colour manager provider
+     * @deprecated Should be injected instead.
+     */
+    @Deprecated
+    public static Provider<ColourManager> getColourManagerProvider() {
+        return new Provider<ColourManager>() {
+            /** {@inheritDoc} */
+            @Override
+            public ColourManager get() {
+                return instance;
+            }
+        };
+    }
+
+    /**
+     * Sets the singleton instance of the colour manager to use.
+     *
+     * @param colourManager The colour manager to use.
+     */
+    @Deprecated
+    public static void setColourManager(final ColourManager colourManager) {
+        instance = colourManager;
+    }
+
 }

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -31,6 +31,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.messages.ColourManager;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -68,7 +69,8 @@ public class HelpTest {
                 serverManager,
                 mock(PluginManager.class),
                 mock(IdentityManager.class),
-                mock(ActionController.class)).loadCommands(commandManager);
+                mock(ActionController.class),
+                mock(ColourManager.class)).loadCommands(commandManager);
 
         for (CommandType type : CommandType.values()) {
             for (CommandInfo command : commandManager.getCommands(type).keySet()) {

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

@@ -26,33 +26,36 @@ import com.dmdirc.Channel;
 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 org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class SetNickColourTest {
 
-    private Channel channel;
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-        TestMain.getTestMain();
-    }
+    @Mock private Channel channel;
+    @Mock private ColourManager colourManager;
+    @Mock private CommandController controller;
+    private SetNickColour command;
 
     @Before
     public void setUp() {
-        channel = mock(Channel.class);
+        command = new SetNickColour(controller, colourManager);
+        when(controller.getCommandChar()).thenReturn('/');
+        when(controller.getSilenceChar()).thenReturn('.');
     }
 
-    private final SetNickColour command = new SetNickColour();
-
     @Test
     public void testUsageNoArgs() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments("/foo"),
+        command.execute(tiw, new CommandArguments(controller, "/foo"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -61,7 +64,7 @@ public class SetNickColourTest {
     @Test
     public void testUsageNicklist() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments("/foo --nicklist"),
+        command.execute(tiw, new CommandArguments(controller, "/foo --nicklist"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
@@ -70,7 +73,7 @@ public class SetNickColourTest {
     @Test
     public void testUsageText() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        command.execute(tiw, new CommandArguments("/foo --text"),
+        command.execute(tiw, new CommandArguments(controller, "/foo --text"),
                 new ChannelCommandContext(null, SetNickColour.INFO, channel));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());