Changeset 5265 in josm for trunk/src

Timestamp:

2012-06-03T15:16:23+02:00 (12 years ago)

Author:

bastiK

Message:

fixed #7673 - select target node after merge

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• MergeNodesAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (1 diff)

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

@@ -240 +240 @@
     }
 
-    public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode) {
+    public static void doMergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetLocationNode) {
+        if (nodes == null) {
+            return;
+        }
+        Set<Node> allNodes = new HashSet<Node>(nodes);
+        allNodes.add(targetLocationNode);
+        Node target = selectTargetNode(allNodes);
+
+        Command cmd = mergeNodes(layer, nodes, target, targetLocationNode);
+        if (cmd != null) {
+            Main.main.undoRedo.add(cmd);
+            getCurrentDataSet().setSelected(target);
+        }
+    }
+
+    public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetLocationNode) {
         if (nodes == null) {
             return null;
         }
         Set<Node> allNodes = new HashSet<Node>(nodes);
-        allNodes.add(targetNode);
-        return mergeNodes(layer, nodes, selectTargetNode(allNodes), targetNode);
+        allNodes.add(targetLocationNode);
+        return mergeNodes(layer, nodes, selectTargetNode(allNodes), targetLocationNode);
     }
 

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

@@ -909 +909 @@
         Collection<Node> nodesToMerge = new LinkedList<Node>(selNodes);
         nodesToMerge.add(target);
-        Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodesToMerge, target);
-        if (cmd != null) {
-            Main.main.undoRedo.add(cmd);
-            getCurrentDataSet().setSelected(target);
-        }
+        MergeNodesAction.doMergeNodes(Main.main.getEditLayer(), nodesToMerge, target);
     }