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

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
@@ -33 +34 @@
 
     /** the list of tag merge items */
-    private final ArrayList<TagMergeItem> tagMergeItems;
+    private final List<TagMergeItem> tagMergeItems;
 
     /** the property change listeners */
-    private final ArrayList<PropertyChangeListener> listeners;
+    private final List<PropertyChangeListener> listeners;
 
     private int numUndecidedTags = 0;
@@ -210 +211 @@
 
     }
+
+    public int getFirstUndecided(int startIndex) {
+        for (int i=startIndex; i<tagMergeItems.size(); i++) {
+            if (tagMergeItems.get(i).getMergeDecision() == MergeDecisionType.UNDECIDED)
+                return i;
+        }
+        return -1;
+    }
 }