Skip on toString if baseTileIds is null in addition to when width is 0. When

digester is logging - which happens when log4j is added to the classpath but
not configured - it prints Sections out while they're being initialized and
have a width but no baseTileIds.



git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@724 ed5b42cb-e716-0410-a449-f6a68f950b19

src/java/com/threerings/miso/data/SparseMisoSceneModel.java

@@ -192,8 +192,7 @@ public class SparseMisoSceneModel extends MisoSceneModel
 
         public void getObjects (Rectangle region, ObjectSet set) {
             // first look for intersecting interesting objects
-            for (int ii = 0; ii < objectInfo.length; ii++) {
+            for (ObjectInfo info : objectInfo) {
-                ObjectInfo info = objectInfo[ii];
                 if (region.contains(info.x, info.y)) {
                     set.insert(info);
                 }
@@ -217,8 +216,8 @@ public class SparseMisoSceneModel extends MisoSceneModel
             if ((objectTileIds.length != 0) || (objectInfo.length != 0)) {
                 return false;
             }
-            for (int ii=0, nn=baseTileIds.length; ii < nn; ii++) {
+            for (int baseTileId : baseTileIds) {
-                if (baseTileIds[ii] != 0) {
+                if (baseTileId != 0) {
                     return false;
                 }
             }
@@ -243,10 +242,12 @@ public class SparseMisoSceneModel extends MisoSceneModel
 
         @Override
         public String toString () {
-            return ((width == 0) ? "<no bounds>" :
+            if (width == 0 || baseTileIds == null) {
-                    (width + "x" + (baseTileIds.length/width))) +
+                return "<no bounds>";
-                "+" + x + "+" + y +
+            } else {
-                ":" + objectInfo.length + ":" + objectTileIds.length;
+                return String.format("%sx%s+%s:%s:%s", width, baseTileIds.length / width, x, y,
+                    objectInfo.length, objectTileIds.length);
+            }
         }
     }
 
@@ -283,8 +284,8 @@ public class SparseMisoSceneModel extends MisoSceneModel
     {
         for (Iterator<Section> iter = getSections(); iter.hasNext(); ) {
             Section sect = iter.next();
-            for (int oo = 0; oo < sect.objectInfo.length; oo++) {
+            for (ObjectInfo element : sect.objectInfo) {
-                list.add(sect.objectInfo[oo]);
+                list.add(element);
             }
         }
     }
@@ -317,8 +318,7 @@ public class SparseMisoSceneModel extends MisoSceneModel
     {
         for (Iterator<Section> iter = getSections(); iter.hasNext(); ) {
             Section sect = iter.next();
-            for (int oo = 0; oo < sect.objectInfo.length; oo++) {
+            for (ObjectInfo oinfo : sect.objectInfo) {
-                ObjectInfo oinfo = sect.objectInfo[oo];
                 visitor.visit(oinfo);
             }
             if (!interestingOnly) {