Author: nbelaevski Date: 2007-09-05 11:11:41 -0400 (Wed, 05 Sep 2007) New Revision: 2774 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: Empty month encoded in months names array fixed Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-09-05 14:44:27 UTC (rev 2773) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-09-05 15:11:41 UTC (rev 2774) @@ -264,9 +264,9 @@ } } - private static String[] shiftDates(int firstDayOfWeek, int minimum, + private static String[] shiftDates(int minimum, int maximum, String[] labels) { - if (minimum == 0) { + if (minimum == 0 && (maximum - minimum == labels.length - 1)) { return labels; } @@ -284,14 +284,16 @@ Calendar cal = calendar.getCalendar(); int maximum = cal.getActualMaximum(Calendar.DAY_OF_WEEK); int minimum = cal.getActualMinimum(Calendar.DAY_OF_WEEK); - int firstDayOfWeek = cal.getFirstDayOfWeek(); - + + int monthMax = cal.getActualMaximum(Calendar.MONTH); + int monthMin = cal.getActualMinimum(Calendar.MONTH); + DateFormatSymbols symbols = new DateFormatSymbols(locale); String[] weekDayLabels = ComponentUtil.asArray(calendar .getWeekDayLabels()); if (weekDayLabels == null) { weekDayLabels = symbols.getWeekdays(); - weekDayLabels = shiftDates(firstDayOfWeek, minimum, maximum, + weekDayLabels = shiftDates(minimum, maximum, weekDayLabels); } @@ -299,19 +301,21 @@ .getWeekDayLabelsShort()); if (weekDayLabelsShort == null) { weekDayLabelsShort = symbols.getShortWeekdays(); - weekDayLabelsShort = shiftDates(firstDayOfWeek, minimum, maximum, + weekDayLabelsShort = shiftDates(minimum, maximum, weekDayLabelsShort); } String[] monthLabels = ComponentUtil.asArray(calendar.getMonthLabels()); if (monthLabels == null) { monthLabels = symbols.getMonths(); + monthLabels = shiftDates(monthMin, monthMax, monthLabels); } String[] monthLabelsShort = ComponentUtil.asArray(calendar .getMonthLabelsShort()); if (monthLabelsShort == null) { monthLabelsShort = symbols.getShortMonths(); + monthLabelsShort = shiftDates(monthMin, monthMax, monthLabelsShort); } map.put(WEEK_DAY_LABELS, weekDayLabels);