Changeset 7001 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - switch core to Java 7

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -81 +81 @@
     private ConflictListModel model;
     /** the list widget for the list of conflicts */
-    private JList lstConflicts;
+    private JList<OsmPrimitive> lstConflicts;
 
     private final JPopupMenu popupMenu = new JPopupMenu();
@@ -95 +95 @@
         model = new ConflictListModel();
 
-        lstConflicts = new JList(model);
+        lstConflicts = new JList<OsmPrimitive>(model);
         lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         lstConflicts.setCellRenderer(new OsmPrimitivRenderer());
@@ -272 +272 @@
             }
         };
-        for (Object o : lstConflicts.getSelectedValues()) {
-            if (conflicts == null || !conflicts.hasConflictForMy((OsmPrimitive)o)) {
+        for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
+            if (conflicts == null || !conflicts.hasConflictForMy(o)) {
                 continue;
             }
-            conflicts.getConflictForMy((OsmPrimitive)o).getTheir().accept(conflictPainter);
+            conflicts.getConflictForMy(o).getTheir().accept(conflictPainter);
         }
     }
@@ -359 +359 @@
      *
      */
-    class ConflictListModel implements ListModel {
+    class ConflictListModel implements ListModel<OsmPrimitive> {
 
         private CopyOnWriteArrayList<ListDataListener> listeners;
@@ -392 +392 @@
 
         @Override
-        public Object getElementAt(int index) {
+        public OsmPrimitive getElementAt(int index) {
             if (index < 0) return null;
             if (index >= getSize()) return null;
@@ -452 +452 @@
         public void actionPerformed(ActionEvent e) {
             Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
-            for (Object o : lstConflicts.getSelectedValues()) {
-                sel.add((OsmPrimitive)o);
+            for (OsmPrimitive o : lstConflicts.getSelectedValuesList()) {
+                sel.add(o);
             }
             DataSet ds = Main.main.getCurrentDataSet();