Colour abstraction

Change-Id: I978e118b20c507cbc305d5ee5c6ecabf6d7454b8
Depends-On: I691b6dca615fd6a197712d9f11cedafdc9a8bc5d
Reviewed-on: http://gerrit.dmdirc.com/2188
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.nickcolours;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -59,7 +60,7 @@ public class ColourRenderer extends DefaultTableCellRenderer {
             final boolean hasFocus, final int row, final int column) {
         Color colour = null;
         if (value != null && !((String) value).isEmpty()) {
-            colour = ColourManager.parseColour((String) value, null);
+            colour = UIUtilities.convertColour(ColourManager.parseColour((String) value, null));
         }
 
         setHorizontalAlignment(CENTER);

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

@@ -119,7 +119,7 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
                 toLowerCase("*:" + client.getClient().getNickname());
 
         if (useowncolour && client.getClient().equals(myself)) {
-            final Color color = ColourManager.parseColour(owncolour);
+            final Color color = UIUtilities.convertColour(ColourManager.parseColour(owncolour));
             putColour(map, color, color);
         } else if (userandomcolour) {
             putColour(map, getColour(client.getClient().getNickname()), getColour(client.
@@ -141,10 +141,10 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
             Color nickColor = null;
 
             if (parts[0] != null) {
-                textColor = ColourManager.parseColour(parts[0], null);
+                textColor = UIUtilities.convertColour(ColourManager.parseColour(parts[0], null));
             }
             if (parts[1] != null) {
-                nickColor = ColourManager.parseColour(parts[1], null);
+                nickColor = UIUtilities.convertColour(ColourManager.parseColour(parts[1], null));
             }
 
             putColour(map, textColor, nickColor);
@@ -183,9 +183,9 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
             count += nick.charAt(i);
         }
 
-        count = count % randColours.length;
+        count %= randColours.length;
 
-        return ColourManager.parseColour(randColours[count]);
+        return UIUtilities.convertColour(ColourManager.parseColour(randColours[count]));
     }
 
     /**

src/com/dmdirc/addons/osd/OsdWindow.java

@@ -123,8 +123,9 @@ public class OsdWindow extends JDialog implements MouseListener,
 
         panel = new JPanel();
         panel.setBorder(new LineBorder(Color.BLACK));
-        panel.setBackground(IdentityManager.getGlobalConfig().getOptionColour(plugin.getDomain(),
-                "bgcolour"));
+        panel.setBackground(UIUtilities.convertColour(
+                IdentityManager.getGlobalConfig().getOptionColour(plugin.getDomain(),
+                "bgcolour")));
 
         final int width = IdentityManager.getGlobalConfig().getOptionInt(plugin.getDomain(),
                 "width");
@@ -132,8 +133,9 @@ public class OsdWindow extends JDialog implements MouseListener,
         setLayout(new MigLayout("wmin " + width + ", wmax " + width + ", ins rel, fill"));
 
         label = new JLabel(text);
-        label.setForeground(IdentityManager.getGlobalConfig().getOptionColour(plugin.getDomain(),
-                "fgcolour"));
+        label.setForeground(UIUtilities.convertColour(
+                IdentityManager.getGlobalConfig().getOptionColour(plugin.getDomain(),
+                "fgcolour")));
         label.setFont(label.getFont().deriveFont(
                 (float) IdentityManager.getGlobalConfig().getOptionInt(plugin.getDomain(),
                 "fontSize")));
@@ -254,7 +256,7 @@ public class OsdWindow extends JDialog implements MouseListener,
      * @param colour The background colour to use
      */
     public void setBackgroundColour(final String colour) {
-        panel.setBackground(ColourManager.parseColour(colour));
+        panel.setBackground(UIUtilities.convertColour(ColourManager.parseColour(colour)));
     }
 
     /**
@@ -263,7 +265,7 @@ public class OsdWindow extends JDialog implements MouseListener,
      * @param colour The foreground colour to use
      */
     public void setForegroundColour(final String colour) {
-        label.setForeground(ColourManager.parseColour(colour));
+        label.setForeground(UIUtilities.convertColour(ColourManager.parseColour(colour)));
     }
 
     /** {@inheritDoc} */

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

@@ -44,13 +44,13 @@ import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.ListenerList;
 import com.dmdirc.util.QueuedLinkedHashSet;
 import com.dmdirc.util.ReturnableThread;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
@@ -717,7 +717,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     /** {@inheritDoc} */
     @Override
     public void notificationSet(final FrameContainer window,
-            final Color colour) {
+            final Colour colour) {
         if (activeFrame.getContainer().equals(window)) {
             window.clearNotification();
         }

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

@@ -27,8 +27,10 @@ import com.dmdirc.addons.ui_swing.actions.UndoAction;
 import com.dmdirc.addons.ui_swing.components.DMDircUndoableEditListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.Colour;
 import com.dmdirc.util.ReturnableThread;
 
+import java.awt.Color;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -453,4 +455,36 @@ public final class UIUtilities {
     public static void addComboBoxWidthModifier(final JComboBox combo) {
         combo.addPopupMenuListener(new ComboBoxWidthModifier());
     }
+
+    /**
+     * Converts a DMDirc {@link Colour} into an AWT-specific {@link Color} by
+     * copying the values of the red, green and blue channels.
+     *
+     * @param colour The colour to be converted
+     * @return A corresponding AWT colour
+     */
+    public static Color convertColour(final Colour colour) {
+        return new Color(colour.getRed(), colour.getGreen(), colour.getBlue());
+    }
+
+    /**
+     * Converts the given colour into a hexadecimal string.
+     *
+     * @param colour The colour to be converted
+     * @return A corresponding 6 character hex string
+     */
+    public static String getHex(final Color colour) {
+        return getHex(colour.getRed()) + getHex(colour.getGreen())
+                + getHex(colour.getBlue());
+    }
+
+    /**
+     * 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 getHex(final int value) {
+        final String hex = Integer.toHexString(value);
+        return (hex.length() < 2 ? "0" : "") + hex;
+    }
 }

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.Channel;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.components.renderers.NicklistRenderer;
 import com.dmdirc.addons.ui_swing.textpane.ClickType;
@@ -78,12 +79,14 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
 
         nickList = new JList();
 
-        nickList.setBackground(config.getOptionColour(
+        nickList.setBackground(UIUtilities.convertColour(
+                config.getOptionColour(
                 "ui", "nicklistbackgroundcolour",
-                "ui", "backgroundcolour"));
-        nickList.setForeground(config.getOptionColour(
+                "ui", "backgroundcolour")));
+        nickList.setForeground(UIUtilities.convertColour(
+                config.getOptionColour(
                 "ui", "nicklistforegroundcolour",
-                "ui", "foregroundcolour"));
+                "ui", "foregroundcolour")));
         nickList.setFont(new Font(config.getOption("ui", "textPaneFontName"),
                 Font.PLAIN, getFont().getSize()));
         config.addChangeListener("ui", "nicklistforegroundcolour", this);
@@ -254,12 +257,14 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
                 || "nicklistforegroundcolour".equals(key)
                 || "foregroundcolour".equals(key)
                 || "textPaneFontName".equals(key)) {
-            nickList.setBackground(config.getOptionColour(
+            nickList.setBackground(UIUtilities.convertColour(
+                    config.getOptionColour(
                     "ui", "nicklistbackgroundcolour",
-                    "ui", "backgroundcolour"));
-            nickList.setForeground(config.getOptionColour(
+                    "ui", "backgroundcolour")));
+            nickList.setForeground(UIUtilities.convertColour(
+                    config.getOptionColour(
                     "ui", "nicklistforegroundcolour",
-                    "ui", "foregroundcolour"));
+                    "ui", "foregroundcolour")));
             nickList.setFont(new Font(config.getOption("ui", "textPaneFontName"),
                 Font.PLAIN, getFont().getSize()));
             nickList.repaint();

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

@@ -408,11 +408,14 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
 
     /** Sets the colours used in this document. */
     private void setColours() {
-        searchBox.setForeground(IdentityManager.getGlobalConfig().
-                getOptionColour("ui", "foregroundcolour"));
-        searchBox.setBackground(IdentityManager.getGlobalConfig().
-                getOptionColour("ui", "backgroundcolour"));
-        searchBox.setCaretColor(IdentityManager.getGlobalConfig().
-                getOptionColour("ui", "foregroundcolour"));
+        searchBox.setForeground(UIUtilities.convertColour(
+                IdentityManager.getGlobalConfig().
+                getOptionColour("ui", "foregroundcolour")));
+        searchBox.setBackground(UIUtilities.convertColour(
+                IdentityManager.getGlobalConfig().
+                getOptionColour("ui", "backgroundcolour")));
+        searchBox.setCaretColor(UIUtilities.convertColour(
+                IdentityManager.getGlobalConfig().
+                getOptionColour("ui", "foregroundcolour")));
     }
 }

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

@@ -35,7 +35,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
-import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
@@ -221,7 +220,7 @@ public class TopicBar extends JComponent implements ActionListener,
                     channel.getStyliser().addStyledString(
                             (StyledDocument) topicText.getDocument(),
                             new String[]{Styliser.CODE_HEXCOLOUR
-                                    + ColourManager.getHex(foregroundColour)
+                                    + UIUtilities.getHex(foregroundColour)
                                     + channel.getCurrentTopic().getTopic(), },
                             as);
                 }
@@ -331,10 +330,12 @@ public class TopicBar extends JComponent implements ActionListener,
      * Load and set colours.
      */
     private void setColours() {
-        backgroundColour = channel.getConfigManager().getOptionColour(
-                "ui", "inputbackgroundcolour", "ui", "backgroundcolour");
-        foregroundColour = channel.getConfigManager().getOptionColour(
-                "ui", "inputforegroundcolour", "ui", "foregroundcolour");
+        backgroundColour = UIUtilities.convertColour(
+                channel.getConfigManager().getOptionColour(
+                "ui", "inputbackgroundcolour", "ui", "backgroundcolour"));
+        foregroundColour = UIUtilities.convertColour(
+                channel.getConfigManager().getOptionColour(
+                "ui", "inputforegroundcolour", "ui", "foregroundcolour"));
         setBackground(backgroundColour);
         setForeground(foregroundColour);
         setDisabledTextColour(foregroundColour);

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

@@ -160,7 +160,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
     /** Sets the colour back to white. */
     public void clearColour() {
         value = "ffffff";
-        previewPanel.setBackground(ColourManager.getColour("ffffff"));
+        previewPanel.setBackground(Color.WHITE);
         previewPanel.setToolTipText("");
     }
 
@@ -170,10 +170,11 @@ public final class ColourChooser extends JPanel implements ActionListener {
      */
     private void updateColour(final String newColour) {
         if (newColour == null || newColour.isEmpty()) {
-            previewPanel.setBackground(ColourManager.getColour("ffffff"));
+            previewPanel.setBackground(Color.WHITE);
             previewPanel.setToolTipText("");
         } else {
-            previewPanel.setBackground(ColourManager.parseColour(newColour));
+            previewPanel.setBackground(UIUtilities.convertColour(
+                    ColourManager.parseColour(newColour)));
             previewPanel.setToolTipText(newColour);
         }
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.colours;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -142,7 +143,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
                 ircOffset = offset;
 
                 for (int i = 0; i < 16; i++) {
-                    g.setColor(ColourManager.getColour(i));
+                    g.setColor(UIUtilities.convertColour(ColourManager.getColour(i)));
                     g.fillRect(i * IRC_WIDTH + BORDER_SIZE, offset, IRC_WIDTH,
                             IRC_HEIGHT);
                     g.setColor(Color.BLACK);
@@ -251,7 +252,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
     private static Color getIrcColour(final MouseEvent e) {
         final int i = (e.getX() - BORDER_SIZE) / IRC_WIDTH;
 
-        return ColourManager.getColour(i);
+        return UIUtilities.convertColour(ColourManager.getColour(i));
     }
 
     /**

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

@@ -159,7 +159,7 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
     /** Sets the colour back to white. */
     public void clearColour() {
         value = "ffffff";
-        previewPanel.setBackground(ColourManager.getColour("ffffff"));
+        previewPanel.setBackground(Color.WHITE);
         previewPanel.setToolTipText("");
     }
 
@@ -184,10 +184,11 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
      */
     private void updateColour(final String newColour) {
         if (newColour.isEmpty()) {
-            previewPanel.setBackground(ColourManager.getColour("ffffff"));
+            previewPanel.setBackground(Color.WHITE);
             previewPanel.setToolTipText("");
         } else {
-            previewPanel.setBackground(ColourManager.parseColour(newColour));
+            previewPanel.setBackground(UIUtilities.convertColour(
+                    ColourManager.parseColour(newColour)));
             previewPanel.setToolTipText(newColour);
         }
     }

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -99,15 +99,18 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
 
         if (!UIUtilities.isGTKUI()) {
             //GTK users appear to dislike choice, ignore them if they want some.
-            getInputField().setBackground(config.getOptionColour(
+            getInputField().setBackground(UIUtilities.convertColour(
+                    config.getOptionColour(
                     "ui", "inputbackgroundcolour",
-                    "ui", "backgroundcolour"));
-            getInputField().setForeground(config.getOptionColour(
+                    "ui", "backgroundcolour")));
+            getInputField().setForeground(UIUtilities.convertColour(
+                    config.getOptionColour(
                     "ui", "inputforegroundcolour",
-                    "ui", "foregroundcolour"));
-            getInputField().setCaretColor(config.getOptionColour(
+                    "ui", "foregroundcolour")));
+            getInputField().setCaretColor(UIUtilities.convertColour(
+                    config.getOptionColour(
                     "ui", "inputforegroundcolour",
-                    "ui", "foregroundcolour"));
+                    "ui", "foregroundcolour")));
         }
 
         config.addChangeListener("ui", "inputforegroundcolour", this);
@@ -367,17 +370,20 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 && getInputField() != null && !UIUtilities.isGTKUI()) {
             if ("inputbackgroundcolour".equals(key)
                     || "backgroundcolour".equals(key)) {
-                getInputField().setBackground(getContainer().getConfigManager().
+                getInputField().setBackground(UIUtilities.convertColour(
+                        getContainer().getConfigManager().
                         getOptionColour("ui", "inputbackgroundcolour",
-                        "ui", "backgroundcolour"));
+                        "ui", "backgroundcolour")));
             } else if ("inputforegroundcolour".equals(key)
                     || "foregroundcolour".equals(key)) {
-                getInputField().setForeground(getContainer().getConfigManager()
+                getInputField().setForeground(UIUtilities.convertColour(
+                        getContainer().getConfigManager()
                         .getOptionColour("ui", "inputforegroundcolour",
-                        "ui", "foregroundcolour"));
-                getInputField().setCaretColor(getContainer().getConfigManager()
+                        "ui", "foregroundcolour")));
+                getInputField().setCaretColor(UIUtilities.convertColour(
+                        getContainer().getConfigManager()
                         .getOptionColour("ui", "inputforegroundcolour",
-                        "ui", "foregroundcolour"));
+                        "ui", "foregroundcolour")));
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -563,10 +563,12 @@ public abstract class TextFrame extends JPanel implements Window,
      * Updates colour settings from their config values.
      */
     private void updateColours() {
-        getTextPane().setForeground(getContainer().getConfigManager()
-                .getOptionColour("ui", "foregroundcolour"));
-        getTextPane().setBackground(getContainer().getConfigManager()
-                .getOptionColour("ui", "backgroundcolour"));
+        getTextPane().setForeground(UIUtilities.convertColour(
+                getContainer().getConfigManager()
+                .getOptionColour("ui", "foregroundcolour")));
+        getTextPane().setBackground(UIUtilities.convertColour(
+                getContainer().getConfigManager()
+                .getOptionColour("ui", "backgroundcolour")));
     }
 
     /** Disposes of this window, removing any listeners. */

src/com/dmdirc/addons/ui_swing/components/renderers/NicklistRenderer.java

@@ -23,10 +23,12 @@
 package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.ChannelClientProperty;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
+import com.dmdirc.ui.Colour;
 import java.awt.Color;
 import java.awt.Component;
 import java.util.Map;
@@ -69,10 +71,10 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
         config.addChangeListener("ui", "nicklistbackgroundcolour", this);
         config.addChangeListener("ui", "backgroundcolour", this);
         config.addChangeListener("ui", "nickListAltBackgroundColour", this);
-        altBackgroundColour = config.getOptionColour(
+        altBackgroundColour = UIUtilities.convertColour(config.getOptionColour(
                 "ui", "nickListAltBackgroundColour",
                 "ui", "nicklistbackgroundcolour",
-                "ui", "backgroundcolour");
+                "ui", "backgroundcolour"));
         showColours = config.getOptionBool("ui", "shownickcoloursinnicklist");
     }
 
@@ -93,11 +95,11 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
 
         if (showColours && map != null) {
             if (map.containsKey(ChannelClientProperty.NICKLIST_FOREGROUND)) {
-                setForeground((Color) map.get(ChannelClientProperty.NICKLIST_FOREGROUND));
+                setForeground(UIUtilities.convertColour((Colour) map.get(ChannelClientProperty.NICKLIST_FOREGROUND)));
             }
 
             if (map.containsKey(ChannelClientProperty.NICKLIST_BACKGROUND)) {
-                setBackground((Color) map.get(ChannelClientProperty.NICKLIST_BACKGROUND));
+                setBackground(UIUtilities.convertColour((Colour) map.get(ChannelClientProperty.NICKLIST_BACKGROUND)));
             }
         }
 
@@ -112,10 +114,10 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
 
         } else {
             altBackgroundColour =
-                    config.getOptionColour(
+                    UIUtilities.convertColour(config.getOptionColour(
                     "ui", "nickListAltBackgroundColour",
                     "ui", "nicklistbackgroundcolour",
-                    "ui", "backgroundcolour");
+                    "ui", "backgroundcolour"));
         }
         nicklist.repaint();
     }

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -35,10 +35,10 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.Colour;
 
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
@@ -422,7 +422,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** {@inheritDoc} */
     @Override
     public void notificationSet(final FrameContainer window,
-            final Color colour) {
+            final Colour colour) {
         UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
@@ -430,7 +430,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
             public void run() {
                 final FrameToggleButton button = getButton(window);
                 if (button != null) {
-                    button.setForeground(colour);
+                    button.setForeground(UIUtilities.convertColour(colour));
                 }
             }
         });

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

@@ -24,11 +24,13 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SelectionListener;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -129,9 +131,9 @@ public class NodeLabel extends JPanel implements SelectionListener,
     /** {@inheritDoc} */
     @Override
     public void notificationSet(final FrameContainer window,
-            final Color colour) {
+            final Colour colour) {
         if (equals(window)) {
-            notificationColour = colour;
+            notificationColour = UIUtilities.convertColour(colour);
         }
     }
 

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

@@ -34,9 +34,9 @@ import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
 
-import java.awt.Color;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
@@ -271,12 +271,14 @@ public final class TreeFrameManager implements FrameManager,
 
     /** Sets treeview colours. */
     private void setColours() {
-        tree.setBackground(IdentityManager.getGlobalConfig().getOptionColour(
+        tree.setBackground(UIUtilities.convertColour(
+                IdentityManager.getGlobalConfig().getOptionColour(
                 "treeview", "backgroundcolour",
-                "ui", "backgroundcolour"));
-        tree.setForeground(IdentityManager.getGlobalConfig().getOptionColour(
+                "ui", "backgroundcolour")));
+        tree.setForeground(UIUtilities.convertColour(
+                IdentityManager.getGlobalConfig().getOptionColour(
                 "treeview", "foregroundcolour",
-                "ui", "foregroundcolour"));
+                "ui", "foregroundcolour")));
 
         tree.repaint();
     }
@@ -360,7 +362,7 @@ public final class TreeFrameManager implements FrameManager,
 
     /** {@inheritDoc} */
     @Override
-    public void notificationSet(final FrameContainer window, final Color colour) {
+    public void notificationSet(final FrameContainer window, final Colour colour) {
         SwingUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */

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

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
@@ -86,7 +86,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      * Configures the renderer based on the passed parameters.
      *
      * @param tree JTree for this renderer.
-     * @param value node to be renderered.
+     * @param value node to be rendered.
      * @param sel whether the node is selected.
      * @param expanded whether the node is expanded.
      * @param leaf whether the node is a leaf.
@@ -135,9 +135,9 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
             sb.append(Styliser.CODE_BOLD);
         }
         sb.append(Styliser.CODE_HEXCOLOUR);
-        sb.append(ColourManager.getHex(foreground));
+        sb.append(UIUtilities.getHex(foreground));
         sb.append(',');
-        sb.append(ColourManager.getHex(background));
+        sb.append(UIUtilities.getHex(background));
         label.setBackground(background);
         label.setOpaque(true);
         label.setTextStyle(styliser, sb.toString());
@@ -150,18 +150,18 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
 
     /** Sets the colours for the renderer. */
     private void setColours() {
-        rolloverColour = config.getOptionColour(
+        rolloverColour = UIUtilities.convertColour(config.getOptionColour(
                 "ui", "treeviewRolloverColour",
                 "treeview", "backgroundcolour",
-                "ui", "backgroundcolour");
-        activeBackground = config.getOptionColour(
+                "ui", "backgroundcolour"));
+        activeBackground = UIUtilities.convertColour(config.getOptionColour(
                 "ui", "treeviewActiveBackground",
                 "treeview", "backgroundcolour",
-                "ui", "backgroundcolour");
-        activeForeground = config.getOptionColour(
+                "ui", "backgroundcolour"));
+        activeForeground = UIUtilities.convertColour(config.getOptionColour(
                 "ui", "treeviewActiveForeground",
                 "treeview", "foregroundcolour",
-                "ui", "foregroundcolour");
+                "ui", "foregroundcolour"));
         activeBold = config.getOptionBool("ui", "treeviewActiveBold");
 
         manager.getTree().repaint();