Changeset 15050 in josm for trunk

Timestamp:

2019-05-05T17:10:34+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #16904 - make ImproveWayAccuracy aware of primitives deletion to ensure consistency (avoids DataIntegrityProblemException seen on macOS when using undo)

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.preferences.CachingProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -62 +73 @@
  * @author Alexander Kachkaev <alexander@kachkaev.ru>, 2011
  */
-public class ImproveWayAccuracyAction extends MapMode implements DataSelectionListener, ModifierExListener {
+public class ImproveWayAccuracyAction extends MapMode implements DataSelectionListener, DataSetListener, ModifierExListener {
 
     private static final String CROSSHAIR = /* ICON(cursor/)*/ "crosshair";
@@ -157 +168 @@
         map.mapView.addTemporaryLayer(temporaryLayer);
         SelectionEventManager.getInstance().addSelectionListener(this);
+        DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IMMEDIATELY);
 
         map.keyDetector.addModifierExListener(this);
@@ -175 +187 @@
         map.mapView.removeTemporaryLayer(temporaryLayer);
         SelectionEventManager.getInstance().removeSelectionListener(this);
+        DatasetEventManager.getInstance().removeDatasetListener(this);
 
         map.keyDetector.removeModifierExListener(this);
@@ -659 +672 @@
         startSelecting();
     }
+
+    @Override
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
+        if (event.getPrimitives().contains(candidateNode) || event.getPrimitives().contains(targetWay)) {
+            updateCursorDependentObjectsIfNeeded();
+        }
+    }
+
+    @Override
+    public void primitivesAdded(PrimitivesAddedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void tagsChanged(TagsChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void nodeMoved(NodeMovedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void wayNodesChanged(WayNodesChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void relationMembersChanged(RelationMembersChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void dataChanged(DataChangedEvent event) {
+        // Do nothing
+    }
 }