dev@javaserverfaces.java.net

[REVIEW] Fix for CR 6391901

From: Ryan Lubke <Ryan.Lubke_at_Sun.COM>
Date: Wed, 01 Mar 2006 11:13:28 -0500

See attached.



Ensure the size attribute is rendered if specified.


SECTION: Modified Files
----------------------------
M src/com/sun/faces/renderkit/html_basic/MenuRenderer.java


SECTION: Diffs
----------------------------
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.67
diff -u -r1.67 MenuRenderer.java
--- src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 2 Feb 2006 16:53:20 -0000 1.67
+++ src/com/sun/faces/renderkit/html_basic/MenuRenderer.java 28 Feb 2006 19:02:50 -0000
@@ -484,12 +484,11 @@
              logger.fine("Rendering " + itemCount + " options");
         }
         // If "size" is *not* set explicitly, we have to default it correctly
- Object size = component.getAttributes().get("size");
- if ((null == size) ||
- ((size instanceof Integer) &&
- ((Integer) size).intValue() == Integer.MIN_VALUE)) {
- writeDefaultSize(writer, itemCount);
+ Integer size = (Integer) component.getAttributes().get("size");
+ if (null == size || size == Integer.MIN_VALUE) {
+ size = itemCount;
         }
+ writeDefaultSize(writer, size);
 
         RenderKitUtils.renderPassThruAttributes(context,
                                                 writer,