Changeset 2578 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.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/DataSetMerger.java (modified) (4 diffs)

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.