archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8225641: Calendar.roll(int field) does not work correctly for WEEK_OF_YEAR

Browse source 
Reviewed-by: naoto
This commit is contained in:
Justin Lu 2023-04-04 21:01:24 +00:00 • committed by Naoto Sato
parent 3399fbf9fa
commit a324fa2639
2 changed files with 188 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/java.base/share/classes/java/util/GregorianCalendar.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1307,7 +1307,15 @@ public class GregorianCalendar extends Calendar {
woy = min;
}
}
set(field, getRolledValue(woy, amount, min, max));
int newWeekOfYear = getRolledValue(woy, amount, min, max);
// Final check to ensure that the first week has the
// current DAY_OF_WEEK. Only make a check for
// rolling up into week 1, as the existing checks
// sufficiently handle rolling down into week 1.
if (newWeekOfYear == 1 && isInvalidWeek1() && amount > 0) {
newWeekOfYear++;
}
set(field, newWeekOfYear);
return;
}
@ -2972,6 +2980,54 @@ public class GregorianCalendar extends Calendar {
return normalizedYear == cutoverYear;
}
/**
* {@return {@code true} if the first week of the current year is minimum
* and the {@code DAY_OF_WEEK} does not exist in that week}
*
* This method is used to check the validity of a {@code WEEK_OF_YEAR} and
* {@code DAY_OF_WEEK} combo when WEEK_OF_YEAR is rolled to a value of 1.
* This prevents other methods from calling complete() with an invalid combo.
*/
private boolean isInvalidWeek1() {
// Calculate the DAY_OF_WEEK for Jan 1 of the current YEAR
long jan1Fd = gcal.getFixedDate(internalGet(YEAR), 1, 1, null);
int jan1Dow = BaseCalendar.getDayOfWeekFromFixedDate(jan1Fd);
// Calculate how many days are in the first week
int daysInFirstWeek;
if (getFirstDayOfWeek() <= jan1Dow) {
// Add wrap around days
daysInFirstWeek = 7 - jan1Dow + getFirstDayOfWeek();
} else {
daysInFirstWeek = getFirstDayOfWeek() - jan1Dow;
}
// Calculate the end day of the first week
int endDow = getFirstDayOfWeek() - 1 == 0
? 7 : getFirstDayOfWeek() - 1;
// If the week is a valid minimum, check if the DAY_OF_WEEK does not exist
return daysInFirstWeek >= getMinimalDaysInFirstWeek() &&
!dayInMinWeek(internalGet(DAY_OF_WEEK), jan1Dow, endDow);
}
/**
* Given the first day and last day of a week, this method determines
* if the specified day exists in the minimum week.
* This method expects all parameters to be passed in as DAY_OF_WEEK values.
* For example, dayInMinWeek(4, 6, 3) returns false since Wednesday
* is not between the minimum week given by [Friday, Saturday,
* Sunday, Monday, Tuesday].
*/
private boolean dayInMinWeek (int day, int startDay, int endDay) {
if (endDay >= startDay) {
// dayInMinWeek(6, 3, 5), check that 6 is
// between 3 4 5
return (day >= startDay && day <= endDay);
} else {
// dayInMinWeek(4, 6, 3), check that 4 is
// between 6 7 1 2 3
return (day >= startDay || day <= endDay);
}
}
/**
* Returns the fixed date of the first day of the year (usually
* January 1) before the specified date.