Changeset 2341 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-10-28T19:33:49+01:00 (14 years ago)

Author:

Gubaer

Message:

applied #3798: patch by bastiK: Merge nodes tool - respect selection order

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeNodesAction.java (modified) (4 diffs)
• data/osm/OsmPrimitive.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.combineTigerTags;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.completeTagCollectionForEditing;
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing;
@@ -14 +13 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -54 +54 @@
             return;
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
+        LinkedHashSet<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
         if (selectedNodes.size() < 2) {
             JOptionPane.showMessageDialog(
@@ -74 +74 @@
 
     /**
-     * Selects a node out of a collection of candidate nodes. The selected
-     * node will become the target node the remaining nodes are merged to.
-     * 
+     * Find which node to merge into (i.e. which one will be left)
+     * The last selected node will become the target node the remaining 
+     * nodes are merged to.
+     *  
      * @param candidates the collection of candidate nodes
      * @return the selected target node
      */
-    public static Node selectTargetNode(Collection<Node> candidates) {
-        // Find which node to merge into (i.e. which one will be left)
-        // - this should be combined from two things:
-        //   1. It will be the first node in the list that has a
-        //      positive ID number, OR the first node.
-        //   2. It will be at the position of the first node in the
-        //      list.
-        //
-        // *However* - there is the problem that the selection list is
-        // _not_ in the order that the nodes were clicked on, meaning
-        // that the user doesn't know which node will be chosen (so
-        // (2) is not implemented yet.)  :-(
+    public static Node selectTargetNode(LinkedHashSet<Node> candidates) {
         Node targetNode = null;
-        for (Node n: candidates) {
-            if (!n.isNew()) {
-                targetNode = n;
-                break;
-            }
-        }
-        if (targetNode == null) {
-            // an arbitrary node
-            targetNode = candidates.iterator().next();
+        for (Node n : candidates) { // pick last one
+            targetNode = n;
         }
         return targetNode;

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -11 +11 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -83 +84 @@
      * @return the sub-set of OSM primitives of type <code>type</code>
      */
-    static public <T extends OsmPrimitive>  Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
-        if (set == null) return Collections.emptySet();
-        HashSet<T> ret = new HashSet<T>();
-        for(OsmPrimitive p: set) {
-            if (type.isInstance(p)) {
-                ret.add(type.cast(p));
+    static public <T extends OsmPrimitive>  LinkedHashSet<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
+        LinkedHashSet<T> ret = new LinkedHashSet<T>();
+        if (set != null) {
+            for(OsmPrimitive p: set) {
+                if (type.isInstance(p)) {
+                    ret.add(type.cast(p));
+                }
             }
         }