Changeset 6801 in josm for trunk/src

Timestamp:

2014-02-02T20:13:06+01:00 (11 years ago)

Author:

simon04

Message:

fix #9656 - Repair upload order of objects to be deleted (regression from r6776)

File:

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

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

@@ -237 +237 @@
 
         LinkedList<OsmPrimitive> newToDelete = new LinkedList<OsmPrimitive>();
-        newToDelete.addAll(Utils.filteredCollection(toDelete, Node.class));
-        newToDelete.addAll(Utils.filteredCollection(toDelete, Way.class));
         graph = new RelationUploadDependencyGraph(Utils.filteredCollection(toDelete, Relation.class), false);
         newToDelete.addAll(graph.computeUploadOrder());
+        newToDelete.addAll(Utils.filteredCollection(toDelete, Way.class));
+        newToDelete.addAll(Utils.filteredCollection(toDelete, Node.class));
         toDelete = newToDelete;
     }