Changeset 5932 in josm

Timestamp:

2013-05-06T02:53:50+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #5680 - IndexOutOfBoundsException when resolving a conflict on untagged primitive

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified) (2 diffs)

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

@@ -231 +231 @@
     }
 
+    /**
+     * Constructs a new {@code TagMerger}.
+     */
     public TagMerger() {
         model = new TagMergeModel();
@@ -424 +427 @@
     public void populate(Conflict<? extends OsmPrimitive> conflict) {
         model.populate(conflict.getMy(), conflict.getTheir());
-        mineTable.getSelectionModel().setSelectionInterval(0, 0);
-        theirTable.getSelectionModel().setSelectionInterval(0, 0);
+        for (JTable table : new JTable[]{mineTable, theirTable}) {
+            int index = table.getRowCount() > 0 ? 0 : -1;
+            table.getSelectionModel().setSelectionInterval(index, index);
+        }
     }
 }