2003/06/12 17:57:37

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

diff --git a/src/org/xwt/SpecialBoxProperty.java b/src/org/xwt/SpecialBoxProperty.java
index 00f43db..b492e6c 100644 (file)
--- a/src/org/xwt/SpecialBoxProperty.java
+++ b/src/org/xwt/SpecialBoxProperty.java
@@ -106,7 +106,7 @@ class SpecialBoxProperty {
                     else if (s.equals("pink")) newcolor = pink;
                     else if (s.equals("yellow")) newcolor = yellow;
                     else if (s.equals("white")) newcolor = white;
-                    else if (Log.on) Log.log(this, "invalid color \"" + s + "\" at " + JS.getCurrentFunctionSourceName());
+                    else if (Log.on) Log.log(this, "invalid color \"" + s + "\" at " + Context.getCurrentSourceNameAndLine());
                     if (newcolor == b.color) return;
                     b.color = newcolor;
                     b.dirty();
@@ -149,7 +149,7 @@ class SpecialBoxProperty {
                     else if (s.equals("pink")) newtextcolor = pink;
                     else if (s.equals("yellow")) newtextcolor = yellow;
                     else if (s.equals("white")) newtextcolor = white;
-                    else if (Log.on) Log.log(this, "invalid color \"" + s + "\" at " + JS.getCurrentFunctionSourceName());
+                    else if (Log.on) Log.log(this, "invalid color \"" + s + "\" at " + Context.getCurrentSourceNameAndLine());
                     if (newtextcolor == b.textcolor) return;
                     b.textcolor = newtextcolor;
                     b.dirty();
@@ -219,8 +219,7 @@ class SpecialBoxProperty {
 
         specialBoxProperties.put("static", new SpecialBoxProperty() {
                 public Object get(Box b) {
-                   JS.Function cf = JS.getCurrentFunction();
-                    String cfsn = cf.getSourceName();
+                   String cfsn = Context.getContextForThread(Thread.currentThread()).getCurrentFunction().getSourceName();
                     for(int i=0; i<cfsn.length() - 1; i++)
                         if (cfsn.charAt(i) == '.' && (cfsn.charAt(i+1) == '_' || Character.isDigit(cfsn.charAt(i+1)))) {
                             cfsn = cfsn.substring(0, i);
@@ -686,22 +685,22 @@ class SpecialBoxProperty {
     }
         
     /** helper that converts a String to a int according to JavaScript coercion rules */
-    public static class Apply extends JS.Function {
+    public static class Apply extends JS.Callable {
 
         Box b;
-        public Apply(Box b) { super(-1, "java", null, null); this.b = b; }
+        public Apply(Box b) { super(); this.b = b; }
 
-        public Object _call(JS.Array args) throws JS.Exn {
+        public Object call(Array args) throws JS.Exn {
 
             // apply a template
             if (args.elementAt(0) instanceof String) {
                 String templatename = (String)args.elementAt(0);
                 Template t = Template.getTemplate(templatename, null);
                 if (t == null) {
-                    if (Log.on) Log.log(this, "template " + templatename + " not found at " + JS.getFileAndLine());
+                    if (Log.on) Log.log(this, "template " + templatename + " not found at " + Context.getCurrentSourceNameAndLine());
                 } else {
                     if (ThreadMessage.suspendThread()) try {
-                        JS.Function callback = args.length() < 2 ? null : (Function)args.elementAt(1);
+                        JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
                         t.apply(b, null, null, callback, 0, t.numUnits());
                     } finally {
                         ThreadMessage.resumeThread();