Fixes for issue 306 and CR 6410301
SECTION: Modified Files
----------------------------
M src/com/sun/faces/renderkit/RenderKitUtils.java
- add rows to pass through attributes
M src/com/sun/faces/renderkit/html_basic/MenuRenderer.java
- exclude size from consideration when rendering
passthrough attributes
M src/com/sun/faces/renderkit/html_basic/TableRenderer.java
- exclude rows when rendering datatable
M systest/build-tests.xml
A systest/web/golden/regression/AreaTextRowsAttrTest.txt
A systest/web/golden/regression/SelectOneManySizeAttrTest.txt
A systest/web/regression/AreaTextRowsAttrTest.jsp
A systest/web/regression/SelectOneManySizeAttrTest.jsp
- added regression tests
SECTION: Diffs
----------------------------
Index: src/com/sun/faces/renderkit/RenderKitUtils.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/RenderKitUtils.java,v
retrieving revision 1.8
diff -u -r1.8 RenderKitUtils.java
--- src/com/sun/faces/renderkit/RenderKitUtils.java 29 Mar 2006
23:03:47 -0000 1.8
+++ src/com/sun/faces/renderkit/RenderKitUtils.java 27 Apr 2006
16:23:08 -0000
@@ -134,7 +134,8 @@
"onsubmit",
"onunload",
"rel",
- "rev",
+ "rows",
+ "rev",
"rules",
"shape",
"size",
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.72
diff -u -r1.72 MenuRenderer.java
--- src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 29 Mar
2006 23:03:48 -0000 1.72
+++ src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 27 Apr
2006 16:23:08 -0000
@@ -492,7 +492,8 @@
RenderKitUtils.renderPassThruAttributes(context,
writer,
- component);
+ component,
+ new String[]
{"size"});
RenderKitUtils.renderXHTMLStyleBooleanAttributes(writer,
component);
// Now, render the "options" portion...
Index: src/com/sun/faces/renderkit/html_basic/TableRenderer.java
===================================================================
RCS file:
/cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/TableRenderer.java,v
retrieving revision 1.33
diff -u -r1.33 TableRenderer.java
--- src/com/sun/faces/renderkit/html_basic/TableRenderer.java 29 Mar
2006 23:03:49 -0000 1.33
+++ src/com/sun/faces/renderkit/html_basic/TableRenderer.java 27 Apr
2006 16:23:08 -0000
@@ -89,8 +89,10 @@
if (styleClass != null) {
writer.writeAttribute("class", styleClass, "styleClass");
}
- RenderKitUtils.renderPassThruAttributes(context, writer, component
- );
+ RenderKitUtils.renderPassThruAttributes(context,
+ writer,
+ component,
+ new String[] {"rows"});
writer.writeText("\n", null);
UIComponent caption = getFacet(data, "caption");
Index: systest/build-tests.xml
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/systest/build-tests.xml,v
retrieving revision 1.111
diff -u -r1.111 build-tests.xml
--- systest/build-tests.xml 29 Mar 2006 23:03:54 -0000 1.111
+++ systest/build-tests.xml 27 Apr 2006 16:23:08 -0000
@@ -147,7 +147,8 @@
test.jsp,
test.path,
test.valueBindingGet,
- test.misc
+ test.misc,
+ test.regressions
"/>
<target name="test.init">
@@ -922,6 +923,15 @@
golden="${golden.path}/include-import-interweaving.txt"
recordGolden="${local.golden.path}/include-import-interweaving.txt"/>
+ </target>
+
+ <target name="test.regressions">
+ <jsf.tester
+
request="${context.path}/faces/regression/AreaTextRowsAttrTest.jsp"
+ golden="${golden.path}/regression/AreaTextRowsAttrTest.txt"/>
+ <jsf.tester
+
request="${context.path}/faces/regression/SelectOneManySizeAttrTest.jsp"
+
golden="${golden.path}/regression/SelectOneManySizeAttrTest.txt"/>
</target>
</project>
SECTION: New Files
----------------------------
SEE ATTACHMENTS