2003/05/26 10:38:33

[org.ibex.core.git] / src / org / xwt / Box.java

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index 2ab32b9..a18d888 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -1099,14 +1099,17 @@ public final class Box extends JS.Scope {
             // check if box being moved is currently target of a redirect
             for(Box cur = newnode.getParent(); cur != null; cur = cur.getParent())
                 if (cur.redirect == newnode) {
-                    if (Log.on) Log.log(this, "attempt to move a box that is the target of a redirect at "+ JS.getCurrentFunctionSourceName());
+                    if (Log.on) Log.log(this, "attempt to move a box that is the target of a redirect at "+
+                                       JS.getCurrentFunctionSourceName());
                     return;
                 }
 
             // check for recursive ancestor violation
             for(Box cur = this; cur != null; cur = cur.getParent())
                 if (cur == newnode) {
-                    if (Log.on) Log.log(this, "attempt to make a node a parent of its own ancestor at " + JS.getCurrentFunctionSourceName());
+                    if (Log.on) Log.log(this, "attempt to make a node a parent of its own ancestor at " +
+                                       JS.getCurrentFunctionSourceName());
+                    if (Log.on) Log.log(this, "box == " + this + "  ancestor == " + newnode);
                     return;
                 }
 
@@ -1205,6 +1208,7 @@ public final class Box extends JS.Scope {
     public void put(Object name_, Object value, boolean ignoretraps, RootProxy rp) {
        if (name_ instanceof Number) { put(((Number)name_).intValue(), value); return; }
        String name = (String)name_;
+       if (name == null) return;  // FIXME, shouldn't be necessary
         if (name.startsWith("xwt_")) {
             if (Log.on) Log.log(this, "attempt to set reserved property " + name + " at " + JS.getFileAndLine());
             return;