Changeset 8338 in josm for trunk/src/org/openstreetmap/josm/data/conflict
- Timestamp:
- 2015-05-07T01:27:41+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r8291 r8338 320 320 */ 321 321 public Set<OsmPrimitive> getMyConflictParties() { 322 HashSet<OsmPrimitive> ret = new HashSet<>();322 Set<OsmPrimitive> ret = new HashSet<>(); 323 323 for (Conflict<?> c: conflicts) { 324 324 ret.add(c.getMy()); … … 326 326 return ret; 327 327 } 328 328 329 /** 329 330 * Replies the set of {@link OsmPrimitive} which participate in the role … … 334 335 */ 335 336 public Set<OsmPrimitive> getTheirConflictParties() { 336 HashSet<OsmPrimitive> ret = new HashSet<>();337 Set<OsmPrimitive> ret = new HashSet<>(); 337 338 for (Conflict<?> c: conflicts) { 338 339 ret.add(c.getTheir());
Note:
See TracChangeset
for help on using the changeset viewer.