Changeset 13420 in josm for trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

Timestamp:

2018-02-12T23:19:49+01:00 (6 years ago)

Author:

bastiK

Message:

fixed #11607 - RangeViolatedError: the new range must be within a single subrange

File:

• trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -115 +115 @@
                 }
             }
+            getAffectedDataSet().clearMappaintCache();
         } finally {
             getAffectedDataSet().endUpdate();
@@ -126 +127 @@
             return;
 
-        for (OsmPrimitive osm : toPurge) {
-            PrimitiveData data = makeIncompleteDataByPrimId.get(osm);
-            if (data != null) {
-                if (getAffectedDataSet().getPrimitiveById(osm) != osm)
-                    throw new AssertionError(
-                            String.format("Primitive %s has been made incomplete when purging, but it cannot be found on undo.", osm));
-                osm.load(data);
-            } else {
-                if (getAffectedDataSet().getPrimitiveById(osm) != null)
-                    throw new AssertionError(String.format("Primitive %s was removed when purging, but is still there on undo", osm));
-                getAffectedDataSet().addPrimitive(osm);
-            }
-        }
-
-        for (Conflict<?> conflict : purgedConflicts) {
-            getAffectedDataSet().getConflicts().add(conflict);
+        getAffectedDataSet().beginUpdate();
+        try {
+            for (OsmPrimitive osm : toPurge) {
+                PrimitiveData data = makeIncompleteDataByPrimId.get(osm);
+                if (data != null) {
+                    if (getAffectedDataSet().getPrimitiveById(osm) != osm)
+                        throw new AssertionError(
+                                String.format("Primitive %s has been made incomplete when purging, but it cannot be found on undo.", osm));
+                    osm.load(data);
+                } else {
+                    if (getAffectedDataSet().getPrimitiveById(osm) != null)
+                        throw new AssertionError(String.format("Primitive %s was removed when purging, but is still there on undo", osm));
+                    getAffectedDataSet().addPrimitive(osm);
+                }
+            }
+
+            for (Conflict<?> conflict : purgedConflicts) {
+                getAffectedDataSet().getConflicts().add(conflict);
+            }
+            getAffectedDataSet().clearMappaintCache();
+        } finally {
+            getAffectedDataSet().endUpdate();
         }
     }