Tidy the nick colours plugin some more.

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.nickcolours;
 
+import com.dmdirc.addons.ui_swing.components.GenericTableModel;
 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;
@@ -29,8 +30,6 @@ import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -42,7 +41,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * New nick colour input dialog.
  */
-public class NickColourInputDialog extends StandardDialog implements ActionListener {
+public class NickColourInputDialog extends StandardDialog {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -50,8 +49,9 @@ public class NickColourInputDialog extends StandardDialog implements ActionListe
     private boolean isnew;
     /** The row we're editing, if this isn't a new entry. */
     private final int row;
-    /** The NickColourPanel we're reporting to. */
-    private final NickColourPanel panel;
+    private final ColourManager colourManager;
+    /** The table model to modify entries in. */
+    private final GenericTableModel<NickColourEntry> model;
     /** nickname textfield. */
     private JTextField nickname;
     /** network textfield. */
@@ -65,7 +65,7 @@ public class NickColourInputDialog extends StandardDialog implements ActionListe
      * @param parentWindow  The window that owns this dialog.
      * @param colourManager The colour manager to use to retrieve colours.
      * @param iconManager   The icon manager to use for the dialog icon.
-     * @param panel         The panel that's opening this dialog
+     * @param model         The table model to modify entries in
      * @param row           The row of the table we're editing
      * @param nickname      The nickname that's currently set
      * @param network       The network that's currently set
@@ -75,12 +75,13 @@ public class NickColourInputDialog extends StandardDialog implements ActionListe
             final Window parentWindow,
             final ColourManager colourManager,
             final IconManager iconManager,
-            final NickColourPanel panel, final int row,
+            final GenericTableModel<NickColourEntry> model, final int row,
             final String nickname, final String network,
             final Color textcolour) {
         super(parentWindow, ModalityType.MODELESS);
+        this.colourManager = colourManager;
 
-        this.panel = panel;
+        this.model = model;
         this.row = row;
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -99,14 +100,14 @@ public class NickColourInputDialog extends StandardDialog implements ActionListe
      * @param parentWindow  The window that owns this dialog.
      * @param colourManager The colour manager to use to retrieve colours.
      * @param iconManager   The icon manager to use for the dialog icon.
-     * @param panel         The panel that's opening this dialog
+     * @param model         The table model to modify entries in
      */
     public NickColourInputDialog(
             final Window parentWindow,
             final ColourManager colourManager,
             final IconManager iconManager,
-            final NickColourPanel panel) {
-        this(parentWindow, colourManager, iconManager, panel, -1, "", "", null);
+            final GenericTableModel<NickColourEntry> model) {
+        this(parentWindow, colourManager, iconManager, model, -1, "", "", null);
 
         isnew = true;
     }
@@ -132,8 +133,8 @@ public class NickColourInputDialog extends StandardDialog implements ActionListe
 
     /** Initialises the listeners. */
     private void initListeners() {
-        getOkButton().addActionListener(this);
-        getCancelButton().addActionListener(this);
+        getOkButton().addActionListener(e -> saveSettings());
+        getCancelButton().addActionListener(e -> dispose());
     }
 
     /** Lays out the components. */
@@ -155,23 +156,18 @@ public class NickColourInputDialog extends StandardDialog implements ActionListe
         pack();
     }
 
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == getOkButton()) {
-            saveSettings();
-        }
-        dispose();
-    }
-
     /** Saves settings. */
     public void saveSettings() {
-        if (!isnew) {
-            panel.removeRow(row);
-        }
-
-        panel.addRow(network.getText().toLowerCase(),
-                nickname.getText().toLowerCase(),
+        final Color colour = NickColourUtils.getColourFromString(colourManager,
                 textColour.getColour());
+        final NickColourEntry entry = NickColourEntry.create(network.getText().toLowerCase(),
+                nickname.getText().toLowerCase(),
+                new Color(colour.getRed(), colour.getGreen(), colour.getBlue()));
+        if (isnew) {
+            model.replaceValueAt(entry, row);
+        } else {
+            model.addValue(entry);
+        }
     }
 
 }

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

@@ -143,7 +143,7 @@ public class NickColourManager {
             color = nickColours.get(nickOption2);
         }
         if (color != null) {
-            putColour(client, new Colour(color.getRed(), color.getGreen(), color.getBlue()));
+            putColour(client, NickColourUtils.getColourfromColor(color));
         }
     }
 

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

@@ -77,7 +77,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
      */
     public NickColourPanel(final Window parentWindow, final IconManager iconManager,
             final ColourManager colourManager, final NickColourManager manager,
-            Map<String, Color> nickColours) {
+            final Map<String, Color> nickColours) {
         this.parentWindow = parentWindow;
         this.iconManager = iconManager;
         this.colourManager = colourManager;
@@ -117,14 +117,14 @@ public class NickColourPanel extends JPanel implements ActionListener,
         final int row = table.getSelectedRow();
         switch (e.getActionCommand()) {
             case "Add":
-                new NickColourInputDialog(parentWindow, colourManager, iconManager, this);
+                new NickColourInputDialog(parentWindow, colourManager, iconManager, model);
                 break;
             case "Edit":
                 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,
+                new NickColourInputDialog(parentWindow, colourManager, iconManager, model,
                         row, nickname, network, textcolour);
                 break;
             case "Delete":

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

@@ -0,0 +1,49 @@
+/*
+ * 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.ui.messages.ColourManager;
+import com.dmdirc.util.colours.Colour;
+import com.dmdirc.util.colours.ColourUtils;
+
+import java.awt.Color;
+
+final class NickColourUtils {
+
+    private NickColourUtils() {
+        //Utility class
+    }
+
+    static Color getColourFromString(final ColourManager colourManager, final String value) {
+        final Colour colour = colourManager.getColourFromString(value, null);
+        return new Color(colour.getRed(), colour.getGreen(), colour.getBlue());
+    }
+
+    static String getStringFromColor(final Color color) {
+        return ColourUtils.getHex(new Colour(color.getRed(), color.getGreen(), color.getBlue()));
+    }
+
+    static Colour getColourfromColor(final Color color) {
+        return new Colour(color.getRed(), color.getGreen(), color.getBlue());
+    }
+}

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

@@ -25,8 +25,6 @@ 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;
@@ -79,7 +77,8 @@ public class NickColourYamlStore extends BaseYamlStore<NickColourEntry> {
             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)));
+            return Optional.of(NickColourEntry.create(network, user,
+                    NickColourUtils.getColourFromString(colourManager, colour)));
         } catch (IllegalArgumentException ex) {
             LOG.info("Unable to read profile", ex);
             return Optional.empty();
@@ -91,16 +90,7 @@ public class NickColourYamlStore extends BaseYamlStore<NickColourEntry> {
         final Map<Object, Object> map = new HashMap<>();
         map.put("network", object.getNetwork());
         map.put("user", object.getUser());
-        map.put("colour", getStringFromColor(object.getColor()));
+        map.put("colour", NickColourUtils.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()));
-    }
 }