projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d8e96e
)
2003/11/28 03:27:46
author
david
<david@xwt.org>
Fri, 30 Jan 2004 07:42:17 +0000
(07:42 +0000)
committer
david
<david@xwt.org>
Fri, 30 Jan 2004 07:42:17 +0000
(07:42 +0000)
darcs-hash:
20040130074217
-0c9ea-
9a3a02dba84ac084bb19f13821ed2b9439462dc8
.gz
src/org/xwt/Template.java
patch
|
blob
|
history
diff --git
a/src/org/xwt/Template.java
b/src/org/xwt/Template.java
index
2dbaa3b
..
79de777
100644
(file)
--- a/
src/org/xwt/Template.java
+++ b/
src/org/xwt/Template.java
@@
-132,8
+132,18
@@
public class Template {
if (script != null) script.cloneWithNewParentScope(pis).call(null, null, null, null, 0);
for(int i=0; keys != null && i<keys.length; i++)
if (script != null) script.cloneWithNewParentScope(pis).call(null, null, null, null, 0);
for(int i=0; keys != null && i<keys.length; i++)
- if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.putAndTriggerTraps(keys[i], pis.get(vals[i]));
+ if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') {
+ Object rbox = pis.get(vals[i]);
+ if (rbox == null) Log.log(this, "unknown box id '"+vals[i]+"' referenced");
+ else b.putAndTriggerTraps(keys[i], rbox);
+ }
else if ("image".equals(keys[i])) b.putAndTriggerTraps("image", resolveStringToResource((String)vals[i], xwt, true));
else if ("image".equals(keys[i])) b.putAndTriggerTraps("image", resolveStringToResource((String)vals[i], xwt, true));
+ else if ("redirect".equals(keys[i])) {
+ if (vals[i] == null || "null".equals(vals[i])) b.putAndTriggerTraps("redirect", null);
+ Object rbox = pis.get("$"+vals[i]);
+ if (rbox == null) Log.log(this, "redirect target '"+vals[i]+"' not found");
+ else b.putAndTriggerTraps("redirect", rbox);
+ }
else if (keys[i] != null) b.putAndTriggerTraps(keys[i], vals[i]);
}
else if (keys[i] != null) b.putAndTriggerTraps(keys[i], vals[i]);
}