niallp 2004/07/21 14:02:23
Modified: doc/userGuide struts-html.xml
src/share/org/apache/struts/taglib/html FormTag.java
Log:
Bug 21986 - add accept-charset attribute to the FormTag
Revision Changes Path
1.80 +11 -0 jakarta-struts/doc/userGuide/struts-html.xml
Index: struts-html.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- struts-html.xml 14 Jul 2004 15:13:17 -0000 1.79
+++ struts-html.xml 21 Jul 2004 21:02:22 -0000 1.80
@@ -1393,6 +1393,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.60 +36 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
Index: FormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- FormTag.java 21 Apr 2004 05:21:08 -0000 1.59
+++ FormTag.java 21 Jul 2004 21:02:22 -0000 1.60
@@ -165,6 +165,12 @@
*/
protected String beanType = null;
+ /**
+ * The list of character encodings for input data that the server should
+ * accept.
+ */
+ protected String acceptCharset = null;
+
// ------------------------------------------------------------- Properties
/**
@@ -379,6 +385,26 @@
}
+ /**
+ * Return the list of character encodings accepted.
+ */
+ public String getAcceptCharset() {
+
+ return acceptCharset;
+
+ }
+
+ /**
+ * Set the list of character encodings accepted.
+ *
+ * @param acceptCharset The list of character encodings
+ */
+ public void setAcceptCharset(String acceptCharset) {
+
+ this.acceptCharset= acceptCharset;
+
+ }
+
// --------------------------------------------------------- Public Methods
@@ -465,6 +491,11 @@
results.append("\"");
+ if (acceptCharset != null) {
+ results.append(" accept-charset=\"");
+ results.append(getAcceptCharset());
+ results.append("\"");
+ }
if (styleClass != null) {
results.append(" class=\"");
results.append(styleClass);
@@ -650,6 +681,7 @@
styleClass = null;
styleId = null;
target = null;
+ acceptCharset = null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
