Changeset 1898 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-08-03T21:18:50+02:00 (17 years ago)

Author:

jttt

Message:

Way refactoring - rewritten another parts of code to the new nodes api

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor

Files:

• MapPaintVisitor.java (modified) (5 diffs)
• MergeSourceBuildingVisitor.java (modified) (8 diffs)
• SimplePaintVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -344 +344 @@
             int orderNumber = 0;
             lastN = null;
-            for(Node n : w.nodes)
+            for(Node n : w.getNodes())
             {
                 if(lastN != null)
@@ -429 +429 @@
             {
                 w = new Way(w);
-                w.nodes.clear();
-                w.nodes.addAll(n);
+                w.setNodes(n);
                 w.selected = selected;
             }
@@ -644 +643 @@
         } else {
             //System.out.println("From way heading towards via");
-            fromNode = fromWay.getNode(fromWay.nodes.size()-2);
+            fromNode = fromWay.getNode(fromWay.getNodesCount()-2);
         }
 
@@ -936 +935 @@
                     Polygon polygon = new Polygon();
 
-                    for (Node n : wInner.nodes)
+                    for (Node n : wInner.getNodes())
                     {
                         Point pInner = nc.getPoint(n);
@@ -943 +942 @@
                     if(!wInner.isClosed())
                     {
-                        Point pInner = nc.getPoint(wInner.nodes.get(0));
+                        Point pInner = nc.getPoint(wInner.getNode(0));
                         polygon.addPoint(pInner.x,pInner.y);
                     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -22 +24 @@
  * incomplete {@see OsmPrimitive}s in the "hull", if they are not themselves present in the
  * original collection.
- * 
+ *
  */
 public class MergeSourceBuildingVisitor extends AbstractVisitor {
@@ -33 +35 @@
      * the currently selected primitives in the dataset <code>selectionBase</code>,
      * i.e. from {@see DataSet#getSelected()}.
-     * 
+     *
      * @param selectionBase the dataset. Must not be null.
      * @exception IllegalArgumentException thrown if selectionBase is null
-     * 
+     *
      */
     public MergeSourceBuildingVisitor(DataSet selectionBase) throws IllegalArgumentException {
@@ -48 +50 @@
     /**
      * Remebers a node in the "hull"
-     * 
+     *
      * @param n the node
      */
@@ -60 +62 @@
     /**
      * remembers a way in the hull
-     * 
+     *
      * @param w the way
      */
@@ -67 +69 @@
             return;
         Way clone = new Way(w);
-        clone.nodes.clear();
-        for (Node n: w.nodes) {
-            clone.nodes.add((Node)mappedPrimitives.get(n));
-        }
+        List<Node> newNodes = new ArrayList<Node>();
+        for (Node n: w.getNodes()) {
+            newNodes.add((Node)mappedPrimitives.get(n));
+        }
+        clone.setNodes(newNodes);
         mappedPrimitives.put(w, clone);
     }
@@ -76 +79 @@
     /**
      * Remembers a relation in the hull
-     * 
+     *
      * @param r the relation
      */
@@ -160 +163 @@
         // remember all nodes this way refers to ...
         //
-        for (Node n: w.nodes) {
+        for (Node n: w.getNodes()) {
             if (! isAlreadyRemembered(n)) {
                 n.visit(this);

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -319 +319 @@
         }
 
-        Iterator<Node> it = w.nodes.iterator();
+        Iterator<Node> it = w.getNodes().iterator();
         if (it.hasNext()) {
             Point lastP = nc.getPoint(it.next());