Changeset 2945 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.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/conflict/pair/tags/TagMerger.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -26 +26 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
@@ -241 +242 @@
     public TagMergeModel getModel() {
         return model;
+    }
+
+    private void selectNextConflict(int[] rows) {
+        int max = rows[0];
+        for (int row: rows) {
+            if (row > max) {
+                max = row;
+            }
+        }
+        int index = model.getFirstUndecided(max+1);
+        if (index == -1) {
+            index = model.getFirstUndecided(0);
+        }
+        mineTable.getSelectionModel().setSelectionInterval(index, index);
+        theirTable.getSelectionModel().setSelectionInterval(index, index);
     }
 
@@ -265 +281 @@
                 return;
             model.decide(rows, MergeDecisionType.KEEP_MINE);
+            selectNextConflict(rows);
         }
 
@@ -294 +311 @@
                 return;
             model.decide(rows, MergeDecisionType.KEEP_THEIR);
+            selectNextConflict(rows);
         }
 
@@ -402 +420 @@
         }
     }
+
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
+        model.populate(my, their);
+        mineTable.getSelectionModel().setSelectionInterval(0, 0);
+        theirTable.getSelectionModel().setSelectionInterval(0, 0);
+    }
 }