Rest of the plugin uses of getOptionColour.

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

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

@@ -36,6 +36,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
@@ -77,6 +78,8 @@ public class TreeFrameManager implements FrameManager,
     private TreeScroller scroller;
     /** Configuration manager. */
     private AggregateConfigProvider config;
+    /** Colour manager. */
+    private ColourManager colourManager;
     /** Window manage. */
     private final WindowManager windowManager;
 
@@ -134,6 +137,7 @@ public class TreeFrameManager implements FrameManager,
     public void setController(final SwingController controller) {
         this.controller = controller;
         this.config = controller.getGlobalConfig();
+        this.colourManager = controller.getColourManager();
 
         UIUtilities.invokeLater(new Runnable() {
 
@@ -142,20 +146,15 @@ public class TreeFrameManager implements FrameManager,
                 model = new TreeViewModel(config, new TreeViewNode(null, null));
                 tree = new Tree(TreeFrameManager.this, model,
                         TreeFrameManager.this.controller);
-                tree.setCellRenderer(new TreeViewTreeCellRenderer(config,
+                tree.setCellRenderer(new TreeViewTreeCellRenderer(config, colourManager,
                         TreeFrameManager.this));
                 tree.setVisible(true);
 
-                controller.getGlobalConfig().addChangeListener("treeview",
-                        TreeFrameManager.this);
-                controller.getGlobalConfig().addChangeListener("ui",
-                        "sortrootwindows", TreeFrameManager.this);
-                controller.getGlobalConfig().addChangeListener("ui",
-                        "sortchildwindows", TreeFrameManager.this);
-                controller.getGlobalConfig().addChangeListener("ui",
-                        "backgroundcolour", TreeFrameManager.this);
-                controller.getGlobalConfig().addChangeListener("ui",
-                        "foregroundcolour", TreeFrameManager.this);
+                config.addChangeListener("treeview", TreeFrameManager.this);
+                config.addChangeListener("ui", "sortrootwindows", TreeFrameManager.this);
+                config.addChangeListener("ui", "sortchildwindows", TreeFrameManager.this);
+                config.addChangeListener("ui", "backgroundcolour", TreeFrameManager.this);
+                config.addChangeListener("ui", "foregroundcolour", TreeFrameManager.this);
             }
         });
     }
@@ -278,13 +277,15 @@ public class TreeFrameManager implements FrameManager,
     /** Sets treeview colours. */
     private void setColours() {
         tree.setBackground(UIUtilities.convertColour(
-                controller.getGlobalConfig().getOptionColour(
-                "treeview", "backgroundcolour",
-                "ui", "backgroundcolour")));
+                colourManager.getColourFromString(
+                        config.getOptionString(
+                                "treeview", "backgroundcolour",
+                                "ui", "backgroundcolour"), null)));
         tree.setForeground(UIUtilities.convertColour(
-                controller.getGlobalConfig().getOptionColour(
-                "treeview", "foregroundcolour",
-                "ui", "foregroundcolour")));
+                colourManager.getColourFromString(
+                        config.getOptionString(
+                                "treeview", "foregroundcolour",
+                                "ui", "foregroundcolour"), null)));
 
         tree.repaint();
     }

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
@@ -47,6 +48,8 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
     private final TreeFrameManager manager;
     /** Config manager. */
     private final AggregateConfigProvider config;
+    /** The colour manager to use to resolve colours. */
+    private final ColourManager colourManager;
     /** Styliser to use. */
     private final Styliser styliser;
     /** Rollover colours. */
@@ -62,13 +65,18 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      * Creates a new instance of TreeViewTreeCellRenderer.
      *
      * @param config Config manager to retrieve settings from
+     * @param colourManager The colour manager to use to resolve colours.
      * @param manager Parent TreeFrameManager
      */
-    public TreeViewTreeCellRenderer(final AggregateConfigProvider config,
+    public TreeViewTreeCellRenderer(
+            final AggregateConfigProvider config,
+            final ColourManager colourManager,
             final TreeFrameManager manager) {
         this.manager = manager;
 
         this.config = config;
+        this.colourManager = colourManager;
+
         styliser = new Styliser(null, config);
 
         setColours();
@@ -145,18 +153,24 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
 
     /** Sets the colours for the renderer. */
     private void setColours() {
-        rolloverColour = UIUtilities.convertColour(config.getOptionColour(
-                "ui", "treeviewRolloverColour",
-                "treeview", "backgroundcolour",
-                "ui", "backgroundcolour"));
-        activeBackground = UIUtilities.convertColour(config.getOptionColour(
-                "ui", "treeviewActiveBackground",
-                "treeview", "backgroundcolour",
-                "ui", "backgroundcolour"));
-        activeForeground = UIUtilities.convertColour(config.getOptionColour(
-                "ui", "treeviewActiveForeground",
-                "treeview", "foregroundcolour",
-                "ui", "foregroundcolour"));
+        rolloverColour = UIUtilities.convertColour(
+                colourManager.getColourFromString(
+                        config.getOptionString(
+                                "ui", "treeviewRolloverColour",
+                                "treeview", "backgroundcolour",
+                                "ui", "backgroundcolour"), null));
+        activeBackground = UIUtilities.convertColour(
+                colourManager.getColourFromString(
+                        config.getOptionString(
+                                "ui", "treeviewActiveBackground",
+                                "treeview", "backgroundcolour",
+                                "ui", "backgroundcolour"), null));
+        activeForeground = UIUtilities.convertColour(
+                colourManager.getColourFromString(
+                        config.getOptionString(
+                                "ui", "treeviewActiveForeground",
+                                "treeview", "foregroundcolour",
+                                "ui", "foregroundcolour"), null));
         activeBold = config.getOptionBool("ui", "treeviewActiveBold");
 
         manager.getTree().repaint();