niallp 2004/07/23 19:40:53
Modified: contrib/struts-el/doc/userGuide struts-html-el.xml
contrib/struts-el/src/share/org/apache/strutsel/taglib/html
ELFormTag.java ELFormTagBeanInfo.java
Log:
Add "acceptCharset" attribute to ELFormTag (bug 21986)
Revision Changes Path
1.30 +11 -0
jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml
Index: struts-html-el.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- struts-html-el.xml 14 Feb 2004 19:43:14 -0000 1.29
+++ struts-html-el.xml 24 Jul 2004 02:40:53 -0000 1.30
@@ -1390,6 +1390,17 @@
</attribute>
<attribute>
+ <name>acceptCharset</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <info>
+ The list of character encodings for input data that the server
should
+ accept.
+ </info>
+ <since>Struts 1.2.2</since>
+ </attribute>
+
+ <attribute>
<name>enctype</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
1.14 +24 -4
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java
Index: ELFormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ELFormTag.java 14 Mar 2004 07:15:01 -0000 1.13
+++ ELFormTag.java 24 Jul 2004 02:40:53 -0000 1.14
@@ -98,6 +98,11 @@
* (Mapping set in associated BeanInfo class.)
*/
private String targetExpr;
+ /**
+ * Instance variable mapped to "acceptCharset" tag attribute.
+ * (Mapping set in associated BeanInfo class.)
+ */
+ private String acceptCharsetExpr;
/**
* Getter method for "action" tag attribute.
@@ -159,6 +164,11 @@
* (Mapping set in associated BeanInfo class.)
*/
public String getTargetExpr() { return (targetExpr); }
+ /**
+ * Getter method for "acceptCharset" tag attribute.
+ * (Mapping set in associated BeanInfo class.)
+ */
+ public String getAcceptCharsetExpr() { return (acceptCharsetExpr); }
/**
* Setter method for "action" tag attribute.
@@ -220,6 +230,11 @@
* (Mapping set in associated BeanInfo class.)
*/
public void setTargetExpr(String targetExpr) { this.targetExpr = targetExpr; }
+ /**
+ * Setter method for "acceptCharset" tag attribute.
+ * (Mapping set in associated BeanInfo class.)
+ */
+ public void setAcceptCharsetExpr(String acceptCharsetExpr) {
this.acceptCharsetExpr = acceptCharsetExpr; }
/**
* Resets attribute values for tag reuse.
@@ -239,6 +254,7 @@
setStyleClassExpr(null);
setStyleIdExpr(null);
setTargetExpr(null);
+ setAcceptCharsetExpr(null);
}
/**
@@ -308,6 +324,10 @@
if ((string = EvalHelper.evalString("target", getTargetExpr(),
this, pageContext)) != null)
setTarget(string);
+
+ if ((string = EvalHelper.evalString("acceptCharset", getAcceptCharsetExpr(),
+ this, pageContext)) != null)
+ setAcceptCharset(string);
}
}
1.5 +7 -3
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTagBeanInfo.java
Index: ELFormTagBeanInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTagBeanInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ELFormTagBeanInfo.java 14 Mar 2004 07:15:01 -0000 1.4
+++ ELFormTagBeanInfo.java 24 Jul 2004 02:40:53 -0000 1.5
@@ -97,6 +97,10 @@
proplist.add(new PropertyDescriptor("type", ELFormTag.class,
null, "setTypeExpr"));
} catch (IntrospectionException ex) {}
+ try {
+ proplist.add(new PropertyDescriptor("acceptCharset", ELFormTag.class,
+ null, "setAcceptCharsetExpr"));
+ } catch (IntrospectionException ex) {}
PropertyDescriptor[] result =
new PropertyDescriptor[proplist.size()];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
