[richfaces-svn-commits] JBoss Rich Faces SVN: r11272 - trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit.
Author: abelevich
Date: 2008-11-20 10:22:55 -0500 (Thu, 20 Nov 2008)
New Revision: 11272
Modified:
trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
Log:
fix error with getSelectedItemLabel method
Modified:
trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
===================================================================
---
trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-11-20
14:50:44 UTC (rev 11271)
+++
trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java 2008-11-20
15:22:55 UTC (rev 11272)
@@ -128,12 +128,16 @@
}
public String getSelectedItemLabel(FacesContext context, UIInplaceSelect component)
{
- Object submittedValue = component.getSubmittedValue();
- Object value = submittedValue != null ? getConvertedValue(context, component,
submittedValue) : component.getAttributes().get("value");
- if (value == null || "".equals(value)) {
- return createDefaultLabel(component);
+ String selectedItemLabel = (String)component.getSubmittedValue();
+ if(selectedItemLabel == null) {
+ Object value = component.getAttributes().get("value");
+ if (value == null || "".equals(value)) {
+ selectedItemLabel = createDefaultLabel(component);
+ } else {
+ selectedItemLabel = getItemLabel(context, component, value);
+ }
}
- return getItemLabel(context, component, value);
+ return selectedItemLabel;
}
protected String getItemLabel(FacesContext context, UIInplaceSelect component, Object
value) {