Changeset 2578 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

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

Author:

jttt

Message:

Encalupse OsmPrimitive.incomplete

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (2 diffs)
• DataSetMerger.java (modified) (4 diffs)
• DatasetConsistencyTest.java (modified) (4 diffs)
• Node.java (modified) (1 diff)
• OsmPrimitive.java (modified) (9 diffs)
• Relation.java (modified) (1 diff)
• Way.java (modified) (7 diffs)
• visitor/AllNodesVisitor.java (modified) (1 diff)
• visitor/BoundingXYVisitor.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (5 diffs)
• visitor/MergeSourceBuildingVisitor.java (modified) (3 diffs)
• visitor/SimplePaintVisitor.java (modified) (5 diffs)

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

@@ -159 +159 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (osm.isVisible() && !osm.isDeleted() && !osm.incomplete) {
+            if (osm.isVisible() && !osm.isDeleted() && !osm.isIncomplete()) {
                 o.add(osm);
             }
@@ -168 +168 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (osm.isVisible() && !osm.isDeleted() && !osm.incomplete && !(osm instanceof Relation)) {
+            if (osm.isVisible() && !osm.isDeleted() && !osm.isIncomplete() && !(osm instanceof Relation)) {
                 o.add(osm);
             }

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

@@ -145 +145 @@
         if (myWay == null)
             throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
-        if (!myWay.incomplete)return;
-        if (myWay.incomplete && other.getNodesCount() == 0) return;
+        if (!myWay.isIncomplete())return;
+        if (myWay.isIncomplete() && other.getNodesCount() == 0) return;
         for (Node n: myWay.getNodes()) {
-            if (n.incomplete) return;
-        }
-        myWay.incomplete = false;
+            if (n.isIncomplete()) return;
+        }
+        myWay.setIncomplete(false);
     }
 
@@ -167 +167 @@
         if (myNode == null)
             throw new RuntimeException(tr("Missing merge target for node with id {0}", other.getUniqueId()));
-        if (myNode.incomplete || myNode.isDeleted() || !myNode.isVisible()) return;
+        if (myNode.isIncomplete() || myNode.isDeleted() || !myNode.isVisible()) return;
         wayloop: for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {
-            if (w.isDeleted() || ! w.isVisible() || ! w.incomplete) {
+            if (w.isDeleted() || ! w.isVisible() || ! w.isIncomplete()) {
                 continue;
             }
             for (Node n: w.getNodes()) {
-                if (n.incomplete) {
+                if (n.isIncomplete()) {
                     continue wayloop;
                 }
             }
             // all nodes are complete - set the way complete too
-            w.incomplete = false;
+            w.setIncomplete(false);
         }
     }
@@ -306 +306 @@
             //
             conflicts.add(target,source);
-        } else if (target.incomplete && !source.incomplete) {
+        } else if (target.isIncomplete() && !source.isIncomplete()) {
             // target is incomplete, source completes it
             // => merge source into target
@@ -312 +312 @@
             target.mergeFrom(source);
             objectsWithChildrenToMerge.add(source.getPrimitiveId());
-        } else if (!target.incomplete && source.incomplete) {
+        } else if (!target.isIncomplete() && source.isIncomplete()) {
             // target is complete and source is incomplete
             // => keep target, it has more information already
             //
-        } else if (target.incomplete && source.incomplete) {
+        } else if (target.isIncomplete() && source.isIncomplete()) {
             // target and source are incomplete. Doesn't matter which one to
             // take. We take target.

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

@@ -48 +48 @@
     private void checkCompleteWaysWithIncompleteNodes() {
         for (Way way:dataSet.getWays()) {
-            if (!way.incomplete) {
+            if (!way.isIncomplete()) {
                 for (Node node:way.getNodes()) {
-                    if (node.incomplete) {
+                    if (node.isIncomplete()) {
                         writer.println(String.format("%s is complete but contains incomplete node '%s'", way, node));
                     }
@@ -60 +60 @@
     private void checkCompleteNodesWithoutCoordinates() {
         for (Node node:dataSet.getNodes()) {
-            if (!node.incomplete && (node.getCoor() == null || node.getEastNorth() == null)) {
+            if (!node.isIncomplete() && (node.getCoor() == null || node.getEastNorth() == null)) {
                 writer.println(String.format("%s is not incomplete but has null coordinates", node));
             }
@@ -68 +68 @@
     private void searchNodes() {
         for (Node n:dataSet.getNodes()) {
-            if (!n.incomplete) {
+            if (!n.isIncomplete()) {
                 LatLon c = n.getCoor();
                 BBox box = new BBox(new LatLon(c.lat() - 0.0001, c.lon() - 0.0001), new LatLon(c.lat() + 0.0001, c.lon() + 0.0001));
@@ -80 +80 @@
     private void searchWays() {
         for (Way w:dataSet.getWays()) {
-            if (!w.incomplete && !dataSet.searchWays(w.getBBox()).contains(w)) {
+            if (!w.isIncomplete() && !dataSet.searchWays(w.getBBox()).contains(w)) {
                 writer.println(String.format("%s not found using Dataset.searchWays()", w));
             }

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

@@ -123 +123 @@
     public void mergeFrom(OsmPrimitive other) {
         super.mergeFrom(other);
-        if (!other.incomplete) {
+        if (!other.isIncomplete()) {
             setCoor(new LatLon(((Node)other).coor));
         }

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

@@ -229 +229 @@
      * and type is known (type is the objects instance class)
      */
-    public boolean incomplete = false;
+    private boolean incomplete = false;
 
     /**
@@ -259 +259 @@
         }
         this.version = 0;
-        this.incomplete = id > 0;
+        this.setIncomplete(id > 0);
     }
 
@@ -357 +357 @@
      */
     public boolean isUsable() {
-        return !isDeleted() && !incomplete && !isDisabled();
+        return !isDeleted() && !isIncomplete() && !isDisabled();
     }
 
@@ -451 +451 @@
         this.id = id;
         this.version = version;
-        this.incomplete = false;
+        this.setIncomplete(false);
     }
 
@@ -468 +468 @@
         this.id = generateUniqueId();
         this.version = 0;
-        this.incomplete = false;
+        this.setIncomplete(false);
     }
 
@@ -913 +913 @@
         timestamp = osm.timestamp;
         version = osm.version;
-        incomplete = osm.incomplete;
+        setIncomplete(osm.isIncomplete());
         flags = osm.flags;
         user= osm.user;
@@ -940 +940 @@
         timestamp = other.timestamp;
         version = other.version;
-        incomplete = other.incomplete;
+        setIncomplete(other.isIncomplete());
         flags = other.flags;
         user= other.user;
@@ -960 +960 @@
         if (!isNew() &&  id != other.id)
             return false;
-        if (incomplete && ! other.incomplete || !incomplete  && other.incomplete)
+        if (isIncomplete() && ! other.isIncomplete() || !isIncomplete()  && other.isIncomplete())
             return false;
         // can't do an equals check on the internal keys array because it is not ordered
@@ -1151 +1151 @@
         return new SimplePrimitiveId(getUniqueId(), getType());
     }
+
+    public void setIncomplete(boolean incomplete) {
+        this.incomplete = incomplete;
+    }
+
+    public boolean isIncomplete() {
+        return incomplete;
+    }
 }

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

@@ -243 +243 @@
 
     public RelationMember firstMember() {
-        if (incomplete) return null;
+        if (isIncomplete()) return null;
         return (members.size() == 0) ? null : members.get(0);
     }
     public RelationMember lastMember() {
-        if (incomplete) return null;
+        if (isIncomplete()) return null;
         return (members.size() == 0) ? null : members.get(members.size() -1);
     }

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

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

@@ -34 +34 @@
      */
     public void visit(Way w) {
-        if (w.incomplete) return;
+        if (w.isIncomplete()) return;
         for (Node n : w.getNodes())
             visit(n);

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

@@ -28 +28 @@
 
     public void visit(Way w) {
-        if (w.incomplete) return;
+        if (w.isIncomplete()) return;
         for (Node n : w.getNodes())
             visit(n);

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

@@ -563 +563 @@
                 putError(r, tr("Deleted member ''{0}'' in relation.",
                         m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
-            } else if(m.getMember().incomplete)
+            } else if(m.getMember().isIncomplete())
                 return;
             else
@@ -922 +922 @@
                 putError(r, tr("Deleted member ''{0}'' in relation.",
                         m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
-            } else if(m.getMember().incomplete) {
+            } else if(m.getMember().isIncomplete()) {
                 incomplete = true;
             } else {
@@ -1383 +1383 @@
     boolean drawable(OsmPrimitive osm)
     {
-        return !osm.isDeleted() && !osm.isFiltered() && !osm.incomplete;
+        return !osm.isDeleted() && !osm.isFiltered() && !osm.isIncomplete();
     }
 
@@ -1545 +1545 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.getSelected()) {
-            if (!osm.incomplete && !osm.isDeleted() && !(osm instanceof Node)
+            if (!osm.isIncomplete() && !osm.isDeleted() && !(osm instanceof Node)
                     && osm.mappaintDrawnCode != paintid
             ) {
@@ -1584 +1584 @@
         //profilerN = 0;
         for (final Node osm: data.searchNodes(bbox)) {
-            if (!osm.incomplete && !osm.isDeleted() && (data.isSelected(osm) || !osm.isFiltered())
+            if (!osm.isIncomplete() && !osm.isDeleted() && (data.isSelected(osm) || !osm.isFiltered())
                     && osm.mappaintDrawnCode != paintid)
             {

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

@@ -130 +130 @@
             return;
         Node clone = new Node(n);
-        clone.incomplete = true;
+        clone.setIncomplete(true);
         mappedPrimitives.put(n, clone);
     }
@@ -139 +139 @@
         Way clone = new Way(w);
         clone.setNodes(null);
-        clone.incomplete = true;
+        clone.setIncomplete(true);
         mappedPrimitives.put(w, clone);
     }
@@ -152 +152 @@
         }
         clone.setMembers(null);
-        clone.incomplete = true;
+        clone.setIncomplete(true);
         if (! isAlreadyRemembered(r)) {
             mappedPrimitives.put(r, clone);

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

@@ -249 +249 @@
      */
     public void visit(Node n) {
-        if (n.incomplete) return;
+        if (n.isIncomplete()) return;
 
         if (inactive || n.isDisabled()) {
@@ -301 +301 @@
      */
     public void visit(Way w) {
-        if (w.incomplete || w.getNodesCount() < 2)
+        if (w.isIncomplete() || w.getNodesCount() < 2)
             return;
 
@@ -344 +344 @@
             4, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL);
     public void visit(Relation r) {
-        if (r.incomplete) return;
+        if (r.isIncomplete()) return;
 
         Color col;
@@ -357 +357 @@
 
         for (RelationMember m : r.getMembers()) {
-            if (m.getMember().incomplete || m.getMember().isDeleted()) {
+            if (m.getMember().isIncomplete() || m.getMember().isDeleted()) {
                 continue;
             }
@@ -374 +374 @@
                 boolean first = true;
                 for (Node n : m.getWay().getNodes()) {
-                    if (n.incomplete || n.isDeleted()) {
+                    if (n.isIncomplete() || n.isDeleted()) {
                         continue;
                     }