Remove URLHandlerTableModel.

ui_swing/src/com/dmdirc/addons/ui_swing/components/GenericTableModel.java

@@ -24,6 +24,8 @@ package com.dmdirc.addons.ui_swing.components;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -240,6 +242,15 @@ public class GenericTableModel<T> extends AbstractTableModel {
         fireTableRowsInserted(index, index);
     }
 
+    /**
+     * Returns a collection of all the elements in this model.
+     *
+     * @return All elements in the model
+     */
+    public Collection<T> elements() {
+        return Collections.unmodifiableCollection(values);
+    }
+
     @SuppressWarnings("unchecked")
     private T castObjectToType(final Object value) {
         return (T) value;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -24,6 +24,8 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
+import com.dmdirc.addons.ui_swing.components.GenericTableModel;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
@@ -32,7 +34,6 @@ import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.validators.URLProtocolValidator;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
@@ -40,6 +41,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -52,7 +54,6 @@ import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import javax.swing.table.TableCellRenderer;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -73,7 +74,7 @@ public class URLConfigPanel extends JPanel implements
     /** Protocol list. */
     private PackingTable table;
     /** Table mode. */
-    private URLHandlerTableModel model;
+    private GenericTableModel<URLHandlerHolder> model;
     /** Table scrollpane. */
     private JScrollPane tableScrollPane;
     /** Protocol config panel. */
@@ -122,23 +123,10 @@ public class URLConfigPanel extends JPanel implements
      */
     private void initComponents() {
         tableScrollPane = new JScrollPane();
-        model = new URLHandlerTableModel(globalConfig);
-        table = new PackingTable(model, tableScrollPane) {
-            private static final long serialVersionUID = 1;
-
-            @Override
-            public TableCellRenderer getCellRenderer(final int row,
-                    final int column) {
-                switch (column) {
-                    case 0:
-                        return new URISchemeCellRenderer();
-                    case 1:
-                        return new URIHandlerCellRenderer();
-                    default:
-                        return super.getCellRenderer(row, column);
-                }
-            }
-        };
+        model = new GenericTableModel<>(URLHandlerHolder.class, "getUri", "getHandler");
+        table = new PackingTable(model, tableScrollPane);
+        table.setDefaultRenderer(URISchemeCellRenderer.class, new URISchemeCellRenderer());
+        table.setDefaultRenderer(URIHandlerCellRenderer.class, new URIHandlerCellRenderer());
         table.setAutoCreateRowSorter(true);
         table.setAutoCreateColumnsFromModel(true);
         table.setColumnSelectionAllowed(false);
@@ -161,7 +149,7 @@ public class URLConfigPanel extends JPanel implements
         for (final String option : options) {
             try {
                 final URI uri = new URI(option + "://example.test.com");
-                model.addURI(uri);
+                model.addValue(new URLHandlerHolder(uri, getURLHandler(uri)));
                 details.put(uri, new URLProtocolPanel(globalConfig, userConfig, uri, true));
             } catch (final URISyntaxException ex) {
                 //Ignore wont happen
@@ -169,6 +157,14 @@ public class URLConfigPanel extends JPanel implements
         }
     }
 
+    private String getURLHandler(final URI uri) {
+        if (globalConfig.hasOptionString("protocol", uri.getScheme())) {
+            return globalConfig.getOption("protocol", uri.getScheme());
+        } else {
+            return "";
+        }
+    }
+
     /**
      * Adds listeners.
      */
@@ -194,7 +190,9 @@ public class URLConfigPanel extends JPanel implements
     @Override
     public void save() {
         valueChanged(null);
-        final Map<URI, String> handlers = model.getURLHandlers();
+        final Collection<URLHandlerHolder> elements = model.elements();
+        final Map<URI, String> handlers = new HashMap<>();
+        elements.forEach(u -> handlers.put(u.getUri(), u.getHandler()));
         final Set<String> protocols = globalConfig.getOptions("protocol").keySet();
         for (final String protocol : protocols) {
             URI uri;
@@ -237,7 +235,7 @@ public class URLConfigPanel extends JPanel implements
             setVisible(false);
             if (selectedRow != -1 && selectedRow < model.getRowCount()) {
                 final URLProtocolPanel panel = details.get(model.getValueAt(selectedRow, 0));
-                model.setValueAt(panel.getSelection(), selectedRow, 1);
+                model.getValue(selectedRow).setHandler(panel.getSelection());
             }
             if (table.getSelectedRow() == -1) {
                 activeComponent = empty;
@@ -246,8 +244,8 @@ public class URLConfigPanel extends JPanel implements
                 remove.setEnabled(false);
                 selectedRow = -1;
             } else {
-                activeComponent = details.get(model.getValueAt(table.getRowSorter().
-                        convertRowIndexToModel(table.getSelectedRow()), 0));
+                activeComponent = details.get(model.getValue(table.getRowSorter().
+                        convertRowIndexToModel(table.getSelectedRow())).getUri());
                 layoutComponents();
                 add.setEnabled(true);
                 remove.setEnabled(true);
@@ -267,14 +265,15 @@ public class URLConfigPanel extends JPanel implements
                     new URLProtocolValidator(globalConfig), this::saveAddNewURLHandler).display();
 
         } else if (e.getSource() == remove) {
-            model.removeURI(table.getRowSorter().convertRowIndexToModel(table.getSelectedRow()));
+            model.removeValue(model.getValue(table.getRowSorter().convertRowIndexToModel(
+                    table.getSelectedRow())));
         }
     }
 
     private boolean saveAddNewURLHandler(final String text) {
         try {
             final URI uri = new URI(text + "://example.test.com");
-            model.addURI(uri);
+            model.addValue(new URLHandlerHolder(uri, getURLHandler(uri)));
             details.put(uri, new URLProtocolPanel(globalConfig, userConfig, uri, true));
             return true;
         } catch (final URISyntaxException ex) {

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLHandlerHolder.java

@@ -0,0 +1,55 @@
+/*
+ * 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.ui_swing.dialogs.prefs;
+
+import java.net.URI;
+
+/**
+ *
+ */
+public class URLHandlerHolder {
+
+    private URI uri;
+    private String handler;
+
+    public URLHandlerHolder(final URI uri, final String handler) {
+        this.uri = uri;
+        this.handler = handler;
+    }
+
+    public URI getUri() {
+        return uri;
+    }
+
+    public String getHandler() {
+        return handler;
+    }
+
+    public void setUri(URI uri) {
+        this.uri = uri;
+    }
+
+    public void setHandler(String handler) {
+        this.handler = handler;
+    }
+}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLHandlerTableModel.java

@@ -1,215 +0,0 @@
-/*
- * 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.ui_swing.dialogs.prefs;
-
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.table.AbstractTableModel;
-
-/**
- * URL Handler table model.
- */
-public class URLHandlerTableModel extends AbstractTableModel {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3;
-    /** Config Manager. */
-    private final AggregateConfigProvider configManager;
-    /** Data list. */
-    private final List<URI> uris;
-    /** Handlers list. */
-    private final List<String> handlers;
-
-    /**
-     * Instantiates a new table model.
-     *
-     * @param configManager Config manager
-     */
-    public URLHandlerTableModel(final AggregateConfigProvider configManager) {
-        this(configManager, new ArrayList<>(), new ArrayList<>());
-    }
-
-    /**
-     * Instantiates a new table model.
-     *
-     * @param configManager Config manager
-     * @param uris          URIs to show
-     * @param handlers      Handlers to show
-     */
-    public URLHandlerTableModel(final AggregateConfigProvider configManager,
-            final List<URI> uris, final List<String> handlers) {
-
-        this.configManager = configManager;
-        this.uris = uris;
-        this.handlers = handlers;
-    }
-
-    @Override
-    public int getRowCount() {
-        return uris.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 2;
-    }
-
-    @Override
-    public String getColumnName(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return "Protocol";
-            case 1:
-                return "Handler";
-            default:
-                throw new IllegalArgumentException("Unknown column: "
-                        + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return URI.class;
-            case 1:
-                return String.class;
-            default:
-                throw new IllegalArgumentException("Unknown column: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Object getValueAt(final int rowIndex, final int columnIndex) {
-        if (uris.size() <= rowIndex) {
-            throw new IndexOutOfBoundsException(rowIndex + " >= "
-                    + uris.size());
-        }
-        if (rowIndex < 0) {
-            throw new IllegalArgumentException(
-                    "Must specify a positive integer");
-        }
-        switch (columnIndex) {
-            case 0:
-                return uris.get(rowIndex);
-            case 1:
-                return handlers.get(rowIndex);
-            default:
-                throw new IllegalArgumentException("Unknown column: "
-                        + columnIndex);
-        }
-    }
-
-    @Override
-    public void setValueAt(final Object aValue, final int rowIndex,
-            final int columnIndex) {
-        if (uris.size() <= rowIndex) {
-            throw new IndexOutOfBoundsException(rowIndex + " >= "
-                    + uris.size());
-        }
-        if (rowIndex < 0) {
-            throw new IllegalArgumentException(
-                    "Must specify a positive integer");
-        }
-        switch (columnIndex) {
-            case 0:
-                if (!(aValue instanceof URI)) {
-                    throw new IllegalArgumentException("Value must be a URI");
-                }
-                uris.set(rowIndex, (URI) aValue);
-                break;
-            case 1:
-                if (!(aValue instanceof String)) {
-                    throw new IllegalArgumentException(
-                            "Value must be a String");
-                }
-                handlers.set(rowIndex, (String) aValue);
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown column: "
-                        + columnIndex);
-        }
-        fireTableCellUpdated(rowIndex, columnIndex);
-    }
-
-    /**
-     * Adds a URI to the model.
-     *
-     * @param uri URI to add
-     */
-    public void addURI(final URI uri) {
-        final String handler;
-        if (configManager.hasOptionString("protocol", uri.getScheme())) {
-            handler = configManager.getOption("protocol", uri.getScheme());
-        } else {
-            handler = "";
-        }
-        uris.add(uri);
-        handlers.add(handler);
-        fireTableRowsInserted(uris.size() - 1, uris.size() - 1);
-    }
-
-    /**
-     * Removes a URI to the model.
-     *
-     * @param uri URI to remove
-     */
-    public void removeURI(final URI uri) {
-        removeURI(uris.indexOf(uri));
-    }
-
-    /**
-     * Removes a URI to the model.
-     *
-     * @param index Index of the URI to remove
-     */
-    public void removeURI(final int index) {
-        if (index != -1) {
-            uris.remove(index);
-            handlers.remove(index);
-            fireTableRowsDeleted(index, index);
-        }
-    }
-
-    /**
-     * Returns a map of the URL handlers in this model.
-     *
-     * @return URL Handler map
-     */
-    public Map<URI, String> getURLHandlers() {
-        final Map<URI, String> urlHandlers = new HashMap<>();
-
-        for (int i = 0; i < uris.size(); i++) {
-            urlHandlers.put(uris.get(i), handlers.get(i));
-        }
-
-        return urlHandlers;
-    }
-
-}