Changeset 3142 in josm for trunk

Timestamp:

2010-03-18T16:47:23+01:00 (15 years ago)

Author:

bastiK

Message:

see #4554 - Fixing duplicate nodes takes increasingly longer

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeNodesAction.java (modified) (4 diffs)
• command/ChangeNodesCommand.java (added)

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.DeleteCommand;
@@ -130 +131 @@
      * @return a list of commands; null, if the ways could not be fixed
      */
-    protected static List<Command> fixParentWays(Collection<OsmPrimitive> nodesToDelete, Node targetNode) {
+    protected static List<Command> fixParentWays(Collection<Node> nodesToDelete, Node targetNode) {
         List<Command> cmds = new ArrayList<Command>();
         Set<Way> waysToDelete = new HashSet<Way>();
@@ -180 +181 @@
                 waysToDelete.add(w);
             } else {
-                Way newWay = new Way(w);
-                newWay.setNodes(newNodes);
-                cmds.add(new ChangeCommand(w, newWay));
+                cmds.add(new ChangeNodesCommand(w, newNodes));
             }
         }
@@ -240 +239 @@
         // the nodes we will have to delete
         //
-        Collection<OsmPrimitive> nodesToDelete = new HashSet<OsmPrimitive>(nodes);
+        Collection<Node> nodesToDelete = new HashSet<Node>(nodes);
         nodesToDelete.remove(targetNode);