Switch ReorderableJList to use GenericListModel.

notifications/src/com/dmdirc/addons/notifications/NotificationConfig.java

@@ -27,7 +27,6 @@ import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
-import java.util.Enumeration;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -85,7 +84,7 @@ public class NotificationConfig extends JPanel implements PreferencesInterface {
         list = new ReorderableJList<>();
 
         for (String method : methods) {
-            list.getModel().addElement(method);
+            list.getModel().add(method);
         }
 
         setLayout(new MigLayout("fillx, ins 0"));
@@ -117,15 +116,7 @@ public class NotificationConfig extends JPanel implements PreferencesInterface {
      * @return An ordered list of methods
      */
     public List<String> getMethods() {
-        final List<String> newMethods = new LinkedList<>();
-
-        final Enumeration<?> values = list.getModel().elements();
-
-        while (values.hasMoreElements()) {
-            newMethods.add((String) values.nextElement());
-        }
-
-        return newMethods;
+        return new LinkedList<>(list.getModel().elements());
     }
 
     @Override

nowplaying/src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -33,7 +33,6 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.Arrays;
-import java.util.Enumeration;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Timer;
@@ -112,7 +111,7 @@ public class ConfigPanel extends JPanel implements PreferencesInterface, KeyList
         list = new ReorderableJList<>();
 
         for (String source : sources) {
-            list.getModel().addElement(source);
+            list.getModel().add(source);
         }
 
         textfield = new JTextField(globalConfig.getOption(domain, "format"));
@@ -178,15 +177,7 @@ public class ConfigPanel extends JPanel implements PreferencesInterface, KeyList
      * @return An ordered list of sources
      */
     public List<String> getSources() {
-        final List<String> newSources = new LinkedList<>();
-
-        final Enumeration<String> values = list.getModel().elements();
-
-        while (values.hasMoreElements()) {
-            newSources.add(values.nextElement());
-        }
-
-        return newSources;
+        return new LinkedList<>(list.getModel().elements());
     }
 
     @Override

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

@@ -54,7 +54,7 @@ public class GenericListModel<T> extends AbstractListModel<T> {
      *
      * @param list Data to be included in the model
      */
-    public GenericListModel(final List<T> list) {
+    public GenericListModel(final Collection<T> list) {
 
         this.list = Collections.synchronizedList(new ArrayList<>(list));
     }
@@ -221,6 +221,15 @@ public class GenericListModel<T> extends AbstractListModel<T> {
         fireIntervalRemoved(this, start, end);
     }
 
+    /**
+     * Returns a list of items in this model
+     *
+     * @return List available in this model
+     */
+    public List<T> elements() {
+        return Collections.unmodifiableList(list);
+    }
+
     /**
      * Adds all the objects in the specified collection to this list.
      *

ui_swing/src/com/dmdirc/addons/ui_swing/components/reorderablelist/ListReorderButtonPanel.java

@@ -22,10 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.reorderablelist;
 
+import com.dmdirc.addons.ui_swing.components.GenericListModel;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.swing.DefaultListModel;
 import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -47,7 +48,7 @@ public class ListReorderButtonPanel<T> extends JPanel implements
     /** List to reorder. */
     private final JList<T> list;
     /** Default list model. */
-    private final DefaultListModel<T> model;
+    private final GenericListModel<T> model;
     /** Up button. */
     private final JButton up;
     /** Down button. */
@@ -129,7 +130,7 @@ public class ListReorderButtonPanel<T> extends JPanel implements
      * @param newIndex Current index
      */
     private void moveElement(final T object, final int newIndex) {
-        model.removeElement(object);
+        model.remove(object);
         model.add(newIndex, object);
         list.setSelectedIndex(newIndex);
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/reorderablelist/ReorderableJList.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.reorderablelist;
 
+import com.dmdirc.addons.ui_swing.components.GenericListModel;
+
 import java.awt.Cursor;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -75,7 +77,7 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
 
     /** Instantiate new ReorderableJList. */
     public ReorderableJList() {
-        this(new DefaultListModel<>());
+        this(new GenericListModel<>());
     }
 
     /**
@@ -83,7 +85,7 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
      *
      * @param model Model
      */
-    public ReorderableJList(final DefaultListModel<T> model) {
+    public ReorderableJList(final GenericListModel<T> model) {
         super(model);
 
         setCellRenderer(new ReorderableJListCellRenderer<>(this));
@@ -104,8 +106,8 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
     }
 
     @Override
-    public DefaultListModel<T> getModel() {
-        return (DefaultListModel<T>) super.getModel();
+    public GenericListModel<T> getModel() {
+        return (GenericListModel<T>) super.getModel();
     }
 
     @Override
@@ -113,7 +115,7 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
         if (model instanceof DefaultListModel) {
             super.setModel(model);
         } else {
-            throw new IllegalArgumentException("model needs to be an instance of DefaultListModel");
+            throw new IllegalArgumentException("model needs to be an instance of GenericListModel");
         }
     }
 
@@ -242,10 +244,10 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
 
         //move items
         final boolean sourceBeforeTarget = draggedIndex < index;
-        final DefaultListModel<T> mod = getModel();
+        final GenericListModel<T> mod = getModel();
         final int newIndex = sourceBeforeTarget ? index - 1 : index;
         mod.remove(draggedIndex);
-        for (Object item : (ArrayList<?>) dragged) {
+        for (Object item : (Iterable<?>) dragged) {
             @SuppressWarnings("unchecked")
             final T genericItem = (T) item;
             mod.add(newIndex, genericItem);