Changeset 1915 in josm for trunk/src/org

Timestamp:

2009-08-05T15:17:36+02:00 (16 years ago)

Author:

Gubaer

Message:

temporary fix for #3194: Join node to way does not work since r1910
!! Be careful with releases between 1910 and 1914 - they will likely show all kind of strange behaviour, copying of nodes of a ways doesn't work reliably !!

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinNodeWayAction.java (modified) (1 diff)
• data/osm/Way.java (modified) (1 diff)

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

@@ -59 +59 @@
         for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
             Way w = insertPoint.getKey();
-            List<Node> nodesToAdd = new ArrayList<Node>();
+            List<Node> nodesToAdd = new ArrayList<Node>(w.getNodes());
             List<Integer> is = insertPoint.getValue();
             pruneSuccsAndReverse(is);

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

@@ -39 +39 @@
      */
     public List<Node> getNodes() {
-        return new CopyList<Node>(nodes.toArray(new Node[nodes.size()]));
+        //return new CopyList<Node>(nodes.toArray(new Node[nodes.size()]));
+        // FIXME: temporary switch back to classic ArrayList due to #3194
+        //
+        ArrayList<Node> ret = new ArrayList<Node>();
+        ret.addAll(nodes);
+        return ret;
     }