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

Timestamp:

06.02.2010 09:37:48 (2 years ago)

Author:

jttt

Message:

Improvements in conflicts gui

File:

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

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

@@ -137 +137 @@
      */
     private final void resolve() {
-        if (conflicts == null) return;
-        if (conflicts.size() == 1) {
-            lstConflicts.setSelectedIndex(0);
-        }
-
-        if (lstConflicts.getSelectedIndex() == -1)
-            return;
-
-        int [] selectedRows = lstConflicts.getSelectedIndices();
-        if (selectedRows == null || selectedRows.length == 0)
-            return;
-        int row = selectedRows[0];
-        Conflict<?> c = conflicts.get(row);
+        if (conflicts == null || model.getSize() == 0) return;
+
+        int index = lstConflicts.getSelectedIndex();
+        if (index < 0) {
+            index = 0;
+        }
+
+        Conflict<?> c = conflicts.get(index);
         OsmPrimitive my = c.getMy();
         OsmPrimitive their = c.getTheir();
@@ -155 +150 @@
         dialog.getConflictResolver().populate(my, their);
         dialog.setVisible(true);
+
+        lstConflicts.setSelectedIndex(index);
+
         Main.map.mapView.repaint();
     }