2003/04/29 12:24:01

darcs-hash:20040130065924-0c9ea-7e3069b35376e9447800f330d3f157c0635a747e.gz

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index caa7c8a..f0645aa 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -1091,6 +1091,16 @@ public final class Box extends JSObject {
 
         } else {
             Box newnode = (Box)value;
+
+            // 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 "+
+                                        Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+                    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 " +