X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fxwt%2FSpecialBoxProperty.java;h=56ee2091a5aee01188df1d8cd7dd6fce2f197908;hp=e8e92e31b1da58bfd90a9f567dc023b71d11a1af;hb=5e6c7408d885681a6eb8576d3411227865b46a2a;hpb=b32cea3f3e272ab00899d134d75a8bd7bcf6c8c0

diff --git a/src/org/xwt/SpecialBoxProperty.java b/src/org/xwt/SpecialBoxProperty.java
index e8e92e3..56ee209 100644
--- a/src/org/xwt/SpecialBoxProperty.java
+++ b/src/org/xwt/SpecialBoxProperty.java
@@ -64,7 +64,6 @@ class SpecialBoxProperty {
     static final int white = 0xFFFFFFFF;
 
     static {
-
         specialBoxProperties.put("color", new SpecialBoxProperty() {
                 public Object get(Box b) {
                     if ((b.color & 0xFF000000) == 0) return null;
@@ -106,7 +105,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 " + Context.getCurrentSourceNameAndLine());
+                    else if (Log.on) Log.logJS(this, "invalid color \"" + s + "\"");
                     if (newcolor == b.color) return;
                     b.color = newcolor;
                     b.dirty();
@@ -149,7 +148,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 " + Context.getCurrentSourceNameAndLine());
+                    else if (Log.on) Log.logJS(this, "invalid color \"" + s + "\"");
                     if (newtextcolor == b.textcolor) return;
                     b.textcolor = newtextcolor;
                     b.dirty();
@@ -219,7 +218,7 @@ class SpecialBoxProperty {
 
         specialBoxProperties.put("static", new SpecialBoxProperty() {
                 public Object get(Box b) {
-                    String cfsn = Context.getContextForThread(Thread.currentThread()).getCurrentFunction().getSourceName();
+                    String cfsn = JS.Thread.fromJavaThread(Thread.currentThread()).getCurrentCompiledFunction().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);
@@ -655,9 +654,9 @@ class SpecialBoxProperty {
 
         specialBoxProperties.put("apply", new SpecialBoxProperty() {
                 public void put(Box b, Object value) { }
-                public Object get(Box b) { return new Apply(b); }
+                public Object get(final Box b) { return new Apply(b); }
             });
-
+        
         specialBoxProperties.put("id", new SpecialBoxProperty() {
                 public void put(Box b, Object value) { }
                 public Object get(Box b) { return b.id; }
@@ -684,20 +683,15 @@ class SpecialBoxProperty {
         catch (NumberFormatException e) { return 0; }
     }
         
-    /** helper that converts a String to a int according to JavaScript coercion rules */
-    public static class Apply extends JS.Callable {
-
+    private static class Apply extends JS.Callable {
         Box b;
-        public Apply(Box b) { super(); this.b = b; }
-
+        public Apply(Box b) { this.b = b; }
         public Object call(JS.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 " + Context.getCurrentSourceNameAndLine());
+                    if (Log.on) Log.logJS(this, "template " + templatename + " not found");
                 } else {
                     if (ThreadMessage.suspendThread()) try {
                         JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
@@ -706,18 +700,16 @@ class SpecialBoxProperty {
                         ThreadMessage.resumeThread();
                     }
                 }
-
-            // apply a list of properties
+                
             } else if (args.elementAt(0) instanceof JS && !(args.elementAt(0) instanceof Box)) {
                 JS s = (JS)args.elementAt(0);
                 Object[] keys = s.keys();
                 for(int j=0; j<keys.length; j++) b.put(keys[j].toString(), s.get(keys[j]));
             }
-
+            
             return b;
         }
     }
-
 }