Author: sergeyhalipov Date: 2008-04-11 08:22:38 -0400 (Fri, 11 Apr 2008) New Revision: 7763 Modified: branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: http://jira.jboss.com/jira/browse/RF-3003 http://jira.jboss.com/jira/browse/RF-2269 Modified: branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml =================================================================== --- branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2008-04-11 11:48:28 UTC (rev 7762) +++ branches/3.1.x/ui/calendar/src/main/config/component/calendar.xml 2008-04-11 12:22:38 UTC (rev 7763) @@ -554,6 +554,23 @@ <name>label</name> <classname>java.lang.String</classname> <description>A localized user presentable name for this component.</description> + </property> + <property> + <name>firstWeekDay</name> + <classname>int</classname> + <description>Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.</description> + <defaultvalue>getDefaultFirstWeekDay()</defaultvalue> + </property> + <property> + <name>minDaysInFirstWeek</name> + <classname>int</classname> + <description> + Gets what the minimal days required in the first week of the year + are; e.g., if the first week is defined as one that contains the first + day of the first month of a year, this method returns 1. If the + minimal days required must be a full week, this method returns 7. + </description> + <defaultvalue>getDefaultMinDaysInFirstWeek()</defaultvalue> </property> <property> <name>showHeader</name> Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java =================================================================== --- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-11 11:48:28 UTC (rev 7762) +++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-04-11 12:22:38 UTC (rev 7763) @@ -204,8 +204,13 @@ public abstract boolean isShowApplyButton(); public abstract void setShowApplyButton(boolean showApplyButton); + + public abstract int getFirstWeekDay(); + public abstract void setFirstWeekDay(int firstWeekDay); + + public abstract int getMinDaysInFirstWeek(); + public abstract void setMinDaysInFirstWeek(int minDaysInFirstWeek); - // TODO onclick add users onclick // currentDate processing ------------------------------------------------- @@ -606,5 +611,14 @@ } } } + + protected int getDefaultFirstWeekDay() { + Calendar cal = getCalendar(); + return cal.getFirstDayOfWeek() - cal.getActualMinimum(Calendar.DAY_OF_WEEK); + } + + protected int getDefaultMinDaysInFirstWeek() { + return getCalendar().getMinimalDaysInFirstWeek(); + } } 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-04-11 11:48:28 UTC (rev 7762) +++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-04-11 12:22:38 UTC (rev 7763) @@ -449,15 +449,12 @@ public String getFirstWeekDay(FacesContext context, UICalendar calendar) throws IOException { - Calendar cal = calendar.getCalendar(); - return String.valueOf(cal.getFirstDayOfWeek() - - cal.getActualMinimum(Calendar.DAY_OF_WEEK)); + return String.valueOf(calendar.getFirstWeekDay()); } public String getMinDaysInFirstWeek(FacesContext context, UICalendar calendar) throws IOException { - Calendar cal = calendar.getCalendar(); - return String.valueOf(cal.getMinimalDaysInFirstWeek()); + return String.valueOf(calendar.getMinDaysInFirstWeek()); } public String getCurrentDateAsString(FacesContext context, UICalendar calendar, Date date)