Move Colour to utils.

Change-Id: Icb4de047bfada18231b66011838958974282a322
Depends-On: I73c10f367e5972031d1c9b0871c4cb9043008bec
Depends-On: Ibf9936e6cf89ebbe1243e1c32596bc726bebc5ce
Reviewed-on: http://gerrit.dmdirc.com/3860
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/Channel.java

@@ -38,16 +38,16 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;
+import com.dmdirc.util.colours.Colour;
+import com.dmdirc.util.colours.ColourUtils;
 
 import com.google.common.base.Optional;
 
@@ -431,10 +431,10 @@ public class Channel extends MessageTarget implements GroupChat {
                 final String prefix;
 
                 if (map.containsKey(ChannelClientProperty.TEXT_BACKGROUND)) {
-                    prefix = ',' + ColourManager.getHex((Colour) map.get(
+                    prefix = ',' + ColourUtils.getHex((Colour) map.get(
                             ChannelClientProperty.TEXT_BACKGROUND));
                 } else {
-                    prefix = Styliser.CODE_HEXCOLOUR + ColourManager.getHex((Colour) map.get(
+                    prefix = Styliser.CODE_HEXCOLOUR + ColourUtils.getHex((Colour) map.get(
                             ChannelClientProperty.TEXT_FOREGROUND));
                 }
 

src/com/dmdirc/FrameContainer.java

@@ -37,7 +37,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CompositionState;
-import com.dmdirc.ui.Colour;
+import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.Formatter;

src/com/dmdirc/actions/ColourActionComparison.java

@@ -23,7 +23,7 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.ui.Colour;
+import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.messages.ColourManager;
 
 import javax.inject.Inject;

src/com/dmdirc/actions/CoreActionComponent.java

@@ -33,7 +33,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.ui.Colour;
+import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.event.KeyEvent;

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

@@ -35,7 +35,7 @@ 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.util.colours.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.ColourManager;

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

@@ -31,7 +31,7 @@ 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.ui.Colour;
+import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.ColourManager;
 

src/com/dmdirc/events/DisplayProperty.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.ui.Colour;
+import com.dmdirc.util.colours.Colour;
 
 /**
  * Describes a property that may be set on a {@link DisplayableEvent} to affect its display.

src/com/dmdirc/events/NotificationSetEvent.java

@@ -23,7 +23,7 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.ui.Colour;
+import com.dmdirc.util.colours.Colour;
 
 /**
  * Fired when the notification colour has been changed.

src/com/dmdirc/ui/Colour.java

@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui;
-
-/**
- * A colour represented by an RGB triple. This implementation is immutable.
- */
-public class Colour {
-
-    /** The colour white. */
-    public static final Colour WHITE = new Colour(255, 255, 255);
-    /** The colour light gray. */
-    public static final Colour LIGHT_GRAY = new Colour(192, 192, 192);
-    /** The colour gray. */
-    public static final Colour GRAY = new Colour(128, 128, 128);
-    /** The colour dark gray. */
-    public static final Colour DARK_GRAY = new Colour(64, 64, 64);
-    /** The colour black. */
-    public static final Colour BLACK = new Colour(0, 0, 0);
-    /** The colour red. */
-    public static final Colour RED = new Colour(255, 0, 0);
-    /** The colour pink. */
-    public static final Colour PINK = new Colour(255, 175, 175);
-    /** The colour orange. */
-    public static final Colour ORANGE = new Colour(255, 200, 0);
-    /** The colour yellow. */
-    public static final Colour YELLOW = new Colour(255, 255, 0);
-    /** The colour green. */
-    public static final Colour GREEN = new Colour(0, 255, 0);
-    /** The colour magenta. */
-    public static final Colour MAGENTA = new Colour(255, 0, 255);
-    /** The colour cyan. */
-    public static final Colour CYAN = new Colour(0, 255, 255);
-    /** The colour blue. */
-    public static final Colour BLUE = new Colour(0, 0, 255);
-    /** The intensity of the red component of this colour (0-255). */
-    private final int red;
-    /** The intensity of the green component of this colour (0-255). */
-    private final int green;
-    /** The intensity of the blue component of this colour (0-255). */
-    private final int blue;
-
-    /**
-     * Creates a new Colour instance with the given RGB values.
-     *
-     * @param red   The intensity of the red component of the colour (0-255).
-     * @param green The intensity of the green component of the colour (0-255).
-     * @param blue  The intensity of the blue component of the colour (0-255).
-     */
-    public Colour(final int red, final int green, final int blue) {
-        this.red = red;
-        this.green = green;
-        this.blue = blue;
-    }
-
-    /**
-     * Gets the intensity of the blue component of this colour.
-     *
-     * @return The intensity on a scale of 0-255.
-     */
-    public int getBlue() {
-        return blue;
-    }
-
-    /**
-     * Gets the intensity of the green component of this colour.
-     *
-     * @return The intensity on a scale of 0-255.
-     */
-    public int getGreen() {
-        return green;
-    }
-
-    /**
-     * Gets the intensity of the red component of this colour.
-     *
-     * @return The intensity on a scale of 0-255.
-     */
-    public int getRed() {
-        return red;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-
-        final Colour other = (Colour) obj;
-
-        return this.red == other.getRed() && this.green == other.getGreen()
-                && this.blue == other.getBlue();
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 37 * hash + this.red;
-        hash = 37 * hash + this.green;
-        hash = 37 * hash + this.blue;
-        return hash;
-    }
-
-}

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

@@ -26,7 +26,7 @@ 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.colours.Colour;
 import com.dmdirc.util.validators.ColourValidator;
 
 import java.util.HashMap;
@@ -182,31 +182,4 @@ public class ColourManager {
         }
     }
 
-    /**
-     * Retrieves the hex representation of the specified colour.
-     *
-     * @param colour The colour to be parsed
-     *
-     * @return A 6-digit hex string representing the colour
-     */
-    public static String getHex(final Colour colour) {
-        final int r = colour.getRed();
-        final int g = colour.getGreen();
-        final int b = colour.getBlue();
-
-        return toHex(r) + toHex(g) + toHex(b);
-    }
-
-    /**
-     * Converts the specified integer (in the range 0-255) into a hex string.
-     *
-     * @param value The integer to convert
-     *
-     * @return A 2 char hex string representing the specified integer
-     */
-    private static String toHex(final int value) {
-        final String hex = Integer.toHexString(value);
-        return (hex.length() < 2 ? "0" : "") + hex;
-    }
-
 }

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

@@ -27,7 +27,7 @@ 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.colours.Colour;
 
 import java.awt.Color;
 import java.util.Locale;

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

@@ -26,7 +26,8 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 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.colours.Colour;
+import com.dmdirc.util.colours.ColourUtils;
 import com.dmdirc.util.validators.ColourValidator;
 
 import org.junit.Before;
@@ -130,19 +131,12 @@ public class ColourManagerTest {
         assertSame(result2, result3);
     }
 
-    @Test
-    public void testColourToHex() {
-        Colour c1 = manager.getColourFromHex("ab3400");
-
-        assertEquals("ab3400", ColourManager.getHex(c1).toLowerCase());
-    }
-
     @Test
     public void testCustomColours() {
         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());
+        assertEquals("00ff00", ColourUtils.getHex(manager.getColourFromIrcCode(4)).toLowerCase());
     }
 
     @Test
@@ -153,6 +147,6 @@ public class ColourManagerTest {
 
         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());
+        assertEquals("ff0000", ColourUtils.getHex(manager.getColourFromIrcCode(4)).toLowerCase());
     }
 }