Changeset 6175 in josm for trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
- Timestamp:
- 2013-08-22T14:41:30+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r6104 r6175 37 37 private CopyOnWriteArrayList<IConflictListener> listeners; 38 38 39 /** 40 * Constructs a new {@code ConflictCollection}. 41 */ 39 42 public ConflictCollection() { 40 conflicts = new ArrayList<Conflict<? >>();43 conflicts = new ArrayList<Conflict<? extends OsmPrimitive>>(); 41 44 listeners = new CopyOnWriteArrayList<IConflictListener>(); 42 45 } 43 46 47 /** 48 * Adds the specified conflict listener, if not already present. 49 * @param listener The conflict listener to add 50 */ 44 51 public void addConflictListener(IConflictListener listener) { 45 52 if (listener != null) { … … 48 55 } 49 56 57 /** 58 * Removes the specified conflict listener. 59 * @param listener The conflict listener to remove 60 */ 50 61 public void removeConflictListener(IConflictListener listener) { 51 62 listeners.remove(listener);
Note:
See TracChangeset
for help on using the changeset viewer.