Change bundle attached...
Code changes to support issue 182.
SECTION: Modified Files
----------------------------
M src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java
M src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java
M src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java
M src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
- Reflect method rename
componentIsDisabledOnReadonly->componentIsDisabledOrReadonly
M src/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java
- add logic to handle writing boolean attributes
using HTML attribute minimization or xhtml-style depending
on content-type
M src/com/sun/faces/renderkit/html_basic/MenuRenderer.java
- Reflect method rename
componentIsDisabledOnReadonly->componentIsDisabledOrReadonly
- pass true to invoke HtmlResponseWriter logic above
M src/com/sun/faces/renderkit/html_basic/RadioRenderer.java
M src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java
- leverage Util.componentIsDisabled()
- If the 'parent' component is disabled, do not render disabled
twice
M src/com/sun/faces/util/Util.java
- Updated renderBooleanPassthruAttributes to pass the value
instead of the attribute name.
- Corrected typo componentIsDisabledOnReadonly->componentIsDisabledOrReadonly
- Added method componentIsDisabled
M systest/src/com/sun/faces/systest/render/ButtonRenderer.java
M systest-per-webapp/build-tests.xml
M test/com/sun/faces/util/TestUtil.java
M test-sqe/src/com/sun/faces/systest/render/ButtonRenderer.java
M web/test/CorrectRenderersResponse
M web/test/CorrectRenderersResponse_2
M web/test/CorrectRenderersResponse_3
M web/test/RenderResponse_correct
- test updates to validate the RI changes
SECTION: Diffs
----------------------------
Index: src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java,v
retrieving revision 1.90
diff -u -r1.90 ButtonRenderer.java
--- src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java 26 Aug 2005 15:27:12 -0000 1.90
+++ src/com/sun/faces/renderkit/html_basic/ButtonRenderer.java 17 Oct 2005 23:35:30 -0000
@@ -103,7 +103,7 @@
// If the component is disabled, do not change the value of the
// component, since its state cannot be changed.
- if (Util.componentIsDisabledOnReadonly(component)) {
+ if (Util.componentIsDisabledOrReadonly(component)) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("No decoding necessary since the component " +
component.getId() + " is disabled");
Index: src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java,v
retrieving revision 1.75
diff -u -r1.75 CheckboxRenderer.java
--- src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java 26 Aug 2005 15:27:13 -0000 1.75
+++ src/com/sun/faces/renderkit/html_basic/CheckboxRenderer.java 17 Oct 2005 23:35:30 -0000
@@ -104,7 +104,7 @@
// request even if the checkbox is checked. So do not change the
// value of the checkbox, if it is disabled since its state
// cannot be changed.
- if (Util.componentIsDisabledOnReadonly(component)) {
+ if (Util.componentIsDisabledOrReadonly(component)) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("No decoding necessary since the component " +
component.getId() + " is disabled");
Index: src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java,v
retrieving revision 1.39
diff -u -r1.39 CommandLinkRenderer.java
--- src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java 14 Oct 2005 20:33:32 -0000 1.39
+++ src/com/sun/faces/renderkit/html_basic/CommandLinkRenderer.java 17 Oct 2005 23:35:30 -0000
@@ -107,7 +107,7 @@
// If the component is disabled, do not change the value of the
// component, since its state cannot be changed.
- if (Util.componentIsDisabledOnReadonly(component)) {
+ if (Util.componentIsDisabledOrReadonly(component)) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("No decoding necessary since the component " +
component.getId() + " is disabled");
Index: src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java,v
retrieving revision 1.100
diff -u -r1.100 HtmlBasicRenderer.java
--- src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java 14 Sep 2005 21:27:18 -0000 1.100
+++ src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java 17 Oct 2005 23:35:30 -0000
@@ -145,7 +145,7 @@
// If the component is disabled, do not change the value of the
// component, since its state cannot be changed.
- if (Util.componentIsDisabledOnReadonly(component)) {
+ if (Util.componentIsDisabledOrReadonly(component)) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("No decoding necessary since the component " +
component.getId() + " is disabled");
Index: src/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java,v
retrieving revision 1.19
diff -u -r1.19 HtmlResponseWriter.java
--- src/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java 22 Aug 2005 22:10:19 -0000 1.19
+++ src/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java 17 Oct 2005 23:35:30 -0000
@@ -48,6 +48,9 @@
*/
public class HtmlResponseWriter extends ResponseWriter {
+ // XHTML content type that will be passed from RenderKitImpl
+ private static String XHTML_CONTENT_TYPE = "application/xhtml+xml";
+
// Content Type for this Writer.
//
private String contentType = "text/html";
@@ -69,6 +72,9 @@
// inside of <script> and <style> elements).
//
private boolean dontEscape;
+
+ // Flag controlling the rendering of element attributes
+ private boolean usingXhtmlStyle;
// Internal buffer used when outputting properly escaped information
// using HtmlUtils class.
@@ -84,7 +90,7 @@
* @param writer the <code>ResponseWriter</code>
* @param contentType the content type.
* @param encoding the character encoding.
- * @throws if the encoding is not recognized.
+ * @throws FacesException the encoding is not recognized.
*/
public HtmlResponseWriter(Writer writer, String contentType, String encoding)
throws FacesException {
@@ -276,15 +282,19 @@
// Output Boolean values specially
if (valueClass == Boolean.class) {
if (Boolean.TRUE.equals(value)) {
- //PENDING (horwat) using String as a result of
- //Tomcat char writer ArrayIndexOutOfBoundsException (3584)
- writer.write(" ");
- writer.write(name);
- } else {
- // Don't write anything for "false" booleans
+ if (!usingXhtmlStyle) {
+ writer.write(' ');
+ writer.write(name);
+ } else {
+ writer.write(' ');
+ writer.write(name);
+ writer.write("=\"");
+ writer.write(name);
+ writer.write('"');
+ }
}
} else {
- writer.write(" ");
+ writer.write(' ');
writer.write(name);
writer.write("=\"");
@@ -292,7 +302,7 @@
HtmlUtils.writeAttribute(writer, buffer, value.toString());
//PENDING (horwat) using String as a result of Tomcat char
// writer ArrayIndexOutOfBoundsException (3584)
- writer.write("\"");
+ writer.write('"');
}
}
Index: src/com/sun/faces/renderkit/html_basic/MenuRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/MenuRenderer.java,v
retrieving revision 1.62
diff -u -r1.62 MenuRenderer.java
--- src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 26 Sep 2005 14:11:46 -0000 1.62
+++ src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 17 Oct 2005 23:35:30 -0000
@@ -114,7 +114,7 @@
// If the component is disabled, do not change the value of the
// component, since its state cannot be changed.
- if (Util.componentIsDisabledOnReadonly(component)) {
+ if (Util.componentIsDisabledOrReadonly(component)) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("No decoding necessary since the component " +
component.getId() + " is disabled");
@@ -599,7 +599,7 @@
// if the component is disabled, "disabled" attribute would be rendered
// on "select" tag, so don't render "disabled" on every option.
if ((!componentDisabled) && curItem.isDisabled()) {
- writer.writeAttribute("disabled", "disabled", "disabled");
+ writer.writeAttribute("disabled", true, "disabled");
}
if (componentDisabled || curItem.isDisabled()) {
Index: src/com/sun/faces/renderkit/html_basic/RadioRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/RadioRenderer.java,v
retrieving revision 1.73
diff -u -r1.73 RadioRenderer.java
--- src/com/sun/faces/renderkit/html_basic/RadioRenderer.java 26 Sep 2005 14:11:47 -0000 1.73
+++ src/com/sun/faces/renderkit/html_basic/RadioRenderer.java 17 Oct 2005 23:35:30 -0000
@@ -115,12 +115,8 @@
// disable the radio button if the attribute is set.
String labelClass = null;
- boolean componentDisabled = false;
- if (component.getAttributes().get("disabled") != null) {
- if ((component.getAttributes().get("disabled")).equals(Boolean.TRUE)) {
- componentDisabled = true;
- }
- }
+ boolean componentDisabled = Util.componentIsDisabled(component);
+
if (componentDisabled || curItem.isDisabled()) {
labelClass = (String) component.
getAttributes().get("disabledClass");
@@ -145,9 +141,13 @@
writer.writeAttribute("value", (getFormattedValue(context, component,
curItem.getValue())), "value");
-
- if (curItem.isDisabled()) {
- writer.writeAttribute("disabled", "disabled", "disabled");
+
+ // Don't render the disabled attribute twice if the 'parent'
+ // component is already marked disabled.
+ if (!Util.componentIsDisabled(component)) {
+ if (curItem.isDisabled()) {
+ writer.writeAttribute("disabled", true, "disabled");
+ }
}
// Apply HTML 4.x attributes specified on UISelectMany component to all
// items in the list except styleClass and style which are rendered as
Index: src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java,v
retrieving revision 1.42
diff -u -r1.42 SelectManyCheckboxListRenderer.java
--- src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java 22 Aug 2005 22:10:21 -0000 1.42
+++ src/com/sun/faces/renderkit/html_basic/SelectManyCheckboxListRenderer.java 17 Oct 2005 23:35:31 -0000
@@ -193,12 +193,8 @@
// disable the check box if the attribute is set.
String labelClass = null;
- boolean componentDisabled = false;
- if (component.getAttributes().get("disabled") != null) {
- if ((component.getAttributes().get("disabled")).equals(Boolean.TRUE)) {
- componentDisabled = true;
- }
- }
+ boolean componentDisabled = Util.componentIsDisabled(component);
+
if (componentDisabled || curItem.isDisabled()) {
labelClass = (String) component.
getAttributes().get("disabledClass");
@@ -251,8 +247,13 @@
if (isSelected) {
writer.writeAttribute(getSelectedTextString(), Boolean.TRUE, null);
}
- if (curItem.isDisabled()) {
- writer.writeAttribute("disabled", "disabled", "disabled");
+
+ // Don't render the disabled attribute twice if the 'parent'
+ // component is already marked disabled.
+ if (!Util.componentIsDisabled(component)) {
+ if (curItem.isDisabled()) {
+ writer.writeAttribute("disabled", true, "disabled");
+ }
}
// Apply HTML 4.x attributes specified on UISelectMany component to all
Index: src/com/sun/faces/util/Util.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/util/Util.java,v
retrieving revision 1.174
diff -u -r1.174 Util.java
--- src/com/sun/faces/util/Util.java 30 Sep 2005 03:57:21 -0000 1.174
+++ src/com/sun/faces/util/Util.java 17 Oct 2005 23:35:31 -0000
@@ -64,7 +64,6 @@
import javax.servlet.jsp.jstl.fmt.LocalizationContext;
import java.io.IOException;
-import java.io.Serializable;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
@@ -940,7 +939,7 @@
if (result) {
// NOTE: render things like readonly="readonly" here
writer.writeAttribute(booleanPassthruAttributes[i],
- booleanPassthruAttributes[i],
+ result,
booleanPassthruAttributes[i]);
// NOTE: otherwise render nothing
}
@@ -1282,9 +1281,24 @@
context.getViewRoot().getRenderKitId());
return renderKit;
}
+
+ public static boolean componentIsDisabled(UIComponent component) {
+ Object disabled = null;
+ boolean result = false;
+ if (null !=
+ (disabled = component.getAttributes().get("disabled"))) {
+ if (disabled instanceof String) {
+ result = ((String) disabled).equalsIgnoreCase("true");
+ } else {
+ result = disabled.equals(Boolean.TRUE);
+ }
+ }
+
+ return result;
+ }
- public static boolean componentIsDisabledOnReadonly(UIComponent component) {
+ public static boolean componentIsDisabledOrReadonly(UIComponent component) {
Object disabledOrReadonly = null;
boolean result = false;
if (null !=
Index: systest/build-tests.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/build-tests.xml,v
retrieving revision 1.93
diff -u -r1.93 build-tests.xml
--- systest/build-tests.xml 15 Oct 2005 01:32:09 -0000 1.93
+++ systest/build-tests.xml 17 Oct 2005 23:35:31 -0000
@@ -47,7 +47,7 @@
<!-- SystestClient connection properties -->
<property name="context.path" value="/jsf-systest"/>
<property name="host" value="localhost"/>
- <property name="port" value="8080"/>
+ <property name="port" value="8001"/>
<!-- SystestClient failure handling properties -->
<property name="failonerror" value="true"/>
<!-- Set 'protocol' to a zero length string to use HttpURLConnection -->
Index: systest/src/com/sun/faces/systest/render/ButtonRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/src/com/sun/faces/systest/render/ButtonRenderer.java,v
retrieving revision 1.2
diff -u -r1.2 ButtonRenderer.java
--- systest/src/com/sun/faces/systest/render/ButtonRenderer.java 22 Aug 2005 22:10:43 -0000 1.2
+++ systest/src/com/sun/faces/systest/render/ButtonRenderer.java 17 Oct 2005 23:35:31 -0000
@@ -105,7 +105,7 @@
// If the component is disabled, do not change the value of the
// component, since its state cannot be changed.
- if (Util.componentIsDisabledOnReadonly(component)) {
+ if (Util.componentIsDisabledOrReadonly(component)) {
if (log.isTraceEnabled()) {
log.trace("No decoding necessary since the component " +
component.getId() + " is disabled");
Index: systest-per-webapp/build-tests.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest-per-webapp/build-tests.xml,v
retrieving revision 1.17
diff -u -r1.17 build-tests.xml
--- systest-per-webapp/build-tests.xml 22 Aug 2005 22:10:46 -0000 1.17
+++ systest-per-webapp/build-tests.xml 17 Oct 2005 23:35:31 -0000
@@ -46,7 +46,7 @@
<!-- SystestClient connection properties -->
<property name="host" value="localhost"/>
- <property name="port" value="8080"/>
+ <property name="port" value="8001"/>
<!-- SystestClient failure handling properties -->
<property name="failonerror" value="true"/>
<!-- Set 'protocol' to a zero length string to use HttpURLConnection -->
Index: test/com/sun/faces/util/TestUtil.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test/com/sun/faces/util/TestUtil.java,v
retrieving revision 1.24
diff -u -r1.24 TestUtil.java
--- test/com/sun/faces/util/TestUtil.java 22 Aug 2005 22:11:27 -0000 1.24
+++ test/com/sun/faces/util/TestUtil.java 17 Oct 2005 23:35:31 -0000
@@ -155,7 +155,7 @@
"ISO-8859-1");
input.setReadonly(true);
Util.renderBooleanPassThruAttributes(writer, input);
- expectedResult = " readonly=\"readonly\"";
+ expectedResult = " readonly";
assertEquals(expectedResult, sw.toString());
@@ -202,7 +202,7 @@
input.getAttributes().put("disabled", "true");
input.getAttributes().put("readonly", "false");
Util.renderBooleanPassThruAttributes(writer, input);
- String expectedResult = " disabled=\"disabled\"";
+ String expectedResult = " disabled";
assertEquals(expectedResult, sw.toString());
// verify no passthru attributes returns empty string
Index: test-sqe/src/com/sun/faces/systest/render/ButtonRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/test-sqe/src/com/sun/faces/systest/render/ButtonRenderer.java,v
retrieving revision 1.2
diff -u -r1.2 ButtonRenderer.java
--- test-sqe/src/com/sun/faces/systest/render/ButtonRenderer.java 22 Aug 2005 22:11:40 -0000 1.2
+++ test-sqe/src/com/sun/faces/systest/render/ButtonRenderer.java 17 Oct 2005 23:35:31 -0000
@@ -105,7 +105,7 @@
// If the component is disabled, do not change the value of the
// component, since its state cannot be changed.
- if (Util.componentIsDisabledOnReadonly(component)) {
+ if (Util.componentIsDisabledOrReadonly(component)) {
if (log.isTraceEnabled()) {
log.trace("No decoding necessary since the component " +
component.getId() + " is disabled");
Index: web/test/CorrectRenderersResponse
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/CorrectRenderersResponse,v
retrieving revision 1.38
diff -u -r1.38 CorrectRenderersResponse
--- web/test/CorrectRenderersResponse 14 Sep 2005 21:27:19 -0000 1.38
+++ web/test/CorrectRenderersResponse 17 Oct 2005 23:35:31 -0000
@@ -7,7 +7,7 @@
<table border="0" id="radioRenderer" class="styleClass">
<tr>
<td>
-<input type="radio" name="radioRenderer" id="radioRenderer:0" value="One" disabled="disabled" tabindex="5" title="title" /><label for="radioRenderer:0" class="disabledClass"> One</label></td>
+<input type="radio" name="radioRenderer" id="radioRenderer:0" value="One" disabled tabindex="5" title="title" /><label for="radioRenderer:0" class="disabledClass"> One</label></td>
<td>
<input type="radio" checked name="radioRenderer" id="radioRenderer:1" value="Two" tabindex="5" title="title" /><label for="radioRenderer:1" class="enabledClass"> Two</label></td>
<td>
Index: web/test/CorrectRenderersResponse_2
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/CorrectRenderersResponse_2,v
retrieving revision 1.37
diff -u -r1.37 CorrectRenderersResponse_2
--- web/test/CorrectRenderersResponse_2 1 Sep 2004 21:15:20 -0000 1.37
+++ web/test/CorrectRenderersResponse_2 17 Oct 2005 23:35:31 -0000
@@ -8,4 +8,4 @@
</select>
<input id="mySecret" type="password" name="mySecret" value="" />
<input id="myInputText" type="text" name="myInputText" value="text" /><span id="myOutputText"></span><textarea id="myTextarea" name="myTextarea" class="bar" style="foo">TextareaRenderer</textarea>
-<img id="myGraphicImage" src="/test/nonModelReferenceImage.gif;jsessionid=059BAE8BD400E6DD20A675D2ACEF8C75" usemap="usemap" ismap="ismap" /><img src="/test/foo/modelReferenceImage.gif;jsessionid=059BAE8BD400E6DD20A675D2ACEF8C75" usemap="usemap" ismap="ismap" /><span id="myOutputMessage">My name is Bobby Orr</span>
\ No newline at end of file
+<img id="myGraphicImage" src="/test/nonModelReferenceImage.gif;jsessionid=059BAE8BD400E6DD20A675D2ACEF8C75" usemap="usemap" ismap /><img src="/test/foo/modelReferenceImage.gif;jsessionid=059BAE8BD400E6DD20A675D2ACEF8C75" usemap="usemap" ismap /><span id="myOutputMessage">My name is Bobby Orr</span>
Index: web/test/CorrectRenderersResponse_3
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/CorrectRenderersResponse_3,v
retrieving revision 1.29
diff -u -r1.29 CorrectRenderersResponse_3
--- web/test/CorrectRenderersResponse_3 2 Aug 2005 20:24:55 -0000 1.29
+++ web/test/CorrectRenderersResponse_3 17 Oct 2005 23:35:31 -0000
@@ -11,7 +11,7 @@
<table border="0" id="myCheckboxlist" class="styleClass">
<tr>
<td>
-<input name="myCheckboxlist" id="myCheckboxlist:0" value="Red" type="checkbox" disabled="disabled" tabindex="5" title="title" /><label for="myCheckboxlist:0" class="disabledClass"> Red</label></td>
+<input name="myCheckboxlist" id="myCheckboxlist:0" value="Red" type="checkbox" disabled tabindex="5" title="title" /><label for="myCheckboxlist:0" class="disabledClass"> Red</label></td>
<td>
<input name="myCheckboxlist" id="myCheckboxlist:1" value="Blue" type="checkbox" checked tabindex="5" title="title" /><label for="myCheckboxlist:1" class="enabledClass"> Blue</label></td>
<td>group</td><td>
@@ -29,4 +29,4 @@
<option value="Green">Green</option>
<option value="Yellow">Yellow</option>
</select>
-<input id="myInputDateHidden" type="hidden" name="myInputDateHidden" value="Jan 12, 1952" /><input id="myNumberHidden" type="hidden" name="myNumberHidden" value="47%" />
\ No newline at end of file
+<input id="myInputDateHidden" type="hidden" name="myInputDateHidden" value="Jan 12, 1952" /><input id="myNumberHidden" type="hidden" name="myNumberHidden" value="47%" />
Index: web/test/RenderResponse_correct
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/web/test/RenderResponse_correct,v
retrieving revision 1.133
diff -u -r1.133 RenderResponse_correct
--- web/test/RenderResponse_correct 28 Sep 2005 01:26:17 -0000 1.133
+++ web/test/RenderResponse_correct 17 Oct 2005 23:35:31 -0000
@@ -27,7 +27,7 @@
</tr>
<tr>
<td><input id="basicForm:username1" type="text" name="basicForm:username1" value="JavaServerFaces" class="inputClass" /></td>
-<td><input id="basicForm:username2" type="text" name="basicForm:username2" value="JavaServerFaces" class="inputClass" disabled="disabled" /></td>
+<td><input id="basicForm:username2" type="text" name="basicForm:username2" value="JavaServerFaces" class="inputClass" disabled /></td>
</tr>
<tr>
<td><span id="basicForm:text2" class="outputClass">Password:</span></td>
@@ -47,7 +47,7 @@
<TD>
- <input id="basicForm:pushButton" type="image" src="duke.gif;jsessionid=99ec0282023f3f31a393ffff9aa4" name="basicForm:pushButton" onclick="clearFormHiddenParams_basicForm(this.form.id);" style="someStyle" disabled="disabled" />
+ <input id="basicForm:pushButton" type="image" src="duke.gif;jsessionid=99ec0282023f3f31a393ffff9aa4" name="basicForm:pushButton" onclick="clearFormHiddenParams_basicForm(this.form.id);" style="someStyle" disabled />
</TD>
</TR>
@@ -107,7 +107,7 @@
</TD>
<TD>
- <img id="basicForm:graphicImage" src="/test/duke.gif;jsessionid=99ec0282023f3f31a393ffff9aa4" style="someStyle" usemap="#map1" ismap="ismap" />
+ <img id="basicForm:graphicImage" src="/test/duke.gif;jsessionid=99ec0282023f3f31a393ffff9aa4" style="someStyle" usemap="#map1" ismap />
</TD>
</TR>
@@ -155,7 +155,7 @@
</TD>
<TD>
- <img id="basicForm:output_graphicImage" src="/test/duke.gif;jsessionid=99ec0282023f3f31a393ffff9aa4" usemap="#map1" ismap="ismap" />
+ <img id="basicForm:output_graphicImage" src="/test/duke.gif;jsessionid=99ec0282023f3f31a393ffff9aa4" usemap="#map1" ismap />
</TD>
</TR>
@@ -266,7 +266,7 @@
<TD>
- <select name="basicForm:_id_id299" class="selectoneClass" size="10" style="someStyle" tabindex="20" title="Select Quantity"> <option value="0" disabled="disabled" class="dclass">0</option>
+ <select name="basicForm:_id_id299" class="selectoneClass" size="10" style="someStyle" tabindex="20" title="Select Quantity"> <option value="0" disabled class="dclass">0</option>
<option value="1" class="eclass">1</option>
<option value="2" class="eclass">2</option>
<option value="3" class="eclass">3</option>
@@ -309,11 +309,11 @@
<table id="basicForm:shipType" class="someStyleClass" style="someStyle">
<tr>
<td>
-<input type="radio" name="basicForm:shipType" id="basicForm:shipType:0" value="nextDay" disabled="disabled" accesskey="A" tabindex="3" disabled="disabled" /><label for="basicForm:shipType:0" class="disabledClass"> Next Day</label></td>
+<input type="radio" name="basicForm:shipType" id="basicForm:shipType:0" value="nextDay" accesskey="A" tabindex="3" disabled /><label for="basicForm:shipType:0" class="disabledClass"> Next Day</label></td>
<td>
-<input type="radio" name="basicForm:shipType" id="basicForm:shipType:1" value="nextWeek" accesskey="A" tabindex="3" disabled="disabled" /><label for="basicForm:shipType:1" class="disabledClass"> Next Week</label></td>
+<input type="radio" name="basicForm:shipType" id="basicForm:shipType:1" value="nextWeek" accesskey="A" tabindex="3" disabled /><label for="basicForm:shipType:1" class="disabledClass"> Next Week</label></td>
<td>
-<input type="radio" name="basicForm:shipType" id="basicForm:shipType:2" value="nextMonth" accesskey="A" tabindex="3" disabled="disabled" /><label for="basicForm:shipType:2" class="disabledClass"> Next Month</label></td>
+<input type="radio" name="basicForm:shipType" id="basicForm:shipType:2" value="nextMonth" accesskey="A" tabindex="3" disabled /><label for="basicForm:shipType:2" class="disabledClass"> Next Month</label></td>
</tr>
</table>
@@ -327,15 +327,15 @@
<table border="1" id="basicForm:verticalRadio">
<tr>
<td>
-<input type="radio" name="basicForm:verticalRadio" id="basicForm:verticalRadio:0" value="nextDay" disabled="disabled" disabled="disabled" /><label for="basicForm:verticalRadio:0"> Next Day</label></td>
+<input type="radio" name="basicForm:verticalRadio" id="basicForm:verticalRadio:0" value="nextDay" disabled /><label for="basicForm:verticalRadio:0"> Next Day</label></td>
</tr>
<tr>
<td>
-<input type="radio" name="basicForm:verticalRadio" id="basicForm:verticalRadio:1" value="nextWeek" disabled="disabled" /><label for="basicForm:verticalRadio:1"> Next Week</label></td>
+<input type="radio" name="basicForm:verticalRadio" id="basicForm:verticalRadio:1" value="nextWeek" disabled /><label for="basicForm:verticalRadio:1"> Next Week</label></td>
</tr>
<tr>
<td>
-<input type="radio" name="basicForm:verticalRadio" id="basicForm:verticalRadio:2" value="nextMonth" disabled="disabled" /><label for="basicForm:verticalRadio:2"> Next Month</label></td>
+<input type="radio" name="basicForm:verticalRadio" id="basicForm:verticalRadio:2" value="nextMonth" disabled /><label for="basicForm:verticalRadio:2"> Next Month</label></td>
</tr>
</table>
@@ -371,7 +371,7 @@
<TD>Disabled Date:
</TD>
- <TD><input id="basicForm:date2" type="text" name="basicForm:date2" value="July 11, 1996" accesskey="D" maxlength="20" size="3" tabindex="1" readonly="readonly" />
+ <TD><input id="basicForm:date2" type="text" name="basicForm:date2" value="July 11, 1996" accesskey="D" maxlength="20" size="3" tabindex="1" readonly />
</TD>
</TR>
@@ -445,7 +445,7 @@
<td>
- <input id="basicForm:inputDate1" type="text" name="basicForm:inputDate1" value="Jan 12, 1952" accesskey="D" alt="input_date medium readonly" maxlength="20" size="10" title="input_date medium readonly" readonly="readonly" />
+ <input id="basicForm:inputDate1" type="text" name="basicForm:inputDate1" value="Jan 12, 1952" accesskey="D" alt="input_date medium readonly" maxlength="20" size="10" title="input_date medium readonly" readonly />
</td>
@@ -489,7 +489,7 @@
<option value="1" class="eclass">one</option>
<option value="2" class="eclass">two</option>
<option value="3" class="eclass">three</option>
- <option value="4" disabled="disabled" class="dclass">four</option>
+ <option value="4" disabled class="dclass">four</option>
<option value="5" class="eclass">five</option>
<option value="6" class="eclass">six</option>
<option value="7" class="eclass">seven</option>
@@ -519,7 +519,7 @@
<table border="1" id="basicForm:ManyApples3" class="styleClass" style="someStyle">
<tr>
<td>
-<input name="basicForm:ManyApples3" id="basicForm:ManyApples3:0" value="0" type="checkbox" disabled="disabled" accesskey="A" tabindex="3" /><label for="basicForm:ManyApples3:0" class="disabledClass"> zero</label></td>
+<input name="basicForm:ManyApples3" id="basicForm:ManyApples3:0" value="0" type="checkbox" disabled accesskey="A" tabindex="3" /><label for="basicForm:ManyApples3:0" class="disabledClass"> zero</label></td>
<td>
<input name="basicForm:ManyApples3" id="basicForm:ManyApples3:1" value="1" type="checkbox" accesskey="A" tabindex="3" /><label for="basicForm:ManyApples3:1" class="enabledClass"> one</label></td>
<td>
@@ -546,11 +546,11 @@
<TD><table id="basicForm:checklistmodel">
<tr>
<td>
-<input name="basicForm:checklistmodel" id="basicForm:checklistmodel:0" value="1" type="checkbox" disabled="disabled" /><label for="basicForm:checklistmodel:0" class="disabedClass"> one</label></td>
+<input name="basicForm:checklistmodel" id="basicForm:checklistmodel:0" value="1" type="checkbox" disabled /><label for="basicForm:checklistmodel:0" class="disabedClass"> one</label></td>
<td>
-<input name="basicForm:checklistmodel" id="basicForm:checklistmodel:1" value="2" type="checkbox" disabled="disabled" /><label for="basicForm:checklistmodel:1" class="disabedClass"> two</label></td>
+<input name="basicForm:checklistmodel" id="basicForm:checklistmodel:1" value="2" type="checkbox" disabled /><label for="basicForm:checklistmodel:1" class="disabedClass"> two</label></td>
<td>
-<input name="basicForm:checklistmodel" id="basicForm:checklistmodel:2" value="3" type="checkbox" disabled="disabled" /><label for="basicForm:checklistmodel:2" class="disabedClass"> three</label></td>
+<input name="basicForm:checklistmodel" id="basicForm:checklistmodel:2" value="3" type="checkbox" disabled /><label for="basicForm:checklistmodel:2" class="disabedClass"> three</label></td>
</tr>
</table></TD>
</tr>