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

diff --git a/src/org/xwt/SpecialBoxProperty.java b/src/org/xwt/SpecialBoxProperty.java
index bc9b9d4..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;
@@ -81,10 +80,15 @@ class SpecialBoxProperty {
                     String s = value == null ? null : value.toString();
                     if (value == null) newcolor = 0x00000000;
                     else if (s.length() > 0 && s.charAt(0) == '#')
-                        newcolor = 0xFF000000 |
-                            (Integer.parseInt(s.substring(1, 3), 16) << 16) |
-                            (Integer.parseInt(s.substring(3, 5), 16) << 8) |
-                            Integer.parseInt(s.substring(5, 7), 16);
+                        try {
+                            newcolor = 0xFF000000 |
+                                (Integer.parseInt(s.substring(1, 3), 16) << 16) |
+                                (Integer.parseInt(s.substring(3, 5), 16) << 8) |
+                                Integer.parseInt(s.substring(5, 7), 16);
+                        } catch (NumberFormatException e) {
+                            Log.log(this, "invalid color " + s);
+                            return;
+                        }
                     else if (s.equals("black")) newcolor = black;
                     else if (s.equals("blue")) newcolor = blue;
                     else if (s.equals("green")) newcolor = green;
@@ -101,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 " + JS.getCurrentFunctionSourceName());
+                    else if (Log.on) Log.logJS(this, "invalid color \"" + s + "\"");
                     if (newcolor == b.color) return;
                     b.color = newcolor;
                     b.dirty();
@@ -144,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 " + JS.getCurrentFunctionSourceName());
+                    else if (Log.on) Log.logJS(this, "invalid color \"" + s + "\"");
                     if (newtextcolor == b.textcolor) return;
                     b.textcolor = newtextcolor;
                     b.dirty();
@@ -164,7 +168,7 @@ class SpecialBoxProperty {
                             return;
                         }
 
-		    // FEATURE: try removing the following line; it appears to be redundant
+                    // FEATURE: try removing the following line; it appears to be redundant
                     b.dirty();
                     b.text = t;
                     b.textupdate();
@@ -214,7 +218,7 @@ class SpecialBoxProperty {
 
         specialBoxProperties.put("static", new SpecialBoxProperty() {
                 public Object get(Box b) {
-                    String cfsn = JS.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);
@@ -650,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; }
@@ -679,40 +683,33 @@ 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.Function {
-
+    private static class Apply extends JS.Callable {
         Box b;
         public Apply(Box b) { this.b = b; }
-
-        public Object _call(JS.Array args) throws JS.Exn {
-
-            // apply a template
+        public Object call(JS.Array args) throws JS.Exn {
             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.logJS(this, "template " + templatename + " not found");
                 } 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();
                     }
                 }
-
-            // 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);
+                for(int j=0; j<keys.length; j++) b.put(keys[j].toString(), s.get(keys[j]));
             }
-
+            
             return b;
         }
     }
-
 }