Changeset 2352 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-10-30T22:23:12+01:00 (14 years ago)

Author:

Gubaer

Message:

applied #3817: applied patch by hansendc: fix DataSet cast warning

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -628 +628 @@
 
     public Set<Relation> getReferringRelations(Collection<? extends OsmPrimitive> primitives) {
+        return this.getReferringRelations(new HashSet<OsmPrimitive>(primitives));
+    }
+    public Set<Relation> getReferringRelations(Set<? extends OsmPrimitive> referred) {
         HashSet<Relation> ret = new HashSet<Relation>();
-        if (primitives == null) return ret;
-        Set<? extends OsmPrimitive> referred;
-        if (primitives instanceof Set<?>) {
-            referred = (Set<? extends OsmPrimitive>)primitives;
-        } else {
-            referred = new HashSet<OsmPrimitive>(primitives);
-        }
+        if (referred == null) return ret;
         referred.remove(null); // just in case - remove null element from primitives
         for (Relation r: relations) {