Start fixing the nick colour plugin.

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

@@ -22,14 +22,8 @@
 
 package com.dmdirc.addons.nickcolours;
 
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.util.colours.Colour;
-import com.dmdirc.ui.messages.ColourManager;
-
 import java.awt.Color;
-import java.awt.Component;
 
-import javax.swing.JTable;
 import javax.swing.border.LineBorder;
 import javax.swing.table.DefaultTableCellRenderer;
 
@@ -40,45 +34,26 @@ public class ColourRenderer extends DefaultTableCellRenderer {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The colour manager to use to parse colours. */
-    private final ColourManager colourManager;
 
     /**
      * Creates a new instance of ColourRenderer.
-     *
-     * @param colourManager The colour manager to use to parse colours.
      */
-    public ColourRenderer(final ColourManager colourManager) {
-        this.colourManager = colourManager;
-
+    public ColourRenderer() {
+        setHorizontalAlignment(CENTER);
         setOpaque(true);
     }
 
     @Override
-    public Component getTableCellRendererComponent(final JTable table,
-            final Object value, final boolean isSelected,
-            final boolean hasFocus, final int row, final int column) {
-        Color colour = null;
-        if (value != null && !((String) value).isEmpty()) {
-            final Colour temp = colourManager.getColourFromString((String) value, null);
-            if (temp != null) {
-                colour = UIUtilities.convertColour(temp);
-            }
-        }
-
-        setHorizontalAlignment(CENTER);
-
-        if (colour == null) {
+    protected void setValue(final Object value) {
+        final Color color = (Color) value;
+        if (color == null) {
             setBorder(new LineBorder(Color.GRAY));
             setText("Not Set");
-            setBackground(table.getBackground());
         } else {
             setBorder(new LineBorder(Color.BLACK));
             setText("");
-            setBackground(colour);
+            setBackground(color);
         }
-
-        return this;
     }
 
 }

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nickcolours;
+
+import com.google.auto.value.AutoValue;
+
+import java.awt.Color;
+
+/**
+ *
+ */
+@AutoValue
+public abstract class NickColourEntry {
+
+    NickColourEntry() {}
+
+    public abstract String getNetwork();
+    public abstract String getUser();
+    public abstract Color getColor();
+
+    public static NickColourEntry create(final String network, final String user,
+            final Color color) {
+        return new AutoValue_NickColourEntry(network, user, color);
+    }
+}

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

@@ -22,11 +22,12 @@
 
 package com.dmdirc.addons.nickcolours;
 
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
+import java.awt.Color;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -41,8 +42,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * New nick colour input dialog.
  */
-public class NickColourInputDialog extends StandardDialog
-        implements ActionListener {
+public class NickColourInputDialog extends StandardDialog implements ActionListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -58,8 +58,6 @@ public class NickColourInputDialog extends StandardDialog
     private JTextField network;
     /** text colour input. */
     private ColourChooser textColour;
-    /** nicklist colour input. */
-    private ColourChooser nicklistColour;
 
     /**
      * Creates a new instance of NickColourInputDialog.
@@ -72,7 +70,6 @@ public class NickColourInputDialog extends StandardDialog
      * @param nickname      The nickname that's currently set
      * @param network       The network that's currently set
      * @param textcolour    The text colour that's currently set
-     * @param nickcolour    The nicklist colour that's currently set
      */
     public NickColourInputDialog(
             final Window parentWindow,
@@ -80,7 +77,7 @@ public class NickColourInputDialog extends StandardDialog
             final IconManager iconManager,
             final NickColourPanel panel, final int row,
             final String nickname, final String network,
-            final String textcolour, final String nickcolour) {
+            final Color textcolour) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.panel = panel;
@@ -88,7 +85,7 @@ public class NickColourInputDialog extends StandardDialog
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
-        initComponents(colourManager, iconManager, nickname, network, textcolour, nickcolour);
+        initComponents(colourManager, iconManager, nickname, network, textcolour);
         initListeners();
         layoutComponents();
 
@@ -109,7 +106,7 @@ public class NickColourInputDialog extends StandardDialog
             final ColourManager colourManager,
             final IconManager iconManager,
             final NickColourPanel panel) {
-        this(parentWindow, colourManager, iconManager, panel, -1, "", "", "", "");
+        this(parentWindow, colourManager, iconManager, panel, -1, "", "", null);
 
         isnew = true;
     }
@@ -120,21 +117,17 @@ public class NickColourInputDialog extends StandardDialog
      * @param defaultNickname   The default value for the nickname text field
      * @param defaultNetwork    The default value for the network text field
      * @param defaultTextColour The default value for the text colour option
-     * @param defaultNickColour The default value for the nick colour option
      */
     private void initComponents(
             final ColourManager colourManager,
             final IconManager iconManager,
             final String defaultNickname,
-            final String defaultNetwork, final String defaultTextColour,
-            final String defaultNickColour) {
+            final String defaultNetwork, final Color defaultTextColour) {
         orderButtons(new JButton(), new JButton());
 
         nickname = new JTextField(defaultNickname);
         network = new JTextField(defaultNetwork);
-        textColour = new ColourChooser(colourManager, iconManager, defaultTextColour, true, true);
-        nicklistColour = new ColourChooser(colourManager, iconManager, defaultNickColour,
-                true, true);
+        textColour = new ColourChooser(colourManager, iconManager, "", true, true);
     }
 
     /** Initialises the listeners. */
@@ -156,9 +149,6 @@ public class NickColourInputDialog extends StandardDialog
         add(new JLabel("Text colour: "));
         add(textColour, "growx");
 
-        add(new JLabel("Nicklist colour: "));
-        add(nicklistColour, "growx");
-
         add(getLeftButton(), "right");
         add(getRightButton(), "right");
 
@@ -181,7 +171,7 @@ public class NickColourInputDialog extends StandardDialog
 
         panel.addRow(network.getText().toLowerCase(),
                 nickname.getText().toLowerCase(),
-                nickname.getText().toLowerCase(), nicklistColour.getColour());
+                textColour.getColour());
     }
 
 }

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

@@ -26,7 +26,10 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
+import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -40,18 +43,17 @@ import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.parser.interfaces.StringConverter;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.colours.Colour;
 
+import java.awt.Color;
 import java.awt.Window;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -67,24 +69,19 @@ public class NickColourManager {
 
     /** Manager to parse colours with. */
     private final ColourManager colourManager;
-    /** Config to read settings from. */
-    private final AggregateConfigProvider globalConfig;
-    /** Config binder. */
     private final ConfigBinder configBinder;
-    /** Plugin's setting domain. */
-    private final String domain;
     private final IconManager iconManager;
     private final Provider<Window> mainWindowProvider;
-    /** Event bus to subscribe to events on . */
     private final DMDircMBassador eventBus;
-    /** The plugin's info. */
+    private final NickColourYamlStore nickColourYamlStore;
+    private final Path path;
     private final PluginInfo pluginInfo;
-    /** "Random" colours to use to colour nicknames. */
     private String[] randColours = {
         "E90E7F", "8E55E9", "B30E0E", "18B33C", "58ADB3", "9E54B3", "B39875", "3176B3",};
     private boolean useowncolour;
     private String owncolour;
     private boolean userandomcolour;
+    private Map<String, Color> nickColours;
 
     @Inject
     public NickColourManager(
@@ -94,14 +91,16 @@ public class NickColourManager {
             final IconManager iconManager,
             @MainWindow final Provider<Window> mainWindowProvider,
             @PluginDomain(NickColourPlugin.class) final PluginInfo pluginInfo,
-            final DMDircMBassador eventBus) {
-        this.domain = domain;
-        this.globalConfig = globalConfig;
+            final DMDircMBassador eventBus,
+            final NickColourYamlStore nickColourYamlStore,
+            @Directory(DirectoryType.BASE) final Path path) {
         this.colourManager = colourManager;
         this.iconManager = iconManager;
         this.mainWindowProvider = mainWindowProvider;
         this.pluginInfo = pluginInfo;
         this.eventBus = eventBus;
+        this.nickColourYamlStore = nickColourYamlStore;
+        this.path = path;
         configBinder = globalConfig.getBinder().withDefaultDomain(domain);
     }
 
@@ -127,8 +126,8 @@ public class NickColourManager {
         final StringConverter sc = client.getUser().getConnection().getParser().get()
                 .getStringConverter();
         final User myself = client.getUser();
-        final String nickOption1 = "color:" + sc.toLowerCase(network + ':' + client.getNickname());
-        final String nickOption2 = "color:" + sc.toLowerCase("*:" + client.getNickname());
+        final String nickOption1 = sc.toLowerCase(network + ':' + client.getNickname());
+        final String nickOption2 = sc.toLowerCase("*:" + client.getNickname());
 
         if (useowncolour && client.getUser().equals(myself)) {
             final Colour color = colourManager.getColourFromString(owncolour, null);
@@ -137,22 +136,14 @@ public class NickColourManager {
             putColour(client, getColour(client.getNickname()));
         }
 
-        String[] parts = null;
-
-        if (globalConfig.hasOptionString(domain, nickOption1)) {
-            parts = getParts(globalConfig, domain, nickOption1);
-        } else if (globalConfig.hasOptionString(domain, nickOption2)) {
-            parts = getParts(globalConfig, domain, nickOption2);
+        Color color = null;
+        if (nickColours.containsKey(nickOption1)) {
+            color = nickColours.get(nickOption1);
+        } else if (nickColours.containsKey(nickOption2)) {
+            color = nickColours.get(nickOption2);
         }
-
-        if (parts != null) {
-            Colour textColor = null;
-
-            if (parts[0] != null) {
-                textColor = colourManager.getColourFromString(parts[0], null);
-            }
-
-            putColour(client, textColor);
+        if (color != null) {
+            putColour(client, new Colour(color.getRed(), color.getGreen(), color.getBlue()));
         }
     }
 
@@ -185,69 +176,13 @@ public class NickColourManager {
         return colourManager.getColourFromString(randColours[count], null);
     }
 
-    /**
-     * Reads the nick colour data from the config.
-     *
-     * @param config Config to read settings from
-     * @param domain Config domain
-     *
-     * @return A multi-dimensional array of nick colour info.
-     */
-    public static Object[][] getData(final ReadOnlyConfigProvider config, final String domain) {
-        final Collection<Object[]> data = new ArrayList<>();
-
-        config.getOptions(domain).keySet().stream().filter(key -> key.startsWith("color:"))
-                .forEach(key -> {
-                    final String network = key.substring(6, key.indexOf(':', 6));
-                    final String user = key.substring(1 + key.indexOf(':', 6));
-                    final String[] parts = getParts(config, domain, key);
-
-                    data.add(new Object[]{network, user, parts[0], parts[1]});
-                });
-
-        final Object[][] res = new Object[data.size()][4];
-
-        int i = 0;
-        for (Object[] row : data) {
-            res[i] = row;
-
-            i++;
-        }
-
-        return res;
-    }
-
-    /**
-     * Retrieves the config option with the specified key, and returns an array of the colours that
-     * should be used for it.
-     *
-     * @param config Config to read settings from
-     * @param domain Config domain
-     * @param key    The config key to look up
-     *
-     * @return The colours specified by the given key
-     */
-    private static String[] getParts(final ReadOnlyConfigProvider config, final String domain,
-            final String key) {
-        String[] parts = config.getOption(domain, key).split(":");
-
-        if (parts.length == 0) {
-            parts = new String[]{null, null};
-        } else if (parts.length == 1) {
-            parts = new String[]{parts[0], null};
-        } else if (parts.length == 2) {
-            parts = new String[]{parts[0], parts[1]};
-        }
-
-        return parts;
-    }
-
     /**
      * Loads this plugin.
      */
     public void onLoad() {
         eventBus.subscribe(this);
         configBinder.bind(this, NickColourManager.class);
+        nickColours = nickColourYamlStore.readNickColourEntries(path.resolve("nickcolours.yml"));
     }
 
     /**
@@ -256,6 +191,11 @@ public class NickColourManager {
     public void onUnload() {
         eventBus.unsubscribe(this);
         configBinder.unbind(this);
+        saveNickColourStore(nickColours);
+    }
+
+    public void saveNickColourStore(final Map<String, Color> savingNickColours) {
+        nickColourYamlStore.writeNickColourEntries(path.resolve("nickcolours.yml"), savingNickColours);
     }
 
     @ConfigBinding(key = "useowncolour", invocation = EDTInvocation.class)
@@ -280,29 +220,26 @@ public class NickColourManager {
 
     @Handler
     public void handlePrefsOpened(final ClientPrefsOpenedEvent event) {
-        final PreferencesCategory general = new PluginPreferencesCategory(
-                pluginInfo, "Nick Colours",
-                "General configuration for NickColour plugin.");
-        final PreferencesCategory colours = new PluginPreferencesCategory(
-                pluginInfo, "Colours",
+        final PreferencesCategory general =
+                new PluginPreferencesCategory(pluginInfo, "Nick Colours",
+                        "General configuration for NickColour plugin.");
+        final PreferencesCategory colours = new PluginPreferencesCategory(pluginInfo, "Colours",
                 "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
-                () -> new NickColourPanel(mainWindowProvider.get(), iconManager, colourManager,
-                        event.getModel().getIdentity(), event.getModel().getConfigManager(),
-                        pluginInfo.getDomain()
-                )));
-
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "userandomcolour", "Use random colour",
-                "Use a pseudo-random colour for each person?",
-                event.getModel().getConfigManager(), event.getModel().getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "useowncolour", "Use colour for own nick",
-                "Always use the same colour for our own nickname?",
-                event.getModel().getConfigManager(), event.getModel().getIdentity()));
+                () -> new NickColourPanel(mainWindowProvider.get(), iconManager,
+                        colourManager, this, nickColours)));
+
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, pluginInfo.getDomain(),
+                        "userandomcolour", "Use random colour",
+                        "Use a pseudo-random colour for each person?",
+                        event.getModel().getConfigManager(), event.getModel().getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, pluginInfo.getDomain(),
+                        "useowncolour", "Use colour for own nick",
+                        "Always use the same colour for our own nickname?",
+                        event.getModel().getConfigManager(), event.getModel().getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.COLOUR, pluginInfo.getDomain(),
-                "owncolour", "Colour to use for own nick",
-                "Colour used for our own nickname, if above setting is enabled.",
-                event.getModel().getConfigManager(), event.getModel().getIdentity()));
+                        "owncolour", "Colour to use for own nick",
+                        "Colour used for our own nickname, if above setting is enabled.",
+                        event.getModel().getConfigManager(), event.getModel().getIdentity()));
 
         general.addSubCategory(colours);
         event.getModel().getCategory("Plugins").addSubCategory(general);

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

@@ -22,18 +22,18 @@
 
 package com.dmdirc.addons.nickcolours;
 
-import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.addons.ui_swing.components.GenericTableModel;
 import com.dmdirc.addons.ui_swing.components.IconManager;
+import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.util.colours.Colour;
 
 import java.awt.Color;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.JButton;
 import javax.swing.JPanel;
@@ -41,8 +41,6 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -54,13 +52,8 @@ public class NickColourPanel extends JPanel implements ActionListener,
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The table headings. */
-    private static final String[] HEADERS
-            = {"Network", "Nickname", "Text colour", "Nicklist colour"};
     /** The table used for displaying the options. */
     private final JTable table;
-    /** The identity to write settings to. */
-    private final ConfigProvider configIdentity;
     /** Edit button. */
     private final JButton editButton;
     /** Delete button. */
@@ -71,10 +64,8 @@ public class NickColourPanel extends JPanel implements ActionListener,
     private final IconManager iconManager;
     /** Colour manage to use to parse colours. */
     private final ColourManager colourManager;
-    /** Config provider to read settings from. */
-    private final AggregateConfigProvider config;
-    /** The plugin's config domain. */
-    private final String domain;
+    private final NickColourManager manager;
+    private final GenericTableModel<NickColourEntry> model;
 
     /**
      * Creates a new instance of NickColourPanel.
@@ -82,51 +73,25 @@ public class NickColourPanel extends JPanel implements ActionListener,
      * @param parentWindow  Parent window that will own any new dialogs.
      * @param iconManager   Icon manager to load icons from.
      * @param colourManager The colour manager to use to parse colours.
-     * @param userSettings  The provider to write user settings to.
-     * @param config        The config provider to read settings from.
-     * @param domain        The plugin's config domain
+     * @param nickColours
      */
-    public NickColourPanel(
-            final Window parentWindow, final IconManager iconManager,
-            final ColourManager colourManager,
-            final ConfigProvider userSettings,
-            final AggregateConfigProvider config, final String domain) {
+    public NickColourPanel(final Window parentWindow, final IconManager iconManager,
+            final ColourManager colourManager, final NickColourManager manager,
+            Map<String, Color> nickColours) {
         this.parentWindow = parentWindow;
         this.iconManager = iconManager;
         this.colourManager = colourManager;
-        this.configIdentity = userSettings;
-        this.config = config;
-        this.domain = domain;
-
-        final Object[][] data = NickColourManager.getData(config, domain);
-
-        table = new JTable(new DefaultTableModel(data, HEADERS)) {
-            /** A version number for this class. */
-            private static final long serialVersionUID = 1;
-            /** The colour renderer we're using for colour cells. */
-            private final ColourRenderer colourRenderer = new ColourRenderer(colourManager);
-
-            @Override
-            public TableCellRenderer getCellRenderer(final int row,
-                    final int column) {
-                if (column == 2 || column == 3) {
-                    return colourRenderer;
-                } else {
-                    return super.getCellRenderer(row, column);
-                }
-            }
-
-            @Override
-            public boolean isCellEditable(final int row, final int column) {
-                return false;
-            }
-        };
-
+        this.manager = manager;
+        model = new GenericTableModel<>(NickColourEntry.class,
+                "getUser", "getNetwork", "getColor");
+        nickColours.forEach((description, colour) -> model.addValue(NickColourEntry
+                .create(description.split(":")[0], description.split(":")[1], colour)));
+        model.setHeaderNames("User", "Network", "Colour");
+        table = new JTable(model);
+        table.setDefaultRenderer(Color.class, new ColourRenderer());
         final JScrollPane scrollPane = new JScrollPane(table);
-
         table.getSelectionModel().addListSelectionListener(this);
         table.setFillsViewportHeight(true);
-        table.setDefaultRenderer(Color.class, new ColourRenderer(colourManager));
 
         setLayout(new MigLayout("ins 0, fillx, hmax 500"));
         add(scrollPane, "grow, push, wrap, spanx");
@@ -155,23 +120,16 @@ public class NickColourPanel extends JPanel implements ActionListener,
                 new NickColourInputDialog(parentWindow, colourManager, iconManager, this);
                 break;
             case "Edit":
-                final DefaultTableModel model = ((DefaultTableModel) table.getModel());
-                final String network = (String) model.getValueAt(row, 0);
-                final String nickname = (String) model.getValueAt(row, 1);
-                String textcolour = (String) model.getValueAt(row, 2);
-                String nickcolour = (String) model.getValueAt(row, 3);
-                if (textcolour == null) {
-                    textcolour = "";
-                }
-                if (nickcolour == null) {
-                    nickcolour = "";
-                }
+                final NickColourEntry entry = model.getValue(row);
+                final String network = entry.getNetwork();
+                final String nickname = entry.getUser();
+                final Color textcolour = entry.getColor();
                 new NickColourInputDialog(parentWindow, colourManager, iconManager, this,
-                        row, nickname, network, textcolour, nickcolour);
+                        row, nickname, network, textcolour);
                 break;
             case "Delete":
                 if (row > -1) {
-                    ((DefaultTableModel) table.getModel()).removeRow(row);
+                    model.removeValue(model.getValue(row));
                 }
                 break;
         }
@@ -183,7 +141,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
      * @param row The row to be removed
      */
     public void removeRow(final int row) {
-        ((DefaultTableModel) table.getModel()).removeRow(row);
+        model.removeValue(model.getValue(row));
     }
 
     /**
@@ -192,44 +150,22 @@ public class NickColourPanel extends JPanel implements ActionListener,
      * @param network    The network setting
      * @param nickname   The nickname setting
      * @param textcolour The textpane colour setting
-     * @param nickcolour The nick list colour setting
      */
     public void addRow(final String network, final String nickname,
-            final String textcolour, final String nickcolour) {
-        final DefaultTableModel model = ((DefaultTableModel) table.getModel());
-        model.addRow(new Object[]{network, nickname, textcolour, nickcolour});
-    }
-
-    /**
-     * Retrieves the current data in use by this panel.
-     *
-     * @return This panel's current data.
-     */
-    private List<Object[]> getData() {
-        final List<Object[]> res = new ArrayList<>();
-        final DefaultTableModel model = ((DefaultTableModel) table.getModel());
-
-        @SuppressWarnings("unchecked")
-        final List<List<?>> rows = (List<List<?>>) model.getDataVector();
-        for (List<?> row : rows) {
-            res.add(new Object[]{row.get(0), row.get(1), row.get(2), row.get(3)});
-        }
-
-        return res;
+            final String textcolour) {
+        final Colour colour = colourManager.getColourFromString(textcolour, null);
+        model.addValue(NickColourEntry.create(network, nickname, new Color(colour.getRed(),
+                colour.getGreen(), colour.getBlue())));
     }
 
     @Override
     public void save() {
-        // Remove all old config entries
-        for (Object[] parts : NickColourManager.getData(config, domain)) {
-            configIdentity.unsetOption(domain, "color:" + parts[0] + ":" + parts[1]);
-        }
-
-        // And write the new ones
-        for (Object[] row : getData()) {
-            configIdentity.
-                    setOption(domain, "color:" + row[0] + ":" + row[1], row[2] + ":" + row[3]);
+        final Map<String, Color> values = new HashMap<>();
+        for (int i =0; i < model.getRowCount(); i++) {
+            final NickColourEntry entry = model.getValue(i);
+            values.put(entry.getNetwork()+ ':' +entry.getUser(), entry.getColor());
         }
+        manager.saveNickColourStore(values);
     }
 
     @Override

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

@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nickcolours;
+
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.util.BaseYamlStore;
+import com.dmdirc.util.colours.Colour;
+import com.dmdirc.util.colours.ColourUtils;
+
+import java.awt.Color;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.YamlReaderUtils.asMap;
+import static com.dmdirc.util.YamlReaderUtils.requiredString;
+
+@Singleton
+public class NickColourYamlStore extends BaseYamlStore<NickColourEntry> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NickColourYamlStore.class);
+    private final ColourManager colourManager;
+
+    @Inject
+    public NickColourYamlStore(@GlobalConfig final ColourManager colourManager) {
+        this.colourManager = colourManager;
+    }
+
+    public Map<String, Color> readNickColourEntries(final Path path) {
+        final Map<String, Color> nickColours = new HashMap<>();
+        final Collection<NickColourEntry> nickColourEntries = read(path);
+        nickColourEntries.stream().forEach(
+                e -> nickColours.put(e.getNetwork() + ':' + e.getUser(), e.getColor())
+        );
+        return nickColours;
+    }
+
+    public void writeNickColourEntries(final Path path, final Map<String, Color> nickColours) {
+        final Collection<NickColourEntry> nickColourEntries = new ArrayList<>();
+        nickColours.forEach((description, colour) -> nickColourEntries.add(NickColourEntry
+                .create(description.split(":")[0], description.split(":")[1], colour)));
+        write(path, nickColourEntries);
+    }
+
+    @Override
+    protected Optional<NickColourEntry> convertFromYaml(final Object object) {
+        try {
+            final Map<Object, Object> map = asMap(object);
+            final String network = requiredString(map, "network");
+            final String user = requiredString(map, "user");
+            final String colour = requiredString(map, "colour");
+            return Optional.of(NickColourEntry.create(network, user, getColourFromString(colour)));
+        } catch (IllegalArgumentException ex) {
+            LOG.info("Unable to read profile", ex);
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    protected Object convertToYaml(final NickColourEntry object) {
+        final Map<Object, Object> map = new HashMap<>();
+        map.put("network", object.getNetwork());
+        map.put("user", object.getUser());
+        map.put("colour", getStringFromColor(object.getColor()));
+        return map;
+    }
+
+    private Color getColourFromString(final String value) {
+        final Colour colour = colourManager.getColourFromString(value, null);
+        return new Color(colour.getRed(), colour.getGreen(), colour.getBlue());
+    }
+
+    private String getStringFromColor(final Color color) {
+        return ColourUtils.getHex(new Colour(color.getRed(), color.getGreen(), color.getBlue()));
+    }
+}