Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/conflict
- Timestamp:
- 2014-04-26T17:39:23+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r6555 r7005 64 64 */ 65 65 public ConflictCollection() { 66 conflicts = new ArrayList< Conflict<? extends OsmPrimitive>>();67 listeners = new CopyOnWriteArrayList< IConflictListener>();66 conflicts = new ArrayList<>(); 67 listeners = new CopyOnWriteArrayList<>(); 68 68 } 69 69 … … 148 148 */ 149 149 public void add(OsmPrimitive my, OsmPrimitive their) { 150 addConflict(new Conflict< OsmPrimitive>(my, their));150 addConflict(new Conflict<>(my, their)); 151 151 fireConflictAdded(); 152 152 } … … 322 322 */ 323 323 public Set<OsmPrimitive> getMyConflictParties() { 324 HashSet<OsmPrimitive> ret = new HashSet< OsmPrimitive>();324 HashSet<OsmPrimitive> ret = new HashSet<>(); 325 325 for (Conflict<?> c: conflicts) { 326 326 ret.add(c.getMy()); … … 336 336 */ 337 337 public Set<OsmPrimitive> getTheirConflictParties() { 338 HashSet<OsmPrimitive> ret = new HashSet< OsmPrimitive>();338 HashSet<OsmPrimitive> ret = new HashSet<>(); 339 339 for (Conflict<?> c: conflicts) { 340 340 ret.add(c.getTheir());
Note:
See TracChangeset
for help on using the changeset viewer.