From 120ba254de55dfb9275155c889896c695e8d8649 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 30 Jan 2004 07:43:50 +0000 Subject: [PATCH] 2003/12/29 22:31:38 darcs-hash:20040130074350-0c9ea-38b22be42383d3c2d1cc9aa683f1450a3ce45f3d.gz --- src/org/xwt/Box.java | 2 +- src/org/xwt/js/Trap.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 48c5628..35c0723 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -420,7 +420,7 @@ public final class Box extends JSScope implements Scheduler.Task { return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name); //#switch(name) - case "surface": return parent == null ? null : parent.get("surface"); + case "surface": return parent == null ? null : parent.getAndTriggerTraps("surface"); case "indexof": return METHOD; case "text": return text; case "path": throw new JSExn("cannot read from the path property"); diff --git a/src/org/xwt/js/Trap.java b/src/org/xwt/js/Trap.java index 60c34c6..1e299e5 100644 --- a/src/org/xwt/js/Trap.java +++ b/src/org/xwt/js/Trap.java @@ -43,10 +43,9 @@ class Trap { Object invoke() throws JSExn { Interpreter i = new Interpreter(getInvoker, false, null); - i.stack.push(this); + i.stack.push(trapee); i.stack.push(name); - i.resume(); - return i.stack.pop(); + return i.resume(); } // FIXME: review; is necessary? -- 1.7.10.4