Changeset 34999 in osm for applications/editors

Timestamp:

2019-05-16T07:49:43+02:00 (6 years ago)

Author:

gerdp

Message:

fix #17720: partial changeset revert do a revert for the whole changeset
regression of r34958 : accidential remove of method call checkOsmChangeEntry(entry))

File:

• applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (modified) (1 diff)

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

@@ -161 +161 @@
         for (PrimitiveId id : cds.getIds()) {
             ChangesetDataSetEntry first = cds.getFirstEntry(id);
-            ChangesetDataSetEntry last = cds.getLastEntry(id);
             earliestVersions.put(id, (int) first.getPrimitive().getVersion());
-            if (first.getModificationType() == ChangesetModificationType.CREATED)
-                created.add(first.getPrimitive());
-            else if (last.getModificationType() == ChangesetModificationType.UPDATED)
-                updated.add(last.getPrimitive());
-            else if (last.getModificationType() == ChangesetModificationType.DELETED)
-                deleted.add(last.getPrimitive());
+            ChangesetDataSetEntry entry = first.getModificationType() == ChangesetModificationType.CREATED ? first
+                    : cds.getLastEntry(id);
+            if (checkOsmChangeEntry(entry)) {
+                if (entry.getModificationType() == ChangesetModificationType.CREATED) {
+                    created.add(entry.getPrimitive());
+                } else if (entry.getModificationType() == ChangesetModificationType.UPDATED) {
+                    updated.add(entry.getPrimitive());
+                } else if (entry.getModificationType() == ChangesetModificationType.DELETED) {
+                    deleted.add(entry.getPrimitive());
+                }
+            }
         }
     }