You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/10/14 14:12:59 UTC
svn commit: r1022479 -
/pivot/branches/1.5.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
Author: gbrown
Date: Thu Oct 14 12:12:58 2010
New Revision: 1022479
URL: http://svn.apache.org/viewvc?rev=1022479&view=rev
Log:
Resolve PIVOT-652.
Modified:
pivot/branches/1.5.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
Modified: pivot/branches/1.5.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java?rev=1022479&r1=1022478&r2=1022479&view=diff
==============================================================================
--- pivot/branches/1.5.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java (original)
+++ pivot/branches/1.5.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraCalendarSkin.java Thu Oct 14 12:12:58 2010
@@ -613,8 +613,8 @@ public class TerraCalendarSkin extends C
Locale locale = calendar.getLocale();
GregorianCalendar gregorianCalendar = new GregorianCalendar(locale);
gregorianCalendar.set(year, month, 1);
- int firstIndex = gregorianCalendar.get(java.util.Calendar.DAY_OF_WEEK)
- - gregorianCalendar.getFirstDayOfWeek();
+ int firstIndex = (7 + gregorianCalendar.get(java.util.Calendar.DAY_OF_WEEK)
+ - gregorianCalendar.getFirstDayOfWeek()) % 7;
int lastIndex = firstIndex + gregorianCalendar.getActualMaximum(java.util.Calendar.DAY_OF_MONTH);
// Determine the last day of last month