Changeset 21695 in osm for applications

Timestamp:

2010-06-14T12:48:03+02:00 (14 years ago)

Author:

upliner

Message:

regression fixes.

Question about when we need to sort modified objects still needs investigation.
We should always sort them for a while.

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• DataSetToCmd.java (modified) (1 prop)
• ReverterUploadHook.java (modified) (1 diff)
• UndeletedObjectsStorage.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java

@@ -48 +48 @@
          * error appears when trying to upload objects undeleted by reverter.
          */
-        if (undeletedStorage.haveUndeletedObjects(ds)) {
+        if (true) {
             Collections.sort(
                     apiDataSet.getPrimitivesToUpdate(),

applications/editors/josm/plugins/reverter/src/reverter/UndeletedObjectsStorage.java

@@ -8 +8 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -66 +67 @@
     }
     
-    public List<OsmPrimitive> getUndeletedObjects(DataSet dataSet) {
+    public Set<OsmPrimitive> getUndeletedObjects(DataSet dataSet) {
         pruneObsolete();
         HashSet<PrimitiveIdVersion> idSet = undeletedPrimitives.get(dataSet);
-        if (idSet == null) return null;
-        LinkedList<OsmPrimitive> undeleted = new LinkedList<OsmPrimitive>();
+        HashSet<OsmPrimitive> undeleted = new HashSet<OsmPrimitive>();
+        if (idSet == null) return undeleted;
         for (PrimitiveIdVersion id : idSet) {
             undeleted.add(dataSet.getPrimitiveById(id.getPrimitiveId()));