Remove colour functions from the config provider.

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

src/com/dmdirc/config/BaseConfigProvider.java

@@ -23,9 +23,6 @@
 package com.dmdirc.config;
 
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
-import com.dmdirc.ui.Colour;
-import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.validators.ColourValidator;
 import com.dmdirc.util.validators.DisabledOptionValidator;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
@@ -37,8 +34,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Provider;
-
 /**
  * Defines methods to get options from a config provider in various forms.
  *
@@ -65,39 +60,6 @@ public abstract class BaseConfigProvider implements ReadOnlyConfigProvider {
     private static final Validator<String> INT_VALIDATOR
             = new OptionalValidator(new NumericalValidator(-1, -1));
 
-    /** A validator for colour settings. */
-    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 com.dmdirc.interfaces.config.ConfigProvider}.
-     *
-     * @param colourManager The colour manager to use to convert colours.
-     */
-    public BaseConfigProvider(final Provider<ColourManager> colourManager) {
-        this.colourManager = colourManager;
-    }
-
-    /**
-     * Creates a new instance of {@link com.dmdirc.interfaces.config.ConfigProvider} using the
-     * singleton colour manager.
-     *
-     * @deprecated Should pass in a {@link ColourManager}.
-     */
-    @Deprecated
-    public BaseConfigProvider() {
-        this(new Provider<ColourManager>() {
-            /** {@inheritDoc} */
-            @Override
-            public ColourManager get() {
-                return new ColourManager(IdentityManager.getIdentityManager().getGlobalConfiguration());
-            }
-        });
-    }
-
     /** {@inheritDoc} */
     @Override
     public String getOption(final String domain, final String option) {
@@ -138,12 +100,6 @@ public abstract class BaseConfigProvider implements ReadOnlyConfigProvider {
         return hasOptionString(domain, option);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public boolean hasOptionColour(final String domain, final String option) {
-        return hasOptionString(domain, option, COLOUR_VALIDATOR);
-    }
-
     /** {@inheritDoc} */
     @Override
     public boolean hasOptionBool(final String domain, final String option) {
@@ -187,15 +143,6 @@ public abstract class BaseConfigProvider implements ReadOnlyConfigProvider {
         return getOption(domain, option).charAt(0);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public Colour getOptionColour(final String domain, final String option,
-            final String ... fallbacks) {
-        final String value = getOptionString(domain, option, true, COLOUR_VALIDATOR, fallbacks);
-
-        return value == null ? null : colourManager.get().getColourFromString(value, null);
-    }
-
     /** {@inheritDoc} */
     @Override
     public boolean getOptionBool(final String domain, final String option) {

src/com/dmdirc/config/ConfigBinder.java

@@ -26,7 +26,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.Colour;
 import com.dmdirc.util.collections.MapList;
 
 import java.lang.reflect.AccessibleObject;
@@ -163,10 +162,6 @@ public class ConfigBinder {
             return manager.getOptionString(binding.domain(), binding.key(), binding.fallbacks());
         }
 
-        if (targetClass.equals(Colour.class)) {
-            return manager.getOptionColour(binding.domain(), binding.key(), binding.fallbacks());
-        }
-
         if (targetClass.equals(Boolean.class) || targetClass.equals(Boolean.TYPE)) {
             return manager.getOptionBool(binding.domain(), binding.key());
         }

src/com/dmdirc/interfaces/config/ReadOnlyConfigProvider.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces.config;
 
-import com.dmdirc.ui.Colour;
 import com.dmdirc.util.validators.Validator;
 
 import java.util.List;
@@ -84,18 +83,6 @@ public interface ReadOnlyConfigProvider {
      */
     char getOptionChar(String domain, String option);
 
-    /**
-     * Retrieves a colour representation of the specified option.
-     *
-     * @param domain The domain of the option
-     * @param option The name of the option
-     * @param fallbacks An ordered array of further domains and options
-     * (in pairs) to try if the specified domain/option isn't found
-     * @return The colour representation of the option
-     * @since 0.6.3m1
-     */
-    Colour getOptionColour(String domain, String option, String... fallbacks);
-
     /**
      * Retrieves an integral representation of the specified option.
      *
@@ -196,17 +183,6 @@ public interface ReadOnlyConfigProvider {
      */
     boolean hasOptionChar(String domain, String option);
 
-    /**
-     * Determines if this source has the specified colour option.
-     *
-     * @param domain The domain of the option
-     * @param option The name of the option
-     * @since 0.6.3m1
-     * @return True iff the option exists and is parsable as a colour,
-     * false otherwise.
-     */
-    boolean hasOptionColour(String domain, String option);
-
     /**
      * Determines if this source has the specified integer option.
      *

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

@@ -27,6 +27,7 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
+import com.dmdirc.util.validators.ColourValidator;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -78,9 +79,11 @@ public class ColourManager {
      * Initialises the IRC_COLOURS array.
      */
     private void initColours() {
+        final ColourValidator validator = new ColourValidator();
         for (int i = 0; i < 16; i++) {
-            if (configManager.hasOptionColour("colour", String.valueOf(i))) {
-                ircColours[i] = configManager.getOptionColour("colour", String.valueOf(i));
+            if (configManager.hasOptionString("colour", String.valueOf(i), validator)) {
+                ircColours[i] = getColourFromHex(
+                        configManager.getOptionString("colour", String.valueOf(i)));
                 colourCache.remove(String.valueOf(i));
             } else if (!ircColours[i].equals(DEFAULT_COLOURS[i])) {
                 ircColours[i] = DEFAULT_COLOURS[i];

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

@@ -173,8 +173,10 @@ public class Styliser implements ConfigChangeListener {
         configManager.addChangeListener("ui", "stylechannels", this);
         styleURIs = configManager.getOptionBool("ui", "stylelinks");
         styleChannels = configManager.getOptionBool("ui", "stylechannels");
-        uriColour = configManager.getOptionColour("ui", "linkcolour");
-        channelColour = configManager.getOptionColour("ui", "channelcolour");
+        uriColour = colourManager.getColourFromString(
+                configManager.getOptionString("ui", "linkcolour"), null);
+        channelColour = colourManager.getColourFromString(
+                configManager.getOptionString("ui", "channelcolour"), null);
     }
 
     /**
@@ -882,10 +884,12 @@ public class Styliser implements ConfigChangeListener {
                 styleChannels = configManager.getOptionBool("ui", "stylechannels");
                 break;
             case "linkcolour":
-                uriColour = configManager.getOptionColour("ui", "linkcolour");
+                uriColour = colourManager.getColourFromString(
+                        configManager.getOptionString("ui", "linkcolour"), null);
                 break;
             case "channelcolour":
-                channelColour = configManager.getOptionColour("ui", "channelcolour");
+                channelColour = colourManager.getColourFromString(
+                        configManager.getOptionString("ui", "channelcolour"), null);
                 break;
         }
     }

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

@@ -27,6 +27,7 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
+import com.dmdirc.util.validators.ColourValidator;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -138,19 +139,19 @@ public class ColourManagerTest {
 
     @Test
     public void testCustomColours() {
-        when(configManager.hasOptionColour("colour", "4")).thenReturn(true);
-        when(configManager.getOptionColour("colour", "4")).thenReturn(Colour.GREEN);
+        when(configManager.hasOptionString(eq("colour"), eq("4"), any(ColourValidator.class))).thenReturn(true);
+        when(configManager.getOptionString("colour", "4")).thenReturn("00FF00");
         configListener.getValue().configChanged("colour", "4");
         assertEquals("00ff00", ColourManager.getHex(manager.getColourFromIrcCode(4)).toLowerCase());
     }
 
     @Test
     public void testCustomColours2() {
-        when(configManager.hasOptionColour("colour", "4")).thenReturn(true);
-        when(configManager.getOptionColour("colour", "4")).thenReturn(Colour.GREEN);
+        when(configManager.hasOptionString(eq("colour"), eq("4"), any(ColourValidator.class))).thenReturn(true);
+        when(configManager.getOptionString("colour", "4")).thenReturn("00FF00");
         configListener.getValue().configChanged("colour", "4");
 
-        when(configManager.hasOptionColour("colour", "4")).thenReturn(false);
+        when(configManager.hasOptionString(eq("colour"), eq("4"), any(ColourValidator.class))).thenReturn(false);
         configListener.getValue().configChanged("colour", "4");
         assertEquals("ff0000", ColourManager.getHex(manager.getColourFromIrcCode(4)).toLowerCase());
     }