Author: amarkhel Date: 2010-11-19 06:49:05 -0500 (Fri, 19 Nov 2010) New Revision: 20116 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java Log: RF-9683 Calendar component: data model support. Calling getCurrentDate() was replaces by getCurrentDateOrDefault() Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-11-19 11:20:55 UTC (rev 20115) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-11-19 11:49:05 UTC (rev 20116) @@ -494,9 +494,9 @@ if (Modes.AJAX.toString().equalsIgnoreCase(getMode())) { dateRangeBegin = CalendarHelper.getAsDate(facesContext, this, - getDefaultPreloadBegin((Date) getCurrentDate())); + getDefaultPreloadBegin((Date) getCurrentDateOrDefault())); dateRangeEnd = CalendarHelper.getAsDate(facesContext, this, - getDefaultPreloadEnd((Date) getCurrentDate())); + getDefaultPreloadEnd((Date) getCurrentDateOrDefault())); } else { dateRangeBegin = CalendarHelper.getAsDate(facesContext, this, getPreloadDateRangeBegin()); dateRangeEnd = CalendarHelper.getAsDate(facesContext, this, getPreloadDateRangeEnd());