Changeset 1426

Timestamp:

18/12/09 17:25:12 (3 months ago)

Author:

bruno

Message:

Still one more fix for correct year-edge handling

Files:

• tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/CalendarUtil.java (modified) (1 diff)

tupper/trunk/tupper-site/src/main/java/org/kauriproject/tupper/resource/CalendarUtil.java

@@ -28 +28 @@
-    public static Calendar getCalendar(int week, int year) {
-        Calendar calendar = getCalendar();
-        calendar.set(Calendar.DAY_OF_YEAR, 1);
-        calendar.set(Calendar.YEAR, year);
-        calendar.set(Calendar.WEEK_OF_YEAR, week);
+
+        // For the first and last week of the year, we have to be careful
+        // that the year-value doesn't shift because the day of the week
+        // falls in the other year.
+        if (week == 1) {
+            calendar.set(Calendar.DAY_OF_YEAR, 1);
+        } else {
+            // we don't check explictly for the last week of the year,
+            // but this covers it
+            calendar.set(Calendar.DAY_OF_WEEK, calendar.getFirstDayOfWeek());
+        }
-        return calendar;
-    }