static final int white = 0xFFFFFFFF;
static {
-
specialBoxProperties.put("color", new SpecialBoxProperty() {
public Object get(Box b) {
if ((b.color & 0xFF000000) == 0) return null;
String s = value == null ? null : value.toString();
if (value == null) newcolor = 0x00000000;
else if (s.length() > 0 && s.charAt(0) == '#')
- 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;
- }
+ 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;
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();
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();
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();
specialBoxProperties.put("static", new SpecialBoxProperty() {
public Object get(Box b) {
- JS.Function cf = JS.getCurrentFunction();
- String cfsn = cf.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);
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; }
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) { super(-1, "java", null, null); this.b = b; }
-
- public Object _call(JS.Array args) throws JS.Exn {
-
- // apply a template
+ public Apply(Box b) { this.b = b; }
+ 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.get(keys[j]));
}
-
+
return b;
}
}
-
}