Changeset 2949 in josm for trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

Timestamp:

2010-02-07T22:54:58+01:00 (14 years ago)

Author:

jttt

Message:

Show only one message box in conflicts dialog when multiple members are deleted, use clone method for copyAll method

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -34 +34 @@
  */
 public class ConflictCollection implements Iterable<Conflict<?>>{
-    private ArrayList<Conflict<?>> conflicts;
+    private final List<Conflict<?>> conflicts;
     private CopyOnWriteArrayList<IConflictListener> listeners;
 
@@ -313 +313 @@
         return size() == 0;
     }
+
+    @Override
+    public String toString() {
+        return conflicts.toString();
+    }
 }