projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003/06/13 09:19:10
[org.ibex.core.git]
/
src
/
org
/
xwt
/
SpecialBoxProperty.java
diff --git
a/src/org/xwt/SpecialBoxProperty.java
b/src/org/xwt/SpecialBoxProperty.java
index
c2b52b5
..
b492e6c
100644
(file)
--- a/
src/org/xwt/SpecialBoxProperty.java
+++ b/
src/org/xwt/SpecialBoxProperty.java
@@
-106,7
+106,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 (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.log(this, "invalid color \"" + s + "\" at " + Context.getCurrentSourceNameAndLine());
if (newcolor == b.color) return;
b.color = newcolor;
b.dirty();
if (newcolor == b.color) return;
b.color = newcolor;
b.dirty();
@@
-149,7
+149,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 (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.log(this, "invalid color \"" + s + "\" at " + Context.getCurrentSourceNameAndLine());
if (newtextcolor == b.textcolor) return;
b.textcolor = newtextcolor;
b.dirty();
if (newtextcolor == b.textcolor) return;
b.textcolor = newtextcolor;
b.dirty();
@@
-219,8
+219,7
@@
class SpecialBoxProperty {
specialBoxProperties.put("static", new SpecialBoxProperty() {
public Object get(Box b) {
specialBoxProperties.put("static", new SpecialBoxProperty() {
public Object get(Box b) {
- JS.Function cf = JS.getCurrentFunction();
- String cfsn = cf.getSourceName();
+ String cfsn = Context.getContextForThread(Thread.currentThread()).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);
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);
@@
-686,22
+685,22
@@
class SpecialBoxProperty {
}
/** helper that converts a String to a int according to JavaScript coercion rules */
}
/** helper that converts a String to a int according to JavaScript coercion rules */
- public static class Apply extends JS.Function {
+ public static class Apply extends JS.Callable {
Box b;
Box b;
- public Apply(Box b) { this.b = b; }
+ public Apply(Box b) { super(); this.b = b; }
- public Object _call(JS.Array args) throws JS.Exn {
+ public Object call(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) {
// 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 " + JS.getFileAndLine());
+ if (Log.on) Log.log(this, "template " + templatename + " not found at " + Context.getCurrentSourceNameAndLine());
} else {
if (ThreadMessage.suspendThread()) try {
} 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();
t.apply(b, null, null, callback, 0, t.numUnits());
} finally {
ThreadMessage.resumeThread();
@@
-712,7
+711,7
@@
class SpecialBoxProperty {
} else if (args.elementAt(0) instanceof JS && !(args.elementAt(0) instanceof Box)) {
JS s = (JS)args.elementAt(0);
Object[] keys = s.keys();
} 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;
}
return b;