Changeset 4100 in josm for trunk/src/org/openstreetmap/josm/data/APIDataSet.java

Timestamp:

2011-05-29T21:04:54+02:00 (13 years ago)

Author:

bastiK

Message:

use IPrimitive to make upload code work for both OsmPrimitive and PrimitiveData

File:

• trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -286 +287 @@
     public void adjustRelationUploadOrder() throws CyclicUploadDependencyException{
         LinkedList<OsmPrimitive> newToAdd = new LinkedList<OsmPrimitive>();
-        newToAdd.addAll(OsmPrimitive.getFilteredList(toAdd, Node.class));
-        newToAdd.addAll(OsmPrimitive.getFilteredList(toAdd, Way.class));
-
-        List<Relation> relationsToAdd = OsmPrimitive.getFilteredList(toAdd, Relation.class);
+        newToAdd.addAll(Utils.filteredCollection(toAdd, Node.class));
+        newToAdd.addAll(Utils.filteredCollection(toAdd, Way.class));
+
+        List<Relation> relationsToAdd = new ArrayList<Relation>(Utils.filteredCollection(toAdd, Relation.class));
         List<Relation> noProblemRelations = filterRelationsNotReferringToNewRelations(relationsToAdd);
         newToAdd.addAll(noProblemRelations);