Changeset 3603 in josm

Timestamp:

Oct 12, 2010 9:24:59 PM (3 years ago)

Author:

jttt

Message:

Fix iterator

File:

• trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) (5 diffs)

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

@@ -154 +154 @@
 
         QBLevel findBucket(BBox bbox) {
-            if (isLeaf())
+            if (!hasChildren())
                 return this;
             else {
@@ -361 +361 @@
         QBLevel nextNode()
         {
-            if (this.isLeaf())
+            if (!this.hasChildren())
                 return this.nextSibling();
             return this.firstChild();
@@ -417 +417 @@
                 search_contents(search_bbox, result);
             }
-            if (this.isLeaf())
-                return;
 
             if (debug) {
@@ -449 +447 @@
         int index_of(QBLevel find_this)
         {
-            if (this.isLeaf())
-                return -1;
-
             QBLevel[] children = getChildren();
             for (int i = 0; i < QuadTiling.TILES_PER_LEVEL; i++) {
@@ -632 +627 @@
                 out(this + " is a new iterator qb: " + qb + " size: " + qb.size());
             }
-            if (qb.root.isLeaf() || qb.root.hasContent()) {
+            if (!qb.root.hasChildren() || qb.root.hasContent()) {
                 current_node = qb.root;
             } else {