Author: vbaranov Date: 2008-03-21 10:51:45 -0400 (Fri, 21 Mar 2008) New Revision: 7056 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: http://jira.jboss.com/jira/browse/RF-997 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-03-21 14:36:28 UTC (rev 7055) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-03-21 14:51:45 UTC (rev 7056) @@ -156,7 +156,7 @@ String selectedDateString = (String) requestParameterMap.get(clientId + "InputDate"); if (selectedDateString != null) { - ((UICalendar) component).setSubmittedValue(selectedDateString); + ((UICalendar) component).setSubmittedValue(selectedDateString); } } @@ -468,8 +468,19 @@ // Fix for myFaces 1.1.x RF-997 Date date; if (calendar.isValid()) { - Date submittedValue = calendar.getAsDate(calendar - .getSubmittedValue()); + // Hack. Use converter in "Render response" phase + // in order to have java.util.Date object to highlight + // selected date in Calendar popup. + Date submittedValue = null; + try { + submittedValue = calendar.getAsDate(calendar.getSubmittedValue()); + } catch(ConverterException ce) { + // ignore ConverterException for the case when the user + // has entered invalid date and there was no validation + // (and conversion) before, i.e. the form submit has attribute + // "immediate" = true; and Calendar has "immediate" = false + submittedValue = null; + } if (submittedValue != null) { date = submittedValue; } else {