Changeset 2578 in josm for trunk/src/org/openstreetmap/josm/data/osm/Way.java

Timestamp:

2009-12-05T18:23:03+01:00 (14 years ago)

Author:

jttt

Message:

Encalupse OsmPrimitive.incomplete

File:

• trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) (7 diffs)

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

@@ -116 +116 @@
     public ArrayList<Pair<Node,Node>> getNodePairs(boolean sort) {
         ArrayList<Pair<Node,Node>> chunkSet = new ArrayList<Pair<Node,Node>>();
-        if (incomplete) return chunkSet;
+        if (isIncomplete()) return chunkSet;
         Node lastN = null;
         for (Node n : this.nodes) {
@@ -219 +219 @@
 
     @Override public String toString() {
-        String nodesDesc = incomplete?"(incomplete)":"nodes=" + Arrays.toString(nodes);
+        String nodesDesc = isIncomplete()?"(incomplete)":"nodes=" + Arrays.toString(nodes);
         return "{Way id=" + getUniqueId() + " version=" + getVersion()+ " " + getFlagsAsString()  + " " + nodesDesc + "}";
     }
@@ -245 +245 @@
 
     public void removeNode(Node n) {
-        if (incomplete) return;
+        if (isIncomplete()) return;
         boolean closed = (lastNode() == n && firstNode() == n);
         int i;
@@ -262 +262 @@
 
     public void removeNodes(Collection<? extends OsmPrimitive> selection) {
-        if (incomplete) return;
+        if (isIncomplete()) return;
         for(OsmPrimitive p : selection) {
             if (p instanceof Node) {
@@ -279 +279 @@
     public void addNode(Node n) throws IllegalStateException {
         if (n==null) return;
-        if (incomplete)
+        if (isIncomplete())
             throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
         clearCached();
@@ -301 +301 @@
     public void addNode(int offs, Node n) throws IllegalStateException, IndexOutOfBoundsException {
         if (n==null) return;
-        if (incomplete)
+        if (isIncomplete())
             throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
         clearCached();
@@ -327 +327 @@
 
     public boolean isClosed() {
-        if (incomplete) return false;
+        if (isIncomplete()) return false;
         return nodes.length >= 3 && lastNode() == firstNode();
     }
 
     public Node lastNode() {
-        if (incomplete || nodes.length == 0) return null;
+        if (isIncomplete() || nodes.length == 0) return null;
         return nodes[nodes.length-1];
     }
 
     public Node firstNode() {
-        if (incomplete || nodes.length == 0) return null;
+        if (isIncomplete() || nodes.length == 0) return null;
         return nodes[0];
     }
 
     public boolean isFirstLastNode(Node n) {
-        if (incomplete || nodes.length == 0) return false;
+        if (isIncomplete() || nodes.length == 0) return false;
         return n == firstNode() || n == lastNode();
     }