Fix annoying colour parsing errors with prefs components

Change-Id: I622bc325cd7460137ec45dad1fb260defb6a2ffb
Reviewed-on: http://gerrit.dmdirc.com/2088
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.addons.ui_swing.components.FileBrowser;
 import com.dmdirc.addons.ui_swing.components.FontPicker;
 import com.dmdirc.addons.ui_swing.components.OptionalJSpinner;
-import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationListener;
@@ -353,15 +352,18 @@ public final class PrefsComponentFactory {
      */
     private static JComponent getColourOption(
             final PreferencesSetting setting) {
-        final ColourChooser option = new ColourChooser(setting.getValue(),
-                true, true);
+        final OptionalColourChooser option = new OptionalColourChooser(
+                setting.getValue(), true, true, true);
 
         option.addActionListener(new ActionListener() {
 
             /** {@inheritDoc} */
             @Override
             public void actionPerformed(final ActionEvent e) {
-                setting.setValue(((ColourChooser) e.getSource()).getColour());
+                final OptionalColourChooser chooser
+                        = ((OptionalColourChooser) e.getSource());
+                setting.setValue(chooser.isEnabled() + ":"
+                        + chooser.getColour());
             }
         });
 

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

@@ -297,7 +297,8 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
             '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
         };
 
-        return (Integer.toString(chars[value / 16])) + Integer.toString(chars[value % 16]);
+        return Character.toString(chars[value / 16])
+                + Character.toString(chars[value % 16]);
     }
 
     private void mouseMotion(final MouseEvent e) {
@@ -349,7 +350,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
 
             final int i = (e.getX() - BORDER_SIZE) / IRC_WIDTH;
 
-            throwAction(ACTION_IRC,  Integer.toString(i));
+            throwAction(ACTION_IRC, Integer.toString(i));
 
         } else if (showHex && e.getY() > hexOffset && e.getY() < hexOffset +
                 HEX_HEIGHT) {

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

@@ -119,7 +119,6 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
         this.window = window;
         showIRC = ircColours;
         showHex = hexColours;
-        value = initialColour;
 
         editButton = new JButton("Edit");
         if (UIUtilities.isWindowsUI()) {
@@ -149,7 +148,12 @@ public final class OptionalColourChooser extends JPanel implements ActionListene
         add(previewPanel, "growx, pushx, sgy all");
         add(editButton, "sgy all");
 
-        updateColour(initialColour);
+        if (initialColour.contains(":")) {
+            value = initialColour.substring(initialColour.indexOf(':') + 1);
+        } else {
+            value = initialColour;
+        }
+        updateColour(value);
     }
 
     /** Sets the colour back to white. */