[richfaces-svn-commits] JBoss Rich Faces SVN: r19847 - trunk/ui/input/ui/src/main/java/org/richfaces/renderkit.
Author: amarkhel
Date: 2010-11-01 11:40:40 -0400 (Mon, 01 Nov 2010)
New Revision: 19847
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
RF-9595
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-11-01
15:39:42 UTC (rev 19846)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-11-01
15:40:40 UTC (rev 19847)
@@ -242,13 +242,14 @@
String newValue = (String) submittedValue;
// if we have no local value, try to get the valueExpression.
AbstractCalendar calendar = (AbstractCalendar) component;
- Converter converter = SelectUtils.getConverterForProperty(facesContext, calendar,
"value");
+ Converter converter = SelectUtils.findConverter(facesContext, calendar,
"value");
// in case the converter hasn't been set, try to use default
// DateTimeConverter
if (converter == null) {
converter = createDefaultConverter();
}
+
setupConverter(facesContext, converter, calendar);
return converter.getAsObject(facesContext, component, newValue);
}
@@ -263,12 +264,13 @@
String value = (String) calendar.getSubmittedValue();
if (value == null) {
Object curVal = calendar.getValue();
- Converter converter = SelectUtils.getConverterForProperty(facesContext,
calendar, "value");
+ Converter converter = SelectUtils.findConverter(facesContext, calendar,
"value");
if(converter == null) {
converter = createDefaultConverter();
- setupConverter(facesContext, converter, calendar);
}
+
+ setupConverter(facesContext, converter, calendar);
if (converter != null) {
value = converter.getAsString(facesContext, calendar, curVal);