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

Timestamp:

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

Author:

jttt

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -12 +12 @@
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -330 +331 @@
             Way w = new Way(e.getKey().id);
             boolean incomplete = false;
+            List<Node> wayNodes = new ArrayList<Node>();
             for (long id : e.getValue()) {
                 Node n = findNode(id);
@@ -337 +339 @@
                     incomplete = true;
                 }
-                w.nodes.add(n);
-            }
+                wayNodes.add(n);
+            }
+            w.setNodes(wayNodes);
             if (incomplete) {
-                logger.warning(tr("marked way {0} with {1} nodes incomplete because at least one node was missing in the loaded data and is therefore incomplete too", e.getKey().id, w.nodes.size()));
+                logger.warning(tr("marked way {0} with {1} nodes incomplete because at least one node was missing in the " +
+                                "loaded data and is therefore incomplete too", e.getKey().id, w.getNodesCount()));
                 e.getKey().copyTo(w);
                 w.incomplete = true;