Remove static ColourManager calls.

Remove many unused constructors from swing colour components.

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

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

@@ -118,9 +118,11 @@ public class NickColourInputDialog extends StandardDialog
 
         nickname = new JTextField(defaultNickname);
         network = new JTextField(defaultNetwork);
-        textColour = new ColourChooser(getController().getIconManager(),
+        textColour = new ColourChooser(getController().getColourManager(),
+                getController().getIconManager(),
                 defaultTextColour, true, true);
-        nicklistColour = new ColourChooser(getController().getIconManager(),
+        nicklistColour = new ColourChooser(getController().getColourManager(),
+                getController().getIconManager(),
                 defaultNickColour, true, true);
     }
 

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

@@ -362,7 +362,9 @@ public final class PrefsComponentFactory {
     private JComponent getColourOption(
             final PreferencesSetting setting) {
         final OptionalColourChooser option = new OptionalColourChooser(
-                controller.getIconManager(), setting.getValue(), true, true, true);
+                controller.getIconManager(),
+                controller.getColourManager(),
+                setting.getValue(), true, true, true);
 
         option.addActionListener(new ActionListener() {
 
@@ -394,7 +396,8 @@ public final class PrefsComponentFactory {
                 .getValue().substring(1 + setting.getValue().indexOf(':'));
 
         final OptionalColourChooser option = new OptionalColourChooser(
-                controller.getIconManager(), colour, state, true, true);
+                controller.getIconManager(), controller.getColourManager(),
+                colour, state, true, true);
 
         option.addActionListener(new ActionListener() {
 

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

@@ -72,6 +72,7 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
+import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.URLBuilder;
@@ -186,6 +187,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final Apple apple;
     /** Window Management. */
     private final WindowManager windowManager;
+    /** The colour manager to use to parse colours. */
+    @Getter
+    private final ColourManager colourManager;
 
     /**
      * Instantiates a new SwingController.
@@ -205,6 +209,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @param themeManager Theme manager to use.
      * @param urlBuilder URL builder to use to resolve icons etc.
      * @param windowManager Window management
+     * @param colourManager The colour manager to use to parse colours.
      */
     public SwingController(
             final PluginInfo pluginInfo,
@@ -221,7 +226,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final AliasWrapper aliasWrapper,
             final ThemeManager themeManager,
             final URLBuilder urlBuilder,
-            final WindowManager windowManager) {
+            final WindowManager windowManager,
+            final ColourManager colourManager) {
         super(commandController);
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;
@@ -236,6 +242,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.aliasWrapper = aliasWrapper;
         this.themeManager = themeManager;
         this.windowManager = windowManager;
+        this.colourManager = colourManager;
 
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getUserSettings();

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
@@ -43,7 +44,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Colour chooser widget.
  */
-public final class ColourChooser extends JPanel implements ActionListener {
+public class ColourChooser extends JPanel implements ActionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
@@ -55,6 +56,8 @@ public final class ColourChooser extends JPanel implements ActionListener {
     private final EventListenerList listeners;
     /** Icon manager. */
     private final IconManager iconManager;
+    /** The colour manager to use to parse colours. */
+    private final ColourManager colourManager;
     /** Colours picking dialog. */
     private ColourPickerDialog cpd;
     /** show irc colours. */
@@ -71,56 +74,22 @@ public final class ColourChooser extends JPanel implements ActionListener {
     /**
      * Creates a new instance of ColourChooser.
      *
-     * @param iconManager Icon manager
-     * */
-    public ColourChooser(final IconManager iconManager) {
-        this(iconManager, "ffffff", true, true);
-    }
-
-    /**
-     * Creates a new instance of ColourChooser.
-     *
-     * @param iconManager Icon Manager
-     * @param window Parent window
-     *
-     * @since 0.6
-     */
-    public ColourChooser(final IconManager iconManager, final Window window) {
-        this(iconManager, "ffffff", true, true, window);
-    }
-
-    /**
-     * Creates a new instance of ColourChooser.
-     *
-     * @param iconManager Icon manager
-     * @param initialColour Snitial colour
-     * @param ircColours Show irc colours
-     * @param hexColours Show hex colours
-     */
-    public ColourChooser(final IconManager iconManager,
-            final String initialColour, final boolean ircColours,
-            final boolean hexColours) {
-        this(iconManager, initialColour, ircColours, hexColours, null);
-    }
-
-    /**
-     * Creates a new instance of ColourChooser.
-     *
+     * @param colourManager The colour manager to use to parse colours.
      * @param iconManager Icon manager
      * @param initialColour initial colour
      * @param ircColours show irc colours
      * @param hexColours show hex colours
-     * @param window Parent window
      *
      * @since 0.6
      */
-    public ColourChooser(final IconManager iconManager,
+    public ColourChooser(
+            final ColourManager colourManager, final IconManager iconManager,
             final String initialColour, final boolean ircColours,
-            final boolean hexColours, final Window window) {
+            final boolean hexColours) {
         super();
 
+        this.colourManager = colourManager;
         this.iconManager = iconManager;
-        this.window = window;
         showIRC = ircColours;
         showHex = hexColours;
         value = initialColour;
@@ -186,7 +155,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
             previewPanel.setToolTipText("");
         } else {
             previewPanel.setBackground(UIUtilities.convertColour(
-                    ColourManager.parseColour(newColour)));
+                    colourManager.getColourFromString(newColour, Colour.WHITE)));
             previewPanel.setToolTipText(newColour);
         }
     }
@@ -199,7 +168,7 @@ public final class ColourChooser extends JPanel implements ActionListener {
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == editButton) {
-            cpd = new ColourPickerDialog(iconManager, showIRC, showHex, window);
+            cpd = new ColourPickerDialog(colourManager, iconManager, showIRC, showHex, window);
             cpd.addActionListener(this);
             cpd.display(editButton);
         } else {

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Window;
 import java.awt.event.ActionListener;
@@ -35,7 +36,7 @@ import javax.swing.JDialog;
 /**
  * Colour picker dialog.
  */
-public final class ColourPickerDialog extends StandardDialog {
+public class ColourPickerDialog extends StandardDialog {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
@@ -45,42 +46,22 @@ public final class ColourPickerDialog extends StandardDialog {
     /**
      * Creates a new instance of ColourPickerDialog.
      *
-     * @param iconManager Icon manager
-     *
-     * @since 0.6
-     */
-    public ColourPickerDialog(final IconManager iconManager) {
-        this(iconManager, true, true);
-    }
-
-    /**
-     * Creates a new instance of ColourPickerDialog.
-     *
-     * @param iconManager Icon manager
-     * @param window Parent window
-     *
-     * @since 0.6
-     */
-    public ColourPickerDialog(final IconManager iconManager,
-            final Window window) {
-        this(iconManager, true, true, window);
-    }
-
-    /**
-     * Creates a new instance of ColourPickerDialog.
-     *
+     * @param colourManager The colour manager to use to parse colours.
      * @param iconManager Icon manager
      * @param showIRC show irc colours
      * @param showHex show hex colours
      */
-    public ColourPickerDialog(final IconManager iconManager,
+    public ColourPickerDialog(
+            final ColourManager colourManager,
+            final IconManager iconManager,
             final boolean showIRC, final boolean showHex) {
-        this(iconManager, showIRC, showHex, null);
+        this(colourManager, iconManager, showIRC, showHex, null);
     }
 
     /**
      * Creates a new instance of ColourPickerDialog.
      *
+     * @param colourManager The colour manager to use to parse colours.
      * @param iconManager Icon manager
      * @param showIRC show irc colours
      * @param showHex show hex colours
@@ -88,12 +69,13 @@ public final class ColourPickerDialog extends StandardDialog {
      *
      * @since 0.6
      */
-    public ColourPickerDialog(final IconManager iconManager,
+    public ColourPickerDialog(
+            final ColourManager colourManager, final IconManager iconManager,
             final boolean showIRC, final boolean showHex, final Window window) {
         super(null, window, ModalityType.MODELESS);
         setIconImage(iconManager.getImage("icon"));
 
-        colourChooser = new ColourPickerPanel(showIRC, showHex);
+        colourChooser = new ColourPickerPanel(colourManager, showIRC, showHex);
 
         setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
         add(colourChooser);

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

@@ -86,18 +86,23 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
     /** Rectangle we use to indicate that only the preview should be drawn. */
     private Rectangle previewRect;
     /** A list of registered actionlisteners. */
-    private final List<ActionListener> listeners =
-            new ArrayList<ActionListener>();
+    private final List<ActionListener> listeners = new ArrayList<>();
+    /** The colour manager to use to parse colours. */
+    private final ColourManager colourManager;
 
     /**
      * Creates a new instance of ColourPickerPanel.
+     *
+     * @param colourManager The colour manager to use to parse colours.
      * @param newShowIrc Whether to show IRC colours or not
      * @param newShowHex Whether to show hex colours or not
      */
-    public ColourPickerPanel(final boolean newShowIrc,
+    public ColourPickerPanel(
+            final ColourManager colourManager,
+            final boolean newShowIrc,
             final boolean newShowHex) {
-        super();
 
+        this.colourManager = colourManager;
         showIrc = newShowIrc;
         showHex = newShowHex;
 
@@ -110,14 +115,6 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
         addMouseWheelListener(this);
     }
 
-    /**
-     * Creates a new instance of ColourPickerPanel, showing both IRC and Hex
-     * colours.
-     */
-    public ColourPickerPanel() {
-        this(true, true);
-    }
-
     /** {@inheritDoc} */
     @Override
     public void paint(final Graphics g) {
@@ -138,7 +135,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
                 ircOffset = offset;
 
                 for (int i = 0; i < 16; i++) {
-                    g.setColor(UIUtilities.convertColour(ColourManager.getColour(i)));
+                    g.setColor(UIUtilities.convertColour(colourManager.getColourFromIrcCode(i)));
                     g.fillRect(i * IRC_WIDTH + BORDER_SIZE, offset, IRC_WIDTH,
                             IRC_HEIGHT);
                     g.setColor(Color.BLACK);
@@ -244,10 +241,10 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
      * @param e The mouse event that triggered this call
      * @return A colour object representing the colour beneath the mouse
      */
-    private static Color getIrcColour(final MouseEvent e) {
+    private Color getIrcColour(final MouseEvent e) {
         final int i = (e.getX() - BORDER_SIZE) / IRC_WIDTH;
 
-        return UIUtilities.convertColour(ColourManager.getColour(i));
+        return UIUtilities.convertColour(colourManager.getColourFromIrcCode(i));
     }
 
     /**

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.colours;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.collections.ListenerList;
@@ -54,6 +55,8 @@ public final class OptionalColourChooser extends JPanel implements
     private final ListenerList listeners = new ListenerList();
     /** Icon manager. */
     private final IconManager iconManager;
+    /** The colour manager to use to parse colours. */
+    private final ColourManager colourManager;
     /** Enabled checkbox. */
     private final JCheckBox enabled;
     /** Edit button. */
@@ -66,68 +69,28 @@ public final class OptionalColourChooser extends JPanel implements
     private final boolean showIRC;
     /** show hex colours. */
     private final boolean showHex;
-    /** The value of this component. */
     /** Parent window. */
-    private Window window;
-
-    /**
-     * Creates a new instance of ColourChooser.
-     *
-     * @param iconManager Icon manager
-     */
-    public OptionalColourChooser(final IconManager iconManager) {
-        this(iconManager, "", false, true, true);
-    }
-
-    /**
-     * Creates a new instance of ColourChooser.
-     *
-     * @param window Parent window
-     *
-     * @since 0.6
-     */
-    public OptionalColourChooser(final IconManager iconManager,
-            final Window window) {
-        this(iconManager, "", false, true, true, window);
-    }
-
-    /**
-     * Creates a new instance of ColourChooser.
-     *
-     * @param iconManager Icon manager
-     * @param initialColour Snitial colour
-     * @param initialState Initial state
-     * @param ircColours Show irc colours
-     * @param hexColours Show hex colours
-     */
-    public OptionalColourChooser(final IconManager iconManager,
-            final String initialColour,
-            final boolean initialState, final boolean ircColours,
-            final boolean hexColours) {
-        this(iconManager, initialColour, initialState, ircColours, hexColours,
-                null);
-    }
+    private Window window = null;
 
     /**
      * Creates a new instance of ColourChooser.
      *
      * @param iconManager Icon manager
+     * @param colourManager The colour manager to use to parse colours.
      * @param initialColour Snitial colour
      * @param initialState Initial state
      * @param ircColours Show irc colours
      * @param hexColours Show hex colours
-     * @param window Parent window
      *
      * @since 0.6
      */
-    public OptionalColourChooser(final IconManager iconManager,
+    public OptionalColourChooser(
+            final IconManager iconManager, final ColourManager colourManager,
             final String initialColour,
             final boolean initialState, final boolean ircColours,
-            final boolean hexColours, final Window window) {
-        super();
-
+            final boolean hexColours) {
         this.iconManager = iconManager;
-        this.window = window;
+        this.colourManager = colourManager;
         showIRC = ircColours;
         showHex = hexColours;
 
@@ -200,7 +163,7 @@ public final class OptionalColourChooser extends JPanel implements
             previewPanel.setToolTipText("");
         } else {
             previewPanel.setBackground(UIUtilities.convertColour(
-                    ColourManager.parseColour(newColour)));
+                    colourManager.getColourFromString(newColour, Colour.WHITE)));
             previewPanel.setToolTipText(newColour);
         }
     }
@@ -213,7 +176,7 @@ public final class OptionalColourChooser extends JPanel implements
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == editButton) {
-            cpd = new ColourPickerDialog(iconManager, showIRC, showHex, window);
+            cpd = new ColourPickerDialog(colourManager, iconManager, showIRC, showHex, window);
             cpd.addActionListener(this);
             cpd.display(editButton);
         } else if (e.getSource() == enabled) {

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

@@ -152,8 +152,8 @@ public class SwingInputField extends JComponent implements InputField,
             public void run() {
                 if (controller.getGlobalConfig().getOptionBool("general",
                         "showcolourdialog")) {
-                    colourPicker = new ColourPickerDialog(controller
-                            .getIconManager(), irc, hex, parentWindow);
+                    colourPicker = new ColourPickerDialog(controller.getColourManager(),
+                            controller.getIconManager(), irc, hex, parentWindow);
                     colourPicker.addActionListener(new ActionListener() {
 
                         @Override

src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

@@ -94,8 +94,8 @@ public class TextAreaInputField extends JTextArea implements InputField,
     public void showColourPicker(final boolean irc, final boolean hex) {
         if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(controller.getIconManager(),
-                    irc, hex);
+            colourPicker = new ColourPickerDialog(controller.getColourManager(),
+                    controller.getIconManager(), irc, hex);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override

src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java

@@ -66,8 +66,8 @@ public class TextFieldInputField extends JTextField implements InputField,
     public void showColourPicker(final boolean irc, final boolean hex) {
         if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(controller.getIconManager(),
-                    irc, hex);
+            colourPicker = new ColourPickerDialog(controller.getColourManager(),
+                    controller.getIconManager(), irc, hex);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override

src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java

@@ -74,8 +74,8 @@ public class TextPaneInputField extends JEditorPane implements InputField,
     public void showColourPicker(final boolean irc, final boolean hex) {
         if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(controller.getIconManager(),
-                    irc, hex, parentWindow);
+            colourPicker = new ColourPickerDialog(controller.getColourManager(),
+                    controller.getIconManager(), irc, hex, parentWindow);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override

src/com/dmdirc/addons/ui_swing/components/inputfields/ValidatingTextFieldInputField.java

@@ -88,8 +88,8 @@ public class ValidatingTextFieldInputField extends ValidatingJTextField
     public void showColourPicker(final boolean irc, final boolean hex) {
         if (controller.getGlobalConfig().getOptionBool("general",
                 "showcolourdialog")) {
-            colourPicker = new ColourPickerDialog(controller.getIconManager(),
-                    irc, hex);
+            colourPicker = new ColourPickerDialog(controller.getColourManager(),
+                    controller.getIconManager(), irc, hex);
             colourPicker.addActionListener(new ActionListener() {
 
                 @Override