Changeset 2095 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2009-09-12T06:21:30+02:00 (15 years ago)

Author:

Gubaer

Message:

rewrite of MergeNodesAction
new: new conflict resolution dialog for conflicts during node merging. Can resolve conflicts in relation members too.

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (3 diffs)

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

@@ -17 +17 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Logger;
@@ -43 +44 @@
 import org.openstreetmap.josm.gui.SelectionManager;
 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog.MergeAction;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -489 +491 @@
                     if (nn != null) {
                         Node n = nn.iterator().next();
-                        LinkedList<Node> selNodes = new LinkedList<Node>();
-                        for (OsmPrimitive osm : selection)
-                            if (osm instanceof Node) {
-                                selNodes.add((Node)osm);
-                            }
-                        if (selNodes.size() > 0) {
-                            selNodes.add(n);
-                            new MergeNodesAction().mergeNodes(selNodes, n);
+                        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
+                        if (!selectedNodes.isEmpty()) {
+                            selectedNodes.add(n);
+                            MergeNodesAction mergeAction = new MergeNodesAction();
+                            Node targetNode = mergeAction.selectTargetNode(selectedNodes);
+                            mergeAction.mergeNodes(Main.main.getEditLayer(),selectedNodes, targetNode);
                         }
                     }