You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2005/09/27 12:09:50 UTC
svn commit: r291887 - in /myfaces: api/trunk/src/java/javax/faces/component/
share/trunk/src/java/org/apache/myfaces/renderkit/
share/trunk/src/java/org/apache/myfaces/renderkit/html/
Author: baranda
Date: Tue Sep 27 03:09:38 2005
New Revision: 291887
URL: http://svn.apache.org/viewcvs?rev=291887&view=rev
Log:
Fixed MYFACES-583. Thanks to Peter Mahoney
Modified:
myfaces/api/trunk/src/java/javax/faces/component/_SharedRendererUtils.java
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/_SharedRendererUtils.java
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java
Modified: myfaces/api/trunk/src/java/javax/faces/component/_SharedRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/_SharedRendererUtils.java?rev=291887&r1=291886&r2=291887&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/_SharedRendererUtils.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/_SharedRendererUtils.java Tue Sep 27 03:09:38 2005
@@ -180,13 +180,12 @@
{
//Object array
int len = submittedValue.length;
- Object[] convertedValues = new Object[len];
+ ArrayList convertedValues = new ArrayList(len);
for (int i = 0; i < len; i++)
{
- convertedValues[i]
- = converter.getAsObject(facesContext, component, submittedValue[i]);
+ convertedValues.add(i, converter.getAsObject(facesContext, component, submittedValue[i]));
}
- return convertedValues;
+ return convertedValues.toArray((Object[]) Array.newInstance(arrayComponentType, len));
}
}
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/_SharedRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/_SharedRendererUtils.java?rev=291887&r1=291886&r2=291887&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/_SharedRendererUtils.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/_SharedRendererUtils.java Tue Sep 27 03:09:38 2005
@@ -186,13 +186,12 @@
{
//Object array
int len = submittedValue.length;
- Object[] convertedValues = new Object[len];
+ ArrayList convertedValues = new ArrayList(len);
for (int i = 0; i < len; i++)
{
- convertedValues[i]
- = converter.getAsObject(facesContext, component, submittedValue[i]);
+ convertedValues.add(i, converter.getAsObject(facesContext, component, submittedValue[i]));
}
- return convertedValues;
+ return convertedValues.toArray((Object[]) Array.newInstance(arrayComponentType, len));
}
}
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java?rev=291887&r1=291886&r2=291887&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java Tue Sep 27 03:09:38 2005
@@ -195,9 +195,7 @@
writer.startElement(HTML.TD_ELEM, selectMany);
writer.startElement(HTML.LABEL_ELEM, selectMany);
- boolean checked = (useSubmittedValues && lookupSet
- .contains(itemStrValue))
- || (!useSubmittedValues && lookupSet.contains(itemValue));
+ boolean checked = lookupSet.contains(itemStrValue);
boolean disabled = selectItem.isDisabled();