Ticket #3817: fix-DataSet-cast-warning.patch
File fix-DataSet-cast-warning.patch, 1.1 KB (added by , 14 years ago) |
---|
-
src/org/openstreetmap/josm/data/osm/DataSet.java
old new 627 627 } 628 628 629 629 public Set<Relation> getReferringRelations(Collection<? extends OsmPrimitive> primitives) { 630 return this.getReferringRelations(new HashSet<OsmPrimitive>(primitives)); 631 } 632 public Set<Relation> getReferringRelations(Set<? extends OsmPrimitive> referred) { 630 633 HashSet<Relation> ret = new HashSet<Relation>(); 631 if (primitives == null) return ret; 632 Set<? extends OsmPrimitive> referred; 633 if (primitives instanceof Set<?>) { 634 referred = (Set<? extends OsmPrimitive>)primitives; 635 } else { 636 referred = new HashSet<OsmPrimitive>(primitives); 637 } 634 if (referred == null) return ret; 638 635 referred.remove(null); // just in case - remove null element from primitives 639 636 for (Relation r: relations) { 640 637 if (r.isDeleted() || r.incomplete) {