Changeset 1862 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AlignInCircleAction.java (modified) (2 diffs)
• AlignInLineAction.java (modified) (1 diff)
• ApiPreconditionChecker.java (modified) (1 diff)
• CombineWayAction.java (modified) (2 diffs)
• CopyAction.java (modified) (2 diffs)
• CreateCircleAction.java (modified) (1 diff)
• DistributeAction.java (modified) (1 diff)
• JoinNodeWayAction.java (modified) (1 diff)
• MergeNodesAction.java (modified) (4 diffs)
• MirrorAction.java (modified) (1 diff)
• OrthogonalizeAction.java (modified) (1 diff)
• PasteAction.java (modified) (1 diff)
• ReverseWayAction.java (modified) (3 diffs)
• SplitWayAction.java (modified) (4 diffs)
• UnGlueAction.java (modified) (9 diffs)
• mapmode/SelectAction.java (modified) (4 diffs)
• search/SearchCompiler.java (modified) (3 diffs)

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

@@ -113 +113 @@
             // distance between two nodes.
             if (nodes.size() > 0) {
-                if (nodes.size() == 1 && way.nodes.contains(nodes.get(0))) {
+                if (nodes.size() == 1 && way.getNodes().contains(nodes.get(0))) {
                     regular = true;
                 } else {
 
-                    center = nodes.get(way.nodes.contains(nodes.get(0)) ? 1 : 0).getEastNorth();
+                    center = nodes.get(way.getNodes().contains(nodes.get(0)) ? 1 : 0).getEastNorth();
                     if (nodes.size() == 2) {
                         radius = distance(nodes.get(0).getEastNorth(), nodes.get(1).getEastNorth());
@@ -125 +125 @@
             }
 
-            for (Node n : way.nodes) {
+            for (Node n : way.getNodes()) {
                 if (!nodes.contains(n)) {
                     nodes.add(n);

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

@@ -56 +56 @@
             for (OsmPrimitive osm : sel)
                 if (osm instanceof Way) {
-                    nodes.addAll(((Way)osm).nodes);
-                    itnodes.addAll(((Way)osm).nodes);
+                    nodes.addAll(((Way)osm).getNodes());
+                    itnodes.addAll(((Way)osm).getNodes());
                 }
         }

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

@@ -104 +104 @@
 
             if (osmPrimitive instanceof Way &&
-                    ((Way)osmPrimitive).nodes.size() > maxNodes) {
+                    ((Way)osmPrimitive).getNodesCount() > maxNodes) {
                 OptionPaneUtil.showMessageDialog(
                         Main.parent,
                         tr("{0} nodes in way {1} exceed the max. allowed number of nodes {2}",
-                                ((Way)osmPrimitive).nodes.size(),
+                                ((Way)osmPrimitive).getNodesCount(),
                                 Long.toString(osmPrimitive.id),
                                 maxNodes

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

@@ -144 +144 @@
         List<Node> nodeList = null;
         Object firstTry = actuallyCombineWays(selectedWays, false);
-        if (firstTry instanceof List) {
+        if (firstTry instanceof List<?>) {
             nodeList = (List<Node>) firstTry;
         } else {
             Object secondTry = actuallyCombineWays(selectedWays, true);
-            if (secondTry instanceof List) {
+            if (secondTry instanceof List<?>) {
                 int option = new ExtendedDialog(Main.parent,
                         tr("Change directions?"),
@@ -182 +182 @@
         Way newWay = new Way(modifyWay);
 
-        newWay.nodes.clear();
-        newWay.nodes.addAll(nodeList);
+        newWay.setNodes(nodeList);
 
         // display conflict dialog

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

@@ -81 +81 @@
                 Way wnew = new Way();
                 wnew.cloneFrom(w);
-                wnew.nodes.clear();
                 List<Node> nodes = new ArrayList<Node>();
-                for (Node n : w.nodes) {
+                for (Node n : w.getNodes()) {
                     if (! map.containsKey(n)) {
                         n.visit(this);
@@ -89 +88 @@
                     nodes.add((Node)map.get(n));
                 }
-                wnew.nodes.addAll(nodes);
+                wnew.setNodes(nodes);
                 pasteBuffer.addPrimitive(wnew);
             }

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

@@ -99 +99 @@
                 if (osm instanceof Way) {
                     existingWay = ((Way)osm);
-                    for (Node n : ((Way)osm).nodes)
+                    for (Node n : ((Way)osm).getNodes())
                     {
                         if(!nodes.contains(n)) {

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

@@ -54 +54 @@
             for (OsmPrimitive osm : sel)
                 if (osm instanceof Way) {
-                    nodes.addAll(((Way)osm).nodes);
-                    itnodes.addAll(((Way)osm).nodes);
+                    nodes.addAll(((Way)osm).getNodes());
+                    itnodes.addAll(((Way)osm).getNodes());
                 }
         }

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

@@ -50 +50 @@
             }
 
-            if (ws.way.nodes.get(ws.lowerIndex) != node
-                    && ws.way.nodes.get(ws.lowerIndex+1) != node) {
+            if (ws.way.getNode(ws.lowerIndex) != node
+                    && ws.way.getNode(ws.lowerIndex+1) != node) {
                 is.add(ws.lowerIndex);
             }

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

@@ -217 +217 @@
 
         for (Way w : getCurrentDataSet().ways) {
-            if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+            if (w.deleted || w.incomplete || w.getNodesCount() < 1) {
                 continue;
             }
@@ -225 +225 @@
                     continue;
                 }
-                if (w.nodes.contains(sn)) {
+                if (w.getNodes().contains(sn)) {
                     modify = true;
                 }
@@ -235 +235 @@
             ArrayList<Node> nn = new ArrayList<Node>();
             Node lastNode = null;
-            for (int i = 0; i < w.nodes.size(); i++) {
-                Node pushNode = w.nodes.get(i);
+            for (Node pushNode: w.getNodes()) {
                 if (allNodes.contains(pushNode)) {
                     pushNode = dest;
@@ -262 +261 @@
             } else {
                 Way newWay = new Way(w);
-                newWay.nodes.clear();
-                newWay.nodes.addAll(nn);
+                newWay.setNodes(nn);
                 cmds.add(new ChangeCommand(w, newWay));
             }

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

@@ -45 +45 @@
                 nodes.add((Node)osm);
             } else if (osm instanceof Way) {
-                nodes.addAll(((Way)osm).nodes);
+                nodes.addAll(((Way)osm).getNodes());
             }
         }

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

@@ -83 +83 @@
             // Check if every way is made of at least four segments and closed
             Way way = (Way)osm;
-            if ((way.nodes.size() < 5) || (!way.nodes.get(0).equals(way.nodes.get(way.nodes.size() - 1)))) {
+            if ((way.getNodesCount() < 5) || !way.isClosed()) {
                 OptionPaneUtil.showMessageDialog(
                         Main.parent,

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

@@ -81 +81 @@
             /* make sure we reference the new nodes corresponding to the old ones */
             List<Node> nodes = new ArrayList<Node>();
-            for (Node n : w.nodes) {
+            for (Node n : w.getNodes()) {
                 nodes.add((Node)map.get(n));
             }
-            wnew.nodes.clear();
-            wnew.nodes.addAll(nodes);
+            wnew.setNodes(nodes);
             map.put(w, wnew);
         }

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

@@ -9 +9 @@
 import java.util.Collections;
 import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JOptionPane;
@@ -19 +20 @@
 import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
@@ -58 +60 @@
         for (Way w : sel) {
             Way wnew = new Way(w);
-            Collections.reverse(wnew.nodes);
+            List<Node> nodesCopy = wnew.getNodes();
+            Collections.reverse(nodesCopy);
+            wnew.setNodes(nodesCopy);
             if (Main.pref.getBoolean("tag-correction.reverse-way", true)) {
                 try

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

@@ -106 +106 @@
                         continue;
                     }
-                    int last = w.nodes.size()-1;
+                    int last = w.getNodesCount()-1;
                     if(last <= 0) {
                         continue; // zero or one node ways
                     }
-                    Boolean circular = w.nodes.get(0).equals(w.nodes.get(last));
+                    boolean circular = w.isClosed();
                     int i = 0;
-                    for (Node wn : w.nodes) {
+                    for (Node wn : w.getNodes()) {
                         if ((circular || (i > 0 && i < last)) && n.equals(wn)) {
                             Integer old = wayOccurenceCounter.get(w);
@@ -159 +159 @@
 
             HashSet<Node> nds = new HashSet<Node>(selectedNodes);
-            for (Node n : selectedWay.nodes) {
+            for (Node n : selectedWay.getNodes()) {
                 nds.remove(n);
             }
@@ -211 +211 @@
         wayChunks.add(currentWayChunk);
 
-        Iterator<Node> it = selectedWay.nodes.iterator();
+        Iterator<Node> it = selectedWay.getNodes().iterator();
         while (it.hasNext()) {
             Node currentNode = it.next();
@@ -273 +273 @@
         // First, change the original way
         Way changedWay = new Way(selectedWay);
-        changedWay.nodes.clear();
-        changedWay.nodes.addAll(chunkIt.next());
+        changedWay.setNodes(chunkIt.next());
         commandList.add(new ChangeCommand(selectedWay, changedWay));
         newSelection.add(selectedWay);

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;
                 }

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -65 +65 @@
     /**
      * Replies true if we are currently running on OSX
-     * 
+     *
      * @return true if we are currently running on OSX
      */
@@ -306 +306 @@
                 {
                     Way w = (Way)osm;
-                    Point p1 = c.getPoint(w.nodes.get(nearestWS.lowerIndex));
-                    Point p2 = c.getPoint(w.nodes.get(nearestWS.lowerIndex+1));
+                    Point p1 = c.getPoint(w.getNode(nearestWS.lowerIndex));
+                    Point p2 = c.getPoint(w.getNode(nearestWS.lowerIndex+1));
                     if(SimplePaintVisitor.isLargeSegment(p1, p2, Main.pref.getInteger("mappaint.node.virtual-space", 70)))
                     {
@@ -317 +317 @@
                             // virtual node at the same spot will be joined which is likely unwanted
                             if(virtualWayNode != null) {
-                                if(  !w.nodes.get(nearestWS.lowerIndex+1).equals(virtualWayNode)
-                                        && !w.nodes.get(nearestWS.lowerIndex  ).equals(virtualWayNode)) {
+                                if(  !w.getNode(nearestWS.lowerIndex+1).equals(virtualWayNode)
+                                        && !w.getNode(nearestWS.lowerIndex).equals(virtualWayNode)) {
                                     continue;
                                 }
                             } else {
-                                virtualWayNode = w.nodes.get(nearestWS.lowerIndex+1);
+                                virtualWayNode = w.getNode(nearestWS.lowerIndex+1);
                             }
 
@@ -459 +459 @@
                     {
                         s.add(osm);
-                        s.addAll(((Way)osm).nodes);
+                        s.addAll(((Way)osm).getNodes());
                     }
                     if(s.size() > max)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -375 +375 @@
         public NodeCount(int count) {this.count = count;}
         @Override public boolean match(OsmPrimitive osm) {
-            return osm instanceof Way && ((Way) osm).nodes.size() == count;
+            return osm instanceof Way && ((Way) osm).getNodesCount() == count;
         }
         @Override public String toString() {return "nodes="+count;}
@@ -394 +394 @@
         @Override public boolean match(OsmPrimitive osm) {
             if(!(osm instanceof Way)) return false;
-            int size = ((Way)osm).nodes.size();
+            int size = ((Way)osm).getNodesCount();
             return (size >= minCount) && (size <= maxCount);
         }
@@ -441 +441 @@
 
             if (osm instanceof Way) {
-                for (Node n : ((Way)osm).nodes) {
+                for (Node n : ((Way)osm).getNodes()) {
                     isParent |= child.match(n);
                 }