Changeset 5080 in osm for applications/editors/josm/plugins/utilsplugin/src

Timestamp:

2007-10-19T12:47:09+02:00 (17 years ago)

Author:

gabriel

Message:

utilsplugin: fix merge-nodes action

File:

• applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/MergeNodesAction.java (modified) (8 diffs)

applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/MergeNodesAction.java

@@ -4 +4 @@
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Collection;
@@ -36 +37 @@
         public void actionPerformed(ActionEvent e) {
                 Collection<OsmPrimitive> sel = Main.ds.getSelected();
-                Collection<Node> nodes = new ArrayList<Node>();
+                HashSet<Node> nodes = new HashSet<Node>();
 
                 for (OsmPrimitive osm : sel)
@@ -59 +60 @@
 
                 Node newTarget = new Node(target);
-                cmds.add(new ChangeCommand(target, newTarget));
 
                 // Don't place the merged node on one of the former nodes.
@@ -71 +71 @@
                         x / nodes.size(), y / nodes.size());
 
-                nodes.remove(target);
+                cmds.add(new ChangeCommand(target, newTarget));
 
-                cmds.add(new DeleteCommand(nodes));
+                HashSet<Node> delNodes = new HashSet<Node>(nodes);
+                delNodes.remove(target);
+                cmds.add(new DeleteCommand(delNodes));
 
                 for (Way w : Main.ds.ways) {
@@ -87 +89 @@
                         if (!affected) continue;
 
-                        // Replace the old nodes with the merged ones
+                        // Replace the old nodes with the merged one
                         Way wnew = new Way(w);
                         for (int i = 0; i < wnew.nodes.size(); i++) {
                                 if (nodes.contains(wnew.nodes.get(i))) {
-                                        wnew.nodes.set(i, newTarget);
+                                        wnew.nodes.set(i, target);
                                 }
                         }
@@ -98 +100 @@
                         Node lastN = null;
                         for (int i = wnew.nodes.size() - 1; i >= 0; i--) {
-                                if (lastN == wnew.nodes.get(i)) {
-                                        wnew.nodes.remove(i);
-                                        if (i < wnew.nodes.size()) i++;
-                                }
+                                Node n = wnew.nodes.get(i);
+                                if (lastN == n) wnew.nodes.remove(i);
+                                lastN = n;
                         }
 
@@ -111 +112 @@
                                         JOptionPane.showMessageDialog(Main.parent,
                                                 tr("Cannot merge nodes: " +
-                                                        "Would have to delete way that is still used."));
+                                                        "Would have to delete a way that is still used."));
                                         return;
                                 }
@@ -122 +123 @@
 
                 Main.main.undoRedo.add(new SequenceCommand(tr("Merge Nodes"), cmds));
+                Main.ds.setSelected(newTarget);
                 Main.map.repaint();
         }