Changeset 5176 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2012-04-11T19:56:14+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7593 - IllegalPathStateException when attempting to purge an item in a Multipolygon

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -221 +221 @@
                 }
             }
-            poly.closePath();
+            if (!initial) { // fix #7593
+                poly.closePath();
+            }
             for (PolyData inner : inners) {
                 appendInner(inner.poly);
@@ -278 +280 @@
         }
         
-        private void resetNodes() {
+        private void resetNodes(DataSet dataSet) {
             if (!nodes.isEmpty()) {
-                DataSet ds = null;
+                DataSet ds = dataSet;
                 // Find DataSet (can be null for several nodes when undoing nodes creation, see #7162)
                 for (Iterator<Node> it = nodes.iterator(); it.hasNext() && ds == null; ) {
@@ -331 +333 @@
             for (PolyData inner : inners) {
                 if (inner.wayIds.contains(wayId)) {
-                    inner.resetNodes();
+                    inner.resetNodes(event.getDataset());
                     innerChanged = true;
                 }
             }
             if (wayIds.contains(wayId) || innerChanged) {
-                resetNodes();
+                resetNodes(event.getDataset());
             }
         }