Changeset 2949 in josm for trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
- Timestamp:
- 2010-02-07T22:54:58+01:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r2915 r2949 34 34 */ 35 35 public class ConflictCollection implements Iterable<Conflict<?>>{ 36 private ArrayList<Conflict<?>> conflicts;36 private final List<Conflict<?>> conflicts; 37 37 private CopyOnWriteArrayList<IConflictListener> listeners; 38 38 … … 313 313 return size() == 0; 314 314 } 315 316 @Override 317 public String toString() { 318 return conflicts.toString(); 319 } 315 320 }
Note:
See TracChangeset
for help on using the changeset viewer.