craigmcc 01/06/09 20:53:31 Modified: src/share/org/apache/struts/taglib/html BaseHandlerTag.java CheckboxTag.java MultiboxTag.java OptionTag.java OptionsTag.java RadioTag.java SelectTag.java Log: Port the fix for Bugzilla #1982 Revision Changes Path 1.5 +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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BaseHandlerTag.java 2001/06/01 20:43:18 1.4 +++ BaseHandlerTag.java 2001/06/10 03:53:31 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v 1.4 2001/06/01 20:43:18 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2001/06/01 20:43:18 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v 1.5 2001/06/10 03:53:31 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/06/10 03:53:31 $ * * ==================================================================== * @@ -71,7 +71,7 @@ * appropriate implementations of these. * * @author Don Clasen - * @version $Revision: 1.4 $ $Date: 2001/06/01 20:43:18 $ + * @version $Revision: 1.5 $ $Date: 2001/06/10 03:53:31 $ */ public abstract class BaseHandlerTag extends BodyTagSupport { @@ -580,11 +580,11 @@ } if (disabled) { - handlers.append(" disabled=\"true\""); + handlers.append(" disabled=\"disabled\""); } if (readonly) { - handlers.append(" readonly=\"true\""); + handlers.append(" readonly=\"readonly\""); } } 1.6 +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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CheckboxTag.java 2001/06/01 20:43:18 1.5 +++ CheckboxTag.java 2001/06/10 03:53:31 1.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v 1.5 2001/06/01 20:43:18 craigmcc Exp $ - * $Revision: 1.5 $ - * $Date: 2001/06/01 20:43:18 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/CheckboxTag.java,v 1.6 2001/06/10 03:53:31 craigmcc Exp $ + * $Revision: 1.6 $ + * $Date: 2001/06/10 03:53:31 $ * * ==================================================================== * @@ -76,7 +76,7 @@ * Tag for input fields of type "checkbox". * * @author Craig R. McClanahan - * @version $Revision: 1.5 $ $Date: 2001/06/01 20:43:18 $ + * @version $Revision: 1.6 $ $Date: 2001/06/10 03:53:31 $ */ public class CheckboxTag extends BaseHandlerTag { @@ -212,7 +212,7 @@ if (checked.equalsIgnoreCase("true") || checked.equalsIgnoreCase("yes") || checked.equalsIgnoreCase("on")) - results.append(" checked=\"true\""); + results.append(" checked=\"checked\""); results.append(prepareEventHandlers()); results.append(prepareStyles()); results.append(">"); 1.8 +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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- MultiboxTag.java 2001/06/01 20:43:18 1.7 +++ MultiboxTag.java 2001/06/10 03:53:31 1.8 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v 1.7 2001/06/01 20:43:18 craigmcc Exp $ - * $Revision: 1.7 $ - * $Date: 2001/06/01 20:43:18 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MultiboxTag.java,v 1.8 2001/06/10 03:53:31 craigmcc Exp $ + * $Revision: 1.8 $ + * $Date: 2001/06/10 03:53:31 $ * * ==================================================================== * @@ -83,7 +83,7 @@ * * @author Ralph Schaer * @author Craig R. McClanahan - * @version $Revision: 1.7 $ $Date: 2001/06/01 20:43:18 $ + * @version $Revision: 1.8 $ $Date: 2001/06/10 03:53:31 $ */ 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=\"true\""); + results.append(" checked=\"checked\""); break; } } 1.8 +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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- OptionTag.java 2001/06/01 20:43:18 1.7 +++ OptionTag.java 2001/06/10 03:53:31 1.8 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v 1.7 2001/06/01 20:43:18 craigmcc Exp $ - * $Revision: 1.7 $ - * $Date: 2001/06/01 20:43:18 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionTag.java,v 1.8 2001/06/10 03:53:31 craigmcc Exp $ + * $Revision: 1.8 $ + * $Date: 2001/06/10 03:53:31 $ * * ==================================================================== * @@ -82,7 +82,7 @@ * the server if this option is selected. * * @author Craig R. McClanahan - * @version $Revision: 1.7 $ $Date: 2001/06/01 20:43:18 $ + * @version $Revision: 1.8 $ $Date: 2001/06/10 03:53:31 $ */ public class OptionTag extends BodyTagSupport { @@ -248,9 +248,9 @@ results.append(value); results.append("\""); if (disabled) - results.append(" disabled=\"true\""); + results.append(" disabled=\"disabled\""); if (selectTag.isMatched(value)) - results.append(" selected=\"true\""); + results.append(" selected=\"selected\""); results.append(">"); String text = text(); if (text == null) 1.11 +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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- OptionsTag.java 2001/06/01 20:43:18 1.10 +++ OptionsTag.java 2001/06/10 03:53:31 1.11 @@ -314,7 +314,7 @@ sb.append(value); sb.append("\""); if (matched) - sb.append(" selected=\"true\""); + sb.append(" selected=\"selected\""); sb.append(">"); sb.append(ResponseUtils.filter(label)); sb.append("</option>\r\n"); 1.5 +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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- RadioTag.java 2001/06/01 20:43:18 1.4 +++ RadioTag.java 2001/06/10 03:53:31 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v 1.4 2001/06/01 20:43:18 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2001/06/01 20:43:18 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RadioTag.java,v 1.5 2001/06/10 03:53:31 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/06/10 03:53:31 $ * * ==================================================================== * @@ -77,7 +77,7 @@ * Tag for input fields of type "radio". * * @author Craig R. McClanahan - * @version $Revision: 1.4 $ $Date: 2001/06/01 20:43:18 $ + * @version $Revision: 1.5 $ $Date: 2001/06/10 03:53:31 $ */ public class RadioTag extends BaseHandlerTag { @@ -224,7 +224,7 @@ results.append(this.value); results.append("\""); if (value.equals(current)) - results.append(" checked=\"true\""); + results.append(" checked=\"checked\""); results.append(prepareEventHandlers()); results.append(prepareStyles()); results.append(">"); 1.5 +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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SelectTag.java 2001/06/01 20:43:18 1.4 +++ SelectTag.java 2001/06/10 03:53:31 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.4 2001/06/01 20:43:18 craigmcc Exp $ - * $Revision: 1.4 $ - * $Date: 2001/06/01 20:43:18 $ + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.5 2001/06/10 03:53:31 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/06/10 03:53:31 $ * * ==================================================================== * @@ -81,7 +81,7 @@ * inside a form tag. * * @author Craig R. McClanahan - * @version $Revision: 1.4 $ $Date: 2001/06/01 20:43:18 $ + * @version $Revision: 1.5 $ $Date: 2001/06/10 03:53:31 $ */ public class SelectTag extends BaseHandlerTag { @@ -251,7 +251,7 @@ results.append("\""); } if (multiple != null) { - results.append(" multiple=\"true\""); + results.append(" multiple=\"multiple\""); } if (size != null) { results.append(" size=\"");