Author: nbelaevski Date: 2008-06-04 13:20:34 -0400 (Wed, 04 Jun 2008) New Revision: 8904 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: http://jira.jboss.com/jira/browse/RF-3637 http://jira.jboss.com/jira/browse/RF-997 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-06-04 16:13:03 UTC (rev 8903) +++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-06-04 17:20:34 UTC (rev 8904) @@ -475,7 +475,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 {