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

diff --git a/src/org/xwt/SpecialBoxProperty.java b/src/org/xwt/SpecialBoxProperty.java
index 095cc6f..bc9b9d4 100644
--- a/src/org/xwt/SpecialBoxProperty.java
+++ b/src/org/xwt/SpecialBoxProperty.java
@@ -1,11 +1,11 @@
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
-import org.mozilla.javascript.*;
-import org.xwt.util.*;
 import java.util.*;
 import java.net.*;
 import java.text.*;
+import org.xwt.js.*;
+import org.xwt.util.*;
 
 /** 
  *  A helper class for properties of Box which require special
@@ -101,8 +101,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.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+                    else if (Log.on) Log.log(this, "invalid color \"" + s + "\" at " + JS.getCurrentFunctionSourceName());
                     if (newcolor == b.color) return;
                     b.color = newcolor;
                     b.dirty();
@@ -145,9 +144,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.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
-
+                    else if (Log.on) Log.log(this, "invalid color \"" + s + "\" at " + JS.getCurrentFunctionSourceName());
                     if (newtextcolor == b.textcolor) return;
                     b.textcolor = newtextcolor;
                     b.dirty();
@@ -164,14 +161,11 @@ class SpecialBoxProperty {
                             if (Log.on) Log.log(this, 
                                                 "ISO Control characters are not permitted in box text strings; offending character is ASCII " +
                                                ((int)t.charAt(i)));
-                            /* FIXME: reinstate
                             return;
-                            */
                         }
 
-                    // FIXME: don't know why this is needed
+		    // FEATURE: try removing the following line; it appears to be redundant
                     b.dirty();
-
                     b.text = t;
                     b.textupdate();
                     b.dirty();
@@ -220,7 +214,7 @@ class SpecialBoxProperty {
 
         specialBoxProperties.put("static", new SpecialBoxProperty() {
                 public Object get(Box b) {
-                    String cfsn = JSObject.getCurrentFunctionSourceName();
+                    String cfsn = JS.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);
@@ -419,9 +413,8 @@ class SpecialBoxProperty {
         specialBoxProperties.put("font", new SpecialBoxProperty() {
                 public Object get(Box b) { return b.font; }
                 public void put(Box b, Object value) {
-                    if (value == null) value = Platform.getDefaultFont();
-                    b.font = value.toString();
-                    b.textupdate();
+                    b.font = value == null ? null : value.toString();
+                    b.fontChanged();
                     b.dirty();
                 } });
         
@@ -429,7 +422,7 @@ class SpecialBoxProperty {
                 public Object get(Box b) { return new Integer(b.getParent() == null || b.surface == null ? 0 : b.pos(0)); }
                 public void put(Box b, Object value) {
                     if (b.surface == null || b.getParent() == null) return;
-                    b.put("x", null, new Integer(stoi(value) - stoi(get(b.getParent()))));
+                    b.put("x", new Integer(stoi(value) - stoi(get(b.getParent()))));
                 }
             });
         
@@ -437,7 +430,7 @@ class SpecialBoxProperty {
                 public Object get(Box b) { return new Integer(b.getParent() == null || b.surface == null ? 0 : b.pos(1)); }
                 public void put(Box b, Object value) {
                     if (b.surface == null || b.getParent() == null) return;
-                    b.put("y", null, new Integer(stoi(value) - stoi(get(b.getParent()))));
+                    b.put("y", new Integer(stoi(value) - stoi(get(b.getParent()))));
                 }
             });
         
@@ -483,12 +476,12 @@ class SpecialBoxProperty {
                     for(Box c = b.prevSibling(); c != null; c = c.prevSibling()) {
                         Box siblingChild = c.whoIs(c.surface.mousex, c.surface.mousey);
                         if (siblingChild != null) {
-                            siblingChild.put(name, c, value);
+                            siblingChild.put(name, value);
                             return;
                         }
                     }
                     if (b.getParent() != null)
-                        b.getParent().put(name, b.getParent(), value);
+                        b.getParent().put(name, value);
                 }};
 
         specialBoxProperties.put("Press1", mouseEventHandler);
@@ -687,23 +680,22 @@ class SpecialBoxProperty {
     }
         
     /** helper that converts a String to a int according to JavaScript coercion rules */
-    private static class Apply extends JSObject.JSFunction {
+    public static class Apply extends JS.Function {
 
         Box b;
         public Apply(Box b) { this.b = b; }
 
-        public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+        public Object _call(JS.Array args) throws JS.Exn {
 
             // apply a template
-            if (args[0] instanceof String) {
-                String templatename = (String)args[0];
+            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.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+                    if (Log.on) Log.log(this, "template " + templatename + " not found at " + JS.getFileAndLine());
                 } else {
                     if (ThreadMessage.suspendThread()) try {
-                        Function callback = args.length < 2 ? null : (Function)args[1];
+                        JS.Function callback = args.length() < 2 ? null : (Function)args.elementAt(1);
                         t.apply(b, null, null, callback, 0, t.numUnits());
                     } finally {
                         ThreadMessage.resumeThread();
@@ -711,11 +703,10 @@ class SpecialBoxProperty {
                 }
 
             // apply a list of properties
-            } else if (args[0] instanceof Scriptable && !(args[0] instanceof Box)) {
-                // FIXME: need to ensure that this is putGlobally(), but still run traps...
-                Scriptable s = (Scriptable)args[0];
-                Object[] keys = s.getIds();
-                for(int j=0; j<keys.length; j++) b.put(keys[j].toString(), null, s.get(keys[j].toString(), s));
+            } 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);
             }
 
             return b;