Changeset 10948 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

Timestamp:

2016-09-03T22:29:48+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13491 - fix EDT violation (patch by Gerd Petermann, modified)

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -21 +21 @@
 import org.openstreetmap.josm.actions.MergeNodesAction;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Hash;
@@ -408 +407 @@
             }
 
-            if (DeleteCommand.checkAndConfirmOutlyingDelete(nodes, Collections.singleton(target)))
+            if (Command.checkOutlyingOrIncompleteOperation("delete", nodes, Collections.singleton(target)) == Command.IS_OK)
                 return MergeNodesAction.mergeNodes(Main.getLayerManager().getEditLayer(), nodes, target);
         }