Changeset 1910 in josm for trunk/src/org/openstreetmap/josm/data/osm

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/data/osm

Files:

• DataSet.java (modified) (2 diffs)
• Way.java (modified) (2 diffs)
• visitor/MergeSourceBuildingVisitor.java (modified) (1 diff)

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

@@ -372 +372 @@
 
     protected void deleteWay(Way way) {
-        way.nodes.clear();
+        way.setNodes(null);
         way.delete(true);
     }
@@ -383 +383 @@
     public void unlinkNodeFromWays(Node node) {
         for (Way way: ways) {
-            if (way.nodes.contains(node)) {
-                way.nodes.remove(node);
-                if (way.nodes.size() < 2) {
+            List<Node> nodes = way.getNodes();
+            if (nodes.remove(node)) {
+                if (nodes.size() < 2) {
                     deleteWay(way);
+                } else {
+                    way.setNodes(nodes);
                 }
             }

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

@@ -24 +24 @@
     /**
      * All way nodes in this way
-     * 
+     *
      * @deprecated This public field will become private or protected in the future.
      *  Use the new public API instead.
@@ -43 +43 @@
 
     /**
-     * @param nodes
+     * @param nodes New way nodes. Can be null, in that case all way nodes are removed
      * @since 1862
      */
     public void setNodes(List<Node> nodes) {
         this.nodes.clear();
-        this.nodes.addAll(nodes);
+        if (nodes != null) {
+            this.nodes.addAll(nodes);
+        }
+        clearCached();
     }
 

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

@@ -136 +136 @@
             return;
         Way clone = new Way(w);
-        clone.nodes.clear();
+        clone.setNodes(null);
         clone.incomplete = true;
         mappedPrimitives.put(w, clone);