// 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
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();
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();
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();
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);
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();
} });
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()))));
}
});
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()))));
}
});
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);
}
/** 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();
}
// 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;
projects / org.ibex.core.git / blobdiff