Author: niallp
Date: Mon Apr 4 05:06:45 2005
New Revision: 160033
URL: http://svn.apache.org/viewcvs?view=rev&rev=160033
Log:
Port to 1.2.x branch - add "bundle" attibute to ELJavascriptValidatorTag.
Modified:
struts/el/branches/STRUTS_1_2_BRANCH/doc/userGuide/struts-html-el.xml
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTagBeanInfo.java
Modified: struts/el/branches/STRUTS_1_2_BRANCH/doc/userGuide/struts-html-el.xml
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/doc/userGuide/struts-html-el.xml?view=diff&r1=160032&r2=160033
==============================================================================
--- struts/el/branches/STRUTS_1_2_BRANCH/doc/userGuide/struts-html-el.xml
(original)
+++ struts/el/branches/STRUTS_1_2_BRANCH/doc/userGuide/struts-html-el.xml Mon
Apr 4 05:06:45 2005
@@ -3678,6 +3678,17 @@
</p>
</info>
</attribute>
+ <attribute>
+ <name>bundle</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <info>
+ The servlet context attributes key for the MessageResources
+ instance to use. If not specified, defaults to the
+ application resources configured for our action servlet.
+ </info>
+ <since>Struts 1.2.7</since>
+ </attribute>
</tag>
Modified:
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java?view=diff&r1=160032&r2=160033
==============================================================================
---
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
(original)
+++
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
Mon Apr 4 05:06:45 2005
@@ -82,6 +82,11 @@
* (Mapping set in associated BeanInfo class.)
*/
private String htmlCommentExpr;
+ /**
+ * Instance variable mapped to "bundle" tag attribute.
+ * (Mapping set in associated BeanInfo class.)
+ */
+ private String bundleExpr;
/**
* Getter method for "cdata" tag attribute.
@@ -128,6 +133,11 @@
* (Mapping set in associated BeanInfo class.)
*/
public String getHtmlCommentExpr() { return (htmlCommentExpr); }
+ /**
+ * Getter method for "bundle" tag attribute.
+ * (Mapping set in associated BeanInfo class.)
+ */
+ public String getBundleExpr() { return (bundleExpr); }
/**
* Setter method for "cdata" tag attribute.
@@ -174,6 +184,11 @@
* (Mapping set in associated BeanInfo class.)
*/
public void setHtmlCommentExpr(String htmlCommentExpr) {
this.htmlCommentExpr = htmlCommentExpr; }
+ /**
+ * Setter method for "bundle" tag attribute.
+ * (Mapping set in associated BeanInfo class.)
+ */
+ public void setBundleExpr(String bundleExpr) { this.bundleExpr =
bundleExpr; }
/**
* Resets attribute values for tag reuse.
@@ -190,6 +205,7 @@
setSrcExpr(null);
setStaticJavascriptExpr(null);
setHtmlCommentExpr(null);
+ setBundleExpr(null);
}
/**
@@ -248,5 +264,9 @@
if ((string = EvalHelper.evalString("htmlComment",
getHtmlCommentExpr(),
this, pageContext)) != null)
setHtmlComment(string);
+
+ if ((string = EvalHelper.evalString("bundle", getBundleExpr(),
+ this, pageContext)) != null)
+ setBundle(string);
}
}
Modified:
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTagBeanInfo.java
URL:
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTagBeanInfo.java?view=diff&r1=160032&r2=160033
==============================================================================
---
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTagBeanInfo.java
(original)
+++
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTagBeanInfo.java
Mon Apr 4 05:06:45 2005
@@ -78,6 +78,10 @@
proplist.add(new PropertyDescriptor("htmlComment",
ELJavascriptValidatorTag.class,
null, "setHtmlCommentExpr"));
} catch (IntrospectionException ex) {}
+ try {
+ proplist.add(new PropertyDescriptor("bundle",
ELJavascriptValidatorTag.class,
+ null, "setBundleExpr"));
+ } catch (IntrospectionException ex) {}
PropertyDescriptor[] result =
new PropertyDescriptor[proplist.size()];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
