2003/06/16 08:44:09

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

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index ec47f2d..0d572c7 100644 (file)
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -80,7 +80,7 @@ public class Trap {
         }
 
         // find out what script is currently running
-        JS.CompiledFunction placer = Context.getContextForThread(Thread.currentThread()).getCurrentFunction();
+        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();
 
@@ -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;
@@ -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);