Remove static colour manager refs

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

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.osd;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.ui.messages.ColourManager;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -45,6 +46,8 @@ public class OsdManager {
     private final IdentityController identityController;
     /** The Plugin that owns this OSD Manager. */
     private final OsdPlugin plugin;
+    /** The colour manager to use to parse colours. */
+    private final ColourManager colourManager;
     /** List of OSD Windows. */
     private final List<OsdWindow> windowList = new ArrayList<>();
     /** List of messages to be queued. */
@@ -99,10 +102,11 @@ public class OsdManager {
             /** {@inheritDoc} */
             @Override
             public OsdWindow call() {
-                return new OsdWindow(identityController, timeout, message, false,
+                return new OsdWindow(identityController, plugin, OsdManager.this, colourManager,
+                        timeout, message, false,
                         identityController.getGlobalConfiguration().getOptionInt(
                         plugin.getDomain(), "locationX"), policy.getYPosition(
-                        OsdManager.this, startY), plugin, OsdManager.this);
+                        OsdManager.this, startY));
             }
         }));
     }

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

@@ -25,8 +25,8 @@ package com.dmdirc.addons.osd;
 import com.dmdirc.config.prefs.CategoryChangeListener;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.SettingChangeListener;
@@ -34,6 +34,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
+import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 
@@ -43,7 +44,7 @@ import java.util.Map;
 /**
  * Allows the user to display on-screen-display messages.
  */
-public final class OsdPlugin extends BaseCommandPlugin implements
+public class OsdPlugin extends BaseCommandPlugin implements
         CategoryChangeListener, PreferencesInterface, SettingChangeListener {
 
     /** Config OSD Window. */
@@ -61,21 +62,27 @@ public final class OsdPlugin extends BaseCommandPlugin implements
     private final PluginInfo pluginInfo;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
+    /** The manager to use to parse colours. */
+    private final ColourManager colourManager;
 
     /**
      * Creates a new instance of this plugin.
      *
      * @param pluginInfo This plugin's plugin info
+     * @param identityController The controller to use to read and write settings.
      * @param commandController Command controller to register commands
+     * @param colourManager The manager to use to parse colours.
      */
     public OsdPlugin(
             final PluginInfo pluginInfo,
             final IdentityController identityController,
-            final CommandController commandController) {
+            final CommandController commandController,
+            final ColourManager colourManager) {
         super(commandController);
         this.pluginInfo = pluginInfo;
         this.identityController = identityController;
-        osdManager = new OsdManager(identityController, this);
+        this.colourManager = colourManager;
+        osdManager = new OsdManager(identityController, this, colourManager);
         registerCommand(new OsdCommand(commandController, osdManager), OsdCommand.INFO);
     }
 
@@ -154,7 +161,8 @@ public final class OsdPlugin extends BaseCommandPlugin implements
     /** {@inheritDoc} */
     @Override
     public void categorySelected(final PreferencesCategory category) {
-        osdWindow = new OsdWindow(identityController, -1, "Please drag this OSD to position", true, x, y, this, osdManager);
+        osdWindow = new OsdWindow(identityController, this, osdManager, colourManager, -1,
+                "Please drag this OSD to position", true, x, y);
         osdWindow.setBackgroundColour(backgroundSetting.getValue());
         osdWindow.setForegroundColour(foregroundSetting.getValue());
         osdWindow.setFontSize(Integer.parseInt(fontSizeSetting.getValue()));

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.osd;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
@@ -62,6 +63,9 @@ public class OsdWindow extends JDialog implements MouseListener,
     /** The OSD Manager that owns this window. */
     private final OsdManager osdManager;
 
+    /** The manager to use to parse colours. */
+    private final ColourManager colourManager;
+
     /** OSD Label. */
     private final JLabel label;
 
@@ -84,6 +88,7 @@ public class OsdWindow extends JDialog implements MouseListener,
      * Creates a new instance of OsdWindow.
      *
      * @param identityController The controller to read/write settings with.
+     * @param colourManager The manager to use to parse colours.
      * @param timeout Timeout period for the window. Set to -1 to use value from
      *        config
      * @param text The text to be displayed in the OSD window
@@ -95,12 +100,14 @@ public class OsdWindow extends JDialog implements MouseListener,
      * @param osdManager The manager that owns this OSD Window
      */
     public OsdWindow(
-            final IdentityController identityController,
+            final IdentityController identityController, final OsdPlugin plugin,
+            final OsdManager osdManager, final ColourManager colourManager,
             final int timeout, final String text, final boolean config, final int x,
-            final int y, final OsdPlugin plugin, final OsdManager osdManager) {
+            final int y) {
         super(((SwingController) plugin.getPluginInfo().getMetaData().getManager()
                 .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
 
+        this.colourManager = colourManager;
         this.config = config;
         this.osdManager = osdManager;
 
@@ -258,7 +265,7 @@ public class OsdWindow extends JDialog implements MouseListener,
      * @param colour The background colour to use
      */
     public void setBackgroundColour(final String colour) {
-        panel.setBackground(UIUtilities.convertColour(ColourManager.parseColour(colour)));
+        panel.setBackground(UIUtilities.convertColour(colourManager.getColourFromString(colour, Colour.WHITE)));
     }
 
     /**
@@ -267,7 +274,7 @@ public class OsdWindow extends JDialog implements MouseListener,
      * @param colour The foreground colour to use
      */
     public void setForegroundColour(final String colour) {
-        label.setForeground(UIUtilities.convertColour(ColourManager.parseColour(colour)));
+        label.setForeground(UIUtilities.convertColour(colourManager.getColourFromString(colour, Colour.WHITE)));
     }
 
     /** {@inheritDoc} */