Changeset 1862 in josm for trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

Timestamp:

2009-07-27T21:09:44+02:00 (17 years ago)

Author:

jttt

Message:

Way refactoring - added method that will in future replace public field nodes

File:

• trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -67 +67 @@
             int count = 0;
             for (Way w : getCurrentDataSet().ways) {
-                if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                if (w.deleted || w.incomplete || w.getNodesCount() < 1) {
                     continue;
                 }
-                if (!w.nodes.contains(selectedNode)) {
+                if (!w.getNodes().contains(selectedNode)) {
                     continue;
                 }
@@ -92 +92 @@
                 int count = 0;
                 for (Way w : getCurrentDataSet().ways) {
-                    if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                    if (w.deleted || w.incomplete || w.getNodesCount() < 1) {
                         continue;
                     }
-                    if (!w.nodes.contains(n)) {
+                    if (!w.getNodes().contains(n)) {
                         continue;
                     }
@@ -191 +191 @@
         boolean isPartOfWay = false;
         for(Way w : getCurrentDataSet().ways) {
-            if(w.nodes.contains(n)) {
+            if(w.getNodes().contains(n)) {
                 isPartOfWay = true;
                 break;
@@ -232 +232 @@
                 selectedNode = (Node) p;
                 if (size == 1 || selectedWay != null)
-                    return size == 1 || selectedWay.nodes.contains(selectedNode);
+                    return size == 1 || selectedWay.getNodes().contains(selectedNode);
             } else if (p instanceof Way) {
                 selectedWay = (Way) p;
                 if (size == 2 && selectedNode != null)
-                    return selectedWay.nodes.contains(selectedNode);
+                    return selectedWay.getNodes().contains(selectedNode);
             }
         }
@@ -276 +276 @@
             if (p instanceof Node) {
                 Node n = (Node) p;
-                if (!selectedWay.nodes.contains(n))
+                if (!selectedWay.getNodes().contains(n))
                     return false;
                 selectedNodes.add(n);
@@ -283 +283 @@
 
         if (selectedNodes.size() < 1) {
-            selectedNodes.addAll(selectedWay.nodes);
+            selectedNodes.addAll(selectedWay.getNodes());
         }
 
@@ -298 +298 @@
     private Way modifyWay(Node originalNode, Way w, List<Command> cmds, List<Node> newNodes) {
         ArrayList<Node> nn = new ArrayList<Node>();
-        for (Node pushNode : w.nodes) {
+        for (Node pushNode : w.getNodes()) {
             if (originalNode == pushNode) {
                 // clone the node for all other ways
@@ -309 +309 @@
         }
         Way newWay = new Way(w);
-        newWay.nodes.clear();
-        newWay.nodes.addAll(nn);
+        newWay.setNodes(nn);
 
         return newWay;
@@ -370 +369 @@
             // modify all ways containing the nodes
             for (Way w : getCurrentDataSet().ways) {
-                if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                if (w.deleted || w.incomplete || w.getNodesCount() < 1) {
                     continue;
                 }
-                if (!w.nodes.contains(selectedNode)) {
+                if (!w.getNodes().contains(selectedNode)) {
                     continue;
                 }