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

Timestamp:

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

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• DeleteCommand.java (modified) (11 diffs)
• PurgePrimitivesCommand.java (modified) (1 diff)

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

@@ -67 +67 @@
      * Constructor for a single data item. Use the collection constructor to delete multiple
      * objects.
-     * 
+     *
      * @param layer the layer context for deleting this primitive
      * @param data the primitive to delete
@@ -79 +79 @@
      * Constructor for a collection of data to be deleted in the context of
      * a specific layer
-     * 
+     *
      * @param layer the layer context for deleting these primitives
      * @param data the primitives to delete
@@ -137 +137 @@
     /**
      * Delete the primitives and everything they reference.
-     * 
+     *
      * If a node is deleted, the node and all ways and relations the node is part of are deleted as
      * well.
-     * 
+     *
      * If a way is deleted, all relations the way is member of are also deleted.
-     * 
+     *
      * If a way is deleted, only the way and no nodes are deleted.
-     * 
+     *
      * @param selection The list of all object to be deleted.
      * @return command A command to perform the deletions, or null of there is nothing to delete.
@@ -204 +204 @@
                 continue;
             }
-            for (Node n : ((Way) osm).nodes) {
+            for (Node n : ((Way) osm).getNodes()) {
                 if (n.isTagged()) {
                     continue;
@@ -221 +221 @@
     /**
      * Try to delete all given primitives.
-     * 
+     *
      * If a node is used by a way, it's removed from that way. If a node or a way is used by a
      * relation, inform the user and do not delete.
-     * 
+     *
      * If this would cause ways with less than 2 nodes to be created, delete these ways instead. If
      * they are part of a relation, inform the user and do not delete.
-     * 
+     *
      * @param layer the {@see OsmDataLayer} in whose context a primitive the primitives are deleted
      * @param selection The objects to delete.
@@ -279 +279 @@
             Way wnew = new Way(w);
             wnew.removeNodes(primitivesToDelete);
-            if (wnew.nodes.size() < 2) {
+            if (wnew.getNodesCount() < 2) {
                 primitivesToDelete.add(w);
 
@@ -347 +347 @@
             }
             Way wnew = new Way(w);
-            ArrayList<Node> nodesToStrip = new ArrayList<Node>();
+            List<Node> nodesToKeep = new ArrayList<Node>();
             // lookup new nodes which have been added to the set of deleted
             // nodes ...
-            for (Node n : wnew.nodes) {
-                if (n.id == 0 && primitivesToDelete.contains(n)) {
-                    nodesToStrip.add(n);
+            for (Node n : wnew.getNodes()) {
+                if (n.id != 0 || !primitivesToDelete.contains(n)) {
+                    nodesToKeep.add(n);
                 }
             }
             // .. and remove them from the way
             //
-            wnew.nodes.removeAll(nodesToStrip);
-            if (!nodesToStrip.isEmpty()) {
+            wnew.setNodes(nodesToKeep);
+            if (nodesToKeep.size() < w.getNodesCount()) {
                 cmds.add(new ChangeCommand(w, wnew));
             }
@@ -373 +373 @@
         List<Node> n1 = new ArrayList<Node>(), n2 = new ArrayList<Node>();
 
-        n1.addAll(ws.way.nodes.subList(0, ws.lowerIndex + 1));
-        n2.addAll(ws.way.nodes.subList(ws.lowerIndex + 1, ws.way.nodes.size()));
+        n1.addAll(ws.way.getNodes().subList(0, ws.lowerIndex + 1));
+        n2.addAll(ws.way.getNodes().subList(ws.lowerIndex + 1, ws.way.getNodesCount()));
 
         if (n1.size() < 2 && n2.size() < 2)
@@ -380 +380 @@
 
         Way wnew = new Way(ws.way);
-        wnew.nodes.clear();
 
         if (n1.size() < 2) {
-            wnew.nodes.addAll(n2);
+            wnew.setNodes(n2);
             return new ChangeCommand(ws.way, wnew);
         } else if (n2.size() < 2) {
-            wnew.nodes.addAll(n1);
+            wnew.setNodes(n1);
             return new ChangeCommand(ws.way, wnew);
         } else {
             Collection<Command> cmds = new LinkedList<Command>();
 
-            wnew.nodes.addAll(n1);
+            wnew.setNodes(n1);
             cmds.add(new ChangeCommand(ws.way, wnew));
 
@@ -398 +397 @@
                 wnew2.keys = new HashMap<String, String>(wnew.keys);
             }
-            wnew2.nodes.addAll(n2);
+            wnew2.setNodes(n2);
             cmds.add(new AddCommand(wnew2));
 
@@ -408 +407 @@
      * Check whether user is about to delete data outside of the download area. Request confirmation
      * if he is.
-     * 
+     *
      * @param layer the layer in whose context data is deleted
      * @param primitivesToDelete the primitives to delete

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

@@ -190 +190 @@
                 // remember it on the "hive"
                 //
-                if (w.nodes.size() < 2) {
+                if (w.getNodesCount() < 2) {
                     System.out.println(tr("Warning: Purging way {0} because number of nodes dropped below 2. Current is {1}",
-                            w.id,w.nodes.size()));
+                            w.id,w.getNodesCount()));
                     if (!hive.contains(w)) {
                         hive.add(w);