Changeset 7001 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java

Timestamp:

2014-04-26T03:53:35+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - switch core to Java 7

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/EditableList.java

@@ -27 +27 @@
 
     public final String title;
-    public final JList sourcesList = new JList(new DefaultListModel());
+    public final JList<String> sourcesList = new JList<String>(new DefaultListModel<String>());
     public final JButton addSrcButton = new JButton(tr("Add"));
     public final JButton editSrcButton = new JButton(tr("Edit"));
@@ -54 +54 @@
                         JOptionPane.QUESTION_MESSAGE);
                 if (source != null) {
-                    ((DefaultListModel) sourcesList.getModel()).addElement(source);
+                    ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
                 }
                 sourcesList.clearSelection();
@@ -72 +72 @@
                         String source = JOptionPane.showInputDialog(Main.parent, title, title, JOptionPane.QUESTION_MESSAGE);
                         if (source != null) {
-                            ((DefaultListModel) sourcesList.getModel()).addElement(source);
+                            ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
                         }
                     } else {
@@ -89 +89 @@
                             sourcesList.getSelectedValue());
                     if (source != null) {
-                        ((DefaultListModel) sourcesList.getModel()).setElementAt(source, row);
+                        ((DefaultListModel<String>) sourcesList.getModel()).setElementAt(source, row);
                     }
                 }
@@ -102 +102 @@
                     JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete."), tr("Information"), JOptionPane.QUESTION_MESSAGE);
                 } else {
-                    ((DefaultListModel) sourcesList.getModel()).remove(sourcesList.getSelectedIndex());
+                    ((DefaultListModel<String>) sourcesList.getModel()).remove(sourcesList.getSelectedIndex());
                 }
             }
@@ -126 +126 @@
     public void setItems(final Iterable<String> items) {
         for (String source : items) {
-            ((DefaultListModel) sourcesList.getModel()).addElement(source);
+            ((DefaultListModel<String>) sourcesList.getModel()).addElement(source);
         }
     }
@@ -133 +133 @@
         final List<String> items = new ArrayList<String>(sourcesList.getModel().getSize());
         for (int i = 0; i < sourcesList.getModel().getSize(); ++i) {
-            items.add((String) sourcesList.getModel().getElementAt(i));
+            items.add(sourcesList.getModel().getElementAt(i));
         }
         return items;