2003/06/18 05:56:23

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

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index b2d0c4b..0d572c7 100644 (file)
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -80,8 +80,8 @@ public class Trap {
         }
 
         // find out what script is currently running
-       JS.CompiledFunction placer = Context.getContextForThread(Thread.currentThread()).getCurrentFunction();
-       if (placer == null) { Log.log(Trap.class, "placer is null"); return; }
+        JS.CompiledFunction placer = JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction();
+        if (placer == null) { Log.log(Trap.class, "placer is null"); return; }
         String placerNodeName = placer.getSourceName();
 
         // check if this script has already placed a trap on this property
@@ -110,7 +110,7 @@ public class Trap {
     public static Trap getTrap(Box b, String name) {
         if (b.traps == null) return null;
 
-        String currentFunctionNodeName = Context.getContextForThread(Thread.currentThread()).getCurrentFunction().getSourceName();
+        String currentFunctionNodeName = JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction().getSourceName();
         for(Trap cur = (Trap)b.traps.get(name); cur != null; cur = cur.next)
             if (cur.placerNodeName.equals(currentFunctionNodeName))
                 return cur;
@@ -122,7 +122,7 @@ public class Trap {
     public static final CascadeFunction cascadeFunction = new CascadeFunction();
     private static class CascadeFunction extends JS.Callable {
         CascadeFunction() { setSeal(true); }
-        public Object call(JS.Array args) { return call(args, Context.getContextForThread(Thread.currentThread()).getCurrentFunction()); }
+        public Object call(JS.Array args) { return call(args, JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction()); }
         public Object call(JS.Array args, JS.CompiledFunction currentFunction) {
             Trap currentTrap = TrapContext.get().currentTrap;
             if (args.length() != 0) TrapContext.get().putCascadeHappened = true;
@@ -179,15 +179,15 @@ public class Trap {
                 return ret;
             }
             
-           Object ret = f.call(args);
-           
+            Object ret = f.call(args);
+            
             // autocascade if required
             if (args.length() > 0 && !isreadtrap && !tc.putCascadeHappened) cascadeFunction.call(args, f);
             
             return ret;
 
         } catch (JS.Exn e) {
-           if (Log.on) Log.log(this, e);
+            if (Log.on) Log.log(this, e);
 
         } finally {
             // restore the thread-locals
@@ -223,7 +223,7 @@ public class Trap {
 
         /** returns the TrapContext for the current thread */
         static TrapContext get() {
-            TrapContext ret = (TrapContext)trapContextByThread.get(Thread.currentThread());
+            TrapContext ret = (TrapContext)trapContextByThread.get(java.lang.Thread.currentThread());
             if (ret == null) {
                 ret = new TrapContext();
                 trapContextByThread.put(Thread.currentThread(), ret);