From: david <david@xwt.org>
Date: Fri, 30 Jan 2004 07:42:17 +0000 (+0000)
Subject: 2003/11/28 03:27:46
X-Git-Tag: RC3~303
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=3da47c535468eb52df828f9625b636978312bd07

2003/11/28 03:27:46

darcs-hash:20040130074217-0c9ea-9a3a02dba84ac084bb19f13821ed2b9439462dc8.gz
---

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 2dbaa3b..79de777 100644
--- 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 (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 ("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]);
     }