You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/02/25 13:07:29 UTC
svn commit: r380924 -
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java
Author: weber
Date: Sat Feb 25 04:07:24 2006
New Revision: 380924
URL: http://svn.apache.org/viewcvs?rev=380924&view=rev
Log:
TOMAHAWK-152, changing t:radio to do the same as as t:selectOneRadio does, when check the selected item
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java?rev=380924&r1=380923&r2=380924&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java Sat Feb 25 04:07:24 2006
@@ -118,17 +118,15 @@
}
Object currentValue = RendererUtils.getObjectValue(uiSelectOne);
+ currentValue
+ = RendererUtils.getConvertedStringValue(facesContext, uiSelectOne,
+ converter, currentValue);
SelectItem selectItem = (SelectItem)selectItemList.get(index);
- Object itemValue = selectItem.getValue();
- String itemStrValue;
- if (converter == null)
- {
- itemStrValue = itemValue.toString();
- }
- else
- {
- itemStrValue = converter.getAsString(facesContext, uiSelectOne, itemValue);
- }
+ String itemStrValue
+ = RendererUtils.getConvertedStringValue(facesContext, uiSelectOne,
+ converter,
+ selectItem.getValue());
+
ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HTML.LABEL_ELEM, uiSelectOne);
@@ -138,8 +136,7 @@
itemStrValue,
selectItem.getLabel(),
selectItem.isDisabled(),
- currentValue == null && itemValue == null ||
- currentValue != null && currentValue.equals(itemValue), false);
+ itemStrValue.equals(currentValue), false);
writer.endElement(HTML.LABEL_ELEM);
}