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/12/29 03:27:43
[org.ibex.core.git]
/
src
/
org
/
xwt
/
Box.java
diff --git
a/src/org/xwt/Box.java
b/src/org/xwt/Box.java
index
df1cfd6
..
7572beb
100644
(file)
--- a/
src/org/xwt/Box.java
+++ b/
src/org/xwt/Box.java
@@
-605,7
+605,7
@@
public final class Box extends JSScope implements Scheduler.Task {
case "bottom": set(ALIGN_BOTTOM);
case "left": set(ALIGN_LEFT);
case "right": set(ALIGN_RIGHT);
case "bottom": set(ALIGN_BOTTOM);
case "left": set(ALIGN_LEFT);
case "right": set(ALIGN_RIGHT);
- default: Log.logJS("invalid alignment \"" + value + "\"");
+ default: JS.log("invalid alignment \"" + value + "\"");
//#end
}
//#end
}
@@
-785,13
+785,13
@@
public final class Box extends JSScope implements Scheduler.Task {
if (i < 0) return;
if (value != null && !(value instanceof Box)) {
if (i < 0) return;
if (value != null && !(value instanceof Box)) {
- if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box");
+ if (Log.on) JS.log(this, "attempt to set a numerical property on a box to a non-box");
return;
}
if (redirect == null) {
if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i));
return;
}
if (redirect == null) {
if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i));
- else Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
+ else JS.log(this, "attempt to add/remove children to/from a node with a null redirect");
} else if (redirect != this) {
if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value);
} else if (redirect != this) {
if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value);
@@
-813,14
+813,14
@@
public final class Box extends JSScope implements Scheduler.Task {
// check if box being moved is currently target of a redirect
for(Box cur = b.parent; cur != null; cur = cur.parent)
if (cur.redirect == b) {
// check if box being moved is currently target of a redirect
for(Box cur = b.parent; cur != null; cur = cur.parent)
if (cur.redirect == b) {
- if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
+ if (Log.on) JS.log(this, "attempt to move a box that is the target of a redirect");
return;
}
// check for recursive ancestor violation
for(Box cur = this; cur != null; cur = cur.parent)
if (cur == b) {
return;
}
// check for recursive ancestor violation
for(Box cur = this; cur != null; cur = cur.parent)
if (cur == b) {
- if (Log.on) Log.logJS(this, "attempt to make a node a parent of its own ancestor");
+ if (Log.on) JS.log(this, "attempt to make a node a parent of its own ancestor");
if (Log.on) Log.info(this, "box == " + this + " ancestor == " + b);
return;
}
if (Log.on) Log.info(this, "box == " + this + " ancestor == " + b);
return;
}
@@
-842,8
+842,8
@@
public final class Box extends JSScope implements Scheduler.Task {
try {
putAndTriggerTraps(name, val);
} catch (Exception e) {
try {
putAndTriggerTraps(name, val);
} catch (Exception e) {
- Log.logJS("caught exception while putting to trap \""+name+"\"");
- Log.logJS(e);
+ JS.log("caught exception while putting to trap \""+name+"\"");
+ JS.log(e);
}
}
}
}