Changeset 1910 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-08-05T08:19:02+02:00 (16 years ago)

Author:

jttt

Message:

Way refactoring - finish replacing Way.nodes with the new api

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• PurgePrimitivesCommand.java (modified) (1 diff)
• WayNodesConflictResolverCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java

@@ -186 +186 @@
                 Way w = (Way)pair.getParent();
                 System.out.println(tr("removing reference from way {0}",w.id));
-                w.nodes.remove(primitive);
+                List<Node> wayNodes = w.getNodes();
+                wayNodes.remove(primitive);
+                w.setNodes(wayNodes);
                 // if a way ends up with less than two node we
                 // remember it on the "hive"

trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

@@ -37 +37 @@
 
     /**
-     * 
+     *
      * @param my my may
      * @param their their way
@@ -68 +68 @@
         // nodes
         //
-        conflict.getMy().nodes.clear();
-        for (int i=0; i<mergedNodeList.size();i++) {
-            Node n = mergedNodeList.get(i);
-            conflict.getMy().nodes.add(n);
+        for (Node n:mergedNodeList) {
             if (! getLayer().data.nodes.contains(n)) {
                 logger.warning(tr("Main dataset does not include node {0}", n.toString()));
             }
         }
+        conflict.getMy().setNodes(mergedNodeList);
         rememberConflict(conflict);
         return true;