You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by pb...@apache.org on 2007/06/30 05:38:39 UTC
svn commit: r552091 - in /struts/struts1/trunk/el/src/main:
java/org/apache/strutsel/taglib/html/ELMessagesTag.java
java/org/apache/strutsel/taglib/html/ELMessagesTagBeanInfo.java
resources/META-INF/tld/struts-html-el.tld
Author: pbenedict
Date: Fri Jun 29 20:38:38 2007
New Revision: 552091
URL: http://svn.apache.org/viewvc?view=rev&rev=552091
Log:
STR-1922: Add EL version
Modified:
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTag.java
struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTagBeanInfo.java
struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld
Modified: struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTag.java?view=diff&rev=552091&r1=552090&r2=552091
==============================================================================
--- struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTag.java (original)
+++ struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTag.java Fri Jun 29 20:38:38 2007
@@ -52,6 +52,12 @@
private String bundleExpr;
/**
+ * Instance variable mapped to "filterArgs" tag attribute. (Mapping set in
+ * associated BeanInfo class.)
+ */
+ private String filterArgsExpr;
+
+ /**
* Instance variable mapped to "locale" tag attribute. (Mapping set in
* associated BeanInfo class.)
*/
@@ -104,6 +110,14 @@
}
/**
+ * Getter method for "filterArgs" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
+ */
+ public String getFilterArgsExpr() {
+ return (filterArgsExpr);
+ }
+
+ /**
* Getter method for "locale" tag attribute. (Mapping set in associated
* BeanInfo class.)
*/
@@ -168,6 +182,14 @@
}
/**
+ * Setter method for "filterArgs" tag attribute. (Mapping set in associated
+ * BeanInfo class.)
+ */
+ public void setFilterArgsExpr(String filterArgsExpr) {
+ this.filterArgsExpr = filterArgsExpr;
+ }
+
+ /**
* Setter method for "locale" tag attribute. (Mapping set in associated
* BeanInfo class.)
*/
@@ -222,6 +244,7 @@
super.release();
setIdExpr(null);
setBundleExpr(null);
+ setFilterArgsExpr(null);
setLocaleExpr(null);
setNameExpr(null);
setPropertyExpr(null);
@@ -250,6 +273,7 @@
private void evaluateExpressions()
throws JspException {
String string = null;
+ Boolean bool = null;
if ((string =
EvalHelper.evalString("id", getIdExpr(), this, pageContext)) != null) {
@@ -260,6 +284,12 @@
EvalHelper.evalString("bundle", getBundleExpr(), this,
pageContext)) != null) {
setBundle(string);
+ }
+
+ if ((bool =
+ EvalHelper.evalBoolean("filterArgs", getFilterArgsExpr(), this,
+ pageContext)) != null) {
+ setFilterArgs(bool.booleanValue());
}
if ((string =
Modified: struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTagBeanInfo.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTagBeanInfo.java?view=diff&rev=552091&r1=552090&r2=552091
==============================================================================
--- struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTagBeanInfo.java (original)
+++ struts/struts1/trunk/el/src/main/java/org/apache/strutsel/taglib/html/ELMessagesTagBeanInfo.java Fri Jun 29 20:38:38 2007
@@ -49,6 +49,12 @@
}
try {
+ proplist.add(new PropertyDescriptor("filterArgs", ELMessagesTag.class,
+ null, "setFilterArgsExpr"));
+ } catch (IntrospectionException ex) {
+ }
+
+ try {
proplist.add(new PropertyDescriptor("locale", ELMessagesTag.class,
null, "setLocaleExpr"));
} catch (IntrospectionException ex) {
Modified: struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld?view=diff&rev=552091&r1=552090&r2=552091
==============================================================================
--- struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld (original)
+++ struts/struts1/trunk/el/src/main/resources/META-INF/tld/struts-html-el.tld Fri Jun 29 20:38:38 2007
@@ -4661,6 +4661,29 @@
</description>
</attribute>
<attribute>
+ <name>filterArgs</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <description>
+ <![CDATA[
+ By default no filtering to escape XML characters like "<"
+ occurs on the replacement values going into the message pattern.
+ If this attribute is set to 'true', the replacement values will
+ be filtered, while the text of the message pattern itself will
+ be left intact. This can be useful if you have markup in your
+ message patterns which you want to keep, but would like to
+ filter the replacement values going into them, e.g. if they
+ reflect user input. For instance:
+
+ <pre>errors.divideZero=The mathematical expression
+ <strong>{0}</strong> caused a divide by zero.</pre>
+
+ <dl><dt><b>Since:</b></dt>
+ <dd>Struts 1.4</dd></dl>
+ ]]>
+ </description>
+ </attribute>
+ <attribute>
<name>locale</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>