jholmes 2002/10/21 15:30:23
Modified: src/share/org/apache/struts/taglib/html BaseFieldTag.java
BaseTag.java ButtonTag.java CancelTag.java
CheckboxTag.java FrameTag.java ImageTag.java
ImgTag.java MultiboxTag.java RadioTag.java
ResetTag.java SubmitTag.java
Log:
fix tags so that they work in text/xml mode
PR: Bugzilla #12185
Revision Changes Path
1.14 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java
Index: BaseFieldTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BaseFieldTag.java 23 Sep 2002 05:13:43 -0000 1.13
+++ BaseFieldTag.java 21 Oct 2002 22:30:22 -0000 1.14
@@ -192,7 +192,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Print this field to our output writer
ResponseUtils.write(pageContext, results.toString());
1.7 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java
Index: BaseTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseTag.java 5 Oct 2002 22:56:21 -0000 1.6
+++ BaseTag.java 21 Oct 2002 22:30:22 -0000 1.7
@@ -133,7 +133,7 @@
buf.append(target);
buf.append("\"");
}
- buf.append(">");
+ buf.append(" />");
JspWriter out = pageContext.getOut();
try {
out.write(buf.toString());
1.11 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java
Index: ButtonTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ButtonTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ButtonTag.java 23 Sep 2002 05:13:43 -0000 1.10
+++ ButtonTag.java 21 Oct 2002 22:30:22 -0000 1.11
@@ -207,7 +207,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Render this element to our writer
ResponseUtils.write(pageContext, results.toString());
1.7 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java
Index: CancelTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CancelTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CancelTag.java 23 Sep 2002 05:13:43 -0000 1.6
+++ CancelTag.java 21 Oct 2002 22:30:22 -0000 1.7
@@ -210,7 +210,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Render this element to our writer
ResponseUtils.write(pageContext, results.toString());
1.13 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java
Index: CheckboxTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CheckboxTag.java 23 Sep 2002 05:13:43 -0000 1.12
+++ CheckboxTag.java 21 Oct 2002 22:30:22 -0000 1.13
@@ -217,7 +217,7 @@
results.append(" checked=\"checked\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Print this field to our output writer
ResponseUtils.write(pageContext, results.toString());
1.5 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java
Index: FrameTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FrameTag.java 8 Oct 2002 06:22:41 -0000 1.4
+++ FrameTag.java 21 Oct 2002 22:30:22 -0000 1.5
@@ -243,7 +243,7 @@
results.append("\"");
}
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
ResponseUtils.write(pageContext,results.toString());
// Skip the body of this tag
1.20 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java
Index: ImageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ImageTag.java 16 Oct 2002 19:51:56 -0000 1.19
+++ ImageTag.java 21 Oct 2002 22:30:22 -0000 1.20
@@ -257,7 +257,7 @@
}
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Render this element to our writer
ResponseUtils.write(pageContext, results.toString());
1.19 +13 -13
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ImgTag.java 23 Sep 2002 05:13:43 -0000 1.18
+++ ImgTag.java 21 Oct 2002 22:30:22 -0000 1.19
@@ -493,13 +493,13 @@
}
results.append(prepareStyles());
results.append(prepareEventHandlers());
- results.append(">");
+ results.append(" />");
- // Print this element to our output writer
+ // Print this element to our output writer
ResponseUtils.write(pageContext, results.toString());
// Evaluate the reaminder of this page
- return (EVAL_PAGE);
+ return (EVAL_PAGE);
}
@@ -509,23 +509,24 @@
*/
public void release() {
- super.release();
+ super.release();
+
border = null;
height = null;
hspace = null;
imageName = null;
ismap = null;
lowsrc = null;
- name = null;
+ name = null;
page = null;
pageKey = null;
paramId = null;
paramName = null;
paramProperty = null;
paramScope = null;
- property = null;
+ property = null;
scope = null;
- src = null;
+ src = null;
srcKey = null;
usemap = null;
vspace = null;
@@ -628,7 +629,7 @@
return (url);
// Start with an unadorned URL as specified
- StringBuffer src = new StringBuffer(url);
+ StringBuffer src = new StringBuffer(url);
// Append a single-parameter name and value, if requested
@@ -713,6 +714,5 @@
return (src.toString());
}
-
}
1.14 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java
Index: MultiboxTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MultiboxTag.java 23 Sep 2002 05:13:43 -0000 1.13
+++ MultiboxTag.java 21 Oct 2002 22:30:22 -0000 1.14
@@ -277,7 +277,7 @@
}
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Render this element to our response
ResponseUtils.write(pageContext, results.toString());
1.15 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java
Index: RadioTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RadioTag.java 23 Sep 2002 05:13:43 -0000 1.14
+++ RadioTag.java 21 Oct 2002 22:30:22 -0000 1.15
@@ -284,7 +284,7 @@
results.append(" checked=\"checked\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Print this field to our output writer
ResponseUtils.write(pageContext, results.toString());
1.8 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java
Index: ResetTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ResetTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResetTag.java 23 Sep 2002 05:13:43 -0000 1.7
+++ ResetTag.java 21 Oct 2002 22:30:22 -0000 1.8
@@ -225,7 +225,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Render this element to our writer
ResponseUtils.write(pageContext, results.toString());
1.13 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java
Index: SubmitTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SubmitTag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SubmitTag.java 23 Sep 2002 05:13:43 -0000 1.12
+++ SubmitTag.java 21 Oct 2002 22:30:22 -0000 1.13
@@ -230,7 +230,7 @@
results.append("\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
- results.append(">");
+ results.append(" />");
// Render this element to our writer
ResponseUtils.write(pageContext, results.toString());
--
To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>
