craigmcc 01/06/01 13:39:43
Modified: src/share/org/apache/struts/taglib/html Tag:
STRUTS_1_0_BRANCH BaseHandlerTag.java
CheckboxTag.java MultiboxTag.java OptionTag.java
OptionsTag.java SelectTag.java
Log:
Replace all occurrences of generating HTML with "attribute minimization"
(i.e. the "checked", "disabled", "multiple", "readonly", and "selected"
attributes) with corresponding constructs such as 'checked="true"'. This
still works fine in current generation browsers, but is more friendly to
XML and XHTML oriented output pages.
PR: Bugzilla #1943
Submitted by: Paresh Gondalia <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.3.2.1 +6 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java
Index: BaseHandlerTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- BaseHandlerTag.java 2001/05/05 00:54:33 1.3
+++ BaseHandlerTag.java 2001/06/01 20:39:42 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
1.3 2001/05/05 00:54:33 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/05/05 00:54:33 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v
1.3.2.1 2001/06/01 20:39:42 craigmcc Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2001/06/01 20:39:42 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* appropriate implementations of these.
*
* @author Don Clasen
- * @version $Revision: 1.3 $ $Date: 2001/05/05 00:54:33 $
+ * @version $Revision: 1.3.2.1 $ $Date: 2001/06/01 20:39:42 $
*/
public abstract class BaseHandlerTag extends BodyTagSupport {
@@ -580,11 +580,11 @@
}
if (disabled) {
- handlers.append(" disabled");
+ handlers.append(" disabled=\"true\"");
}
if (readonly) {
- handlers.append(" readonly");
+ handlers.append(" readonly=\"true\"");
}
}
1.4.2.1 +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.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- CheckboxTag.java 2001/04/18 01:31:14 1.4
+++ CheckboxTag.java 2001/06/01 20:39:43 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v
1.4 2001/04/18 01:31:14 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/04/18 01:31:14 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v
1.4.2.1 2001/06/01 20:39:43 craigmcc Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2001/06/01 20:39:43 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Tag for input fields of type "checkbox".
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/04/18 01:31:14 $
+ * @version $Revision: 1.4.2.1 $ $Date: 2001/06/01 20:39:43 $
*/
public class CheckboxTag extends BaseHandlerTag {
@@ -212,7 +212,7 @@
if (checked.equalsIgnoreCase("true")
|| checked.equalsIgnoreCase("yes")
|| checked.equalsIgnoreCase("on"))
- results.append(" checked");
+ results.append(" checked=\"true\"");
results.append(prepareEventHandlers());
results.append(prepareStyles());
results.append(">");
1.6.2.1 +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.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- MultiboxTag.java 2001/04/18 23:45:02 1.6
+++ MultiboxTag.java 2001/06/01 20:39:43 1.6.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.6 2001/04/18 23:45:02 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/04/18 23:45:02 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v
1.6.2.1 2001/06/01 20:39:43 craigmcc Exp $
+ * $Revision: 1.6.2.1 $
+ * $Date: 2001/06/01 20:39:43 $
*
* ====================================================================
*
@@ -83,7 +83,7 @@
*
* @author Ralph Schaer
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/04/18 23:45:02 $
+ * @version $Revision: 1.6.2.1 $ $Date: 2001/06/01 20:39:43 $
*/
public class MultiboxTag extends BaseHandlerTag {
@@ -273,7 +273,7 @@
}
for (int i = 0; i < values.length; i++) {
if (value.equals(values[i])) {
- results.append(" checked");
+ results.append(" checked=\"true\"");
break;
}
}
1.6.2.1 +6 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java
Index: OptionTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- OptionTag.java 2001/05/05 00:54:33 1.6
+++ OptionTag.java 2001/06/01 20:39:43 1.6.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v 1.6
2001/05/05 00:54:33 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/05/05 00:54:33 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v
1.6.2.1 2001/06/01 20:39:43 craigmcc Exp $
+ * $Revision: 1.6.2.1 $
+ * $Date: 2001/06/01 20:39:43 $
*
* ====================================================================
*
@@ -82,7 +82,7 @@
* the server if this option is selected.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/05/05 00:54:33 $
+ * @version $Revision: 1.6.2.1 $ $Date: 2001/06/01 20:39:43 $
*/
public class OptionTag extends BodyTagSupport {
@@ -248,9 +248,9 @@
results.append(value);
results.append("\"");
if (disabled)
- results.append(" disabled");
+ results.append(" disabled=\"true\"");
if (selectTag.isMatched(value))
- results.append(" selected");
+ results.append(" selected=\"true\"");
results.append(">");
String text = text();
if (text == null)
1.7.2.3 +1 -1
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
Index: OptionsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- OptionsTag.java 2001/06/01 20:14:46 1.7.2.2
+++ OptionsTag.java 2001/06/01 20:39:43 1.7.2.3
@@ -314,7 +314,7 @@
sb.append(value);
sb.append("\"");
if (matched)
- sb.append(" selected");
+ sb.append(" selected=\"true\"");
sb.append(">");
sb.append(ResponseUtils.filter(label));
sb.append("</option>\r\n");
1.3.2.1 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java
Index: SelectTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- SelectTag.java 2001/02/22 02:53:30 1.3
+++ SelectTag.java 2001/06/01 20:39:43 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.3
2001/02/22 02:53:30 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/02/22 02:53:30 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v
1.3.2.1 2001/06/01 20:39:43 craigmcc Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2001/06/01 20:39:43 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* inside a form tag.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/02/22 02:53:30 $
+ * @version $Revision: 1.3.2.1 $ $Date: 2001/06/01 20:39:43 $
*/
public class SelectTag extends BaseHandlerTag {
@@ -251,7 +251,7 @@
results.append("\"");
}
if (multiple != null) {
- results.append(" multiple");
+ results.append(" multiple=\"true\"");
}
if (size != null) {
results.append(" size=\"");