- if (vals[i] instanceof String && ((String)vals[i]).charAt(0) == '$') b.putAndTriggerJSTraps(keys[i], pis.get(vals[i]));
- else if ("image".equals(keys[i])) b.putAndTriggerJSTraps("image", resolveStringToResource((String)vals[i], xwt, true));
- else if (keys[i] != null) b.putAndTriggerJSTraps(keys[i], 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 in XML attribute");
+ 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]);