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

6560981: (cal) unused local variables in GregorianCalendar, etc.

Browse source 
Reviewed-by: naoto, bchristi, iris
This commit is contained in:
Justin Lu 2022-10-06 23:16:06 +00:00 • committed by Naoto Sato
parent 5dd851d872
commit d4c9a88073
3 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2431,7 +2431,6 @@ public class GregorianCalendar extends Calendar {
long fixedDateJan1 = calsys.getFixedDate(normalizedYear, 1, 1, cdate);
int dayOfYear = (int)(fixedDate - fixedDateJan1) + 1;
long fixedDateMonth1 = fixedDate - dayOfMonth + 1;
int cutoverGap = 0;
int cutoverYear = (calsys == gcal) ? gregorianCutoverYear : gregorianCutoverYearJulian;
int relativeDayOfMonth = dayOfMonth - 1;
@ -2447,9 +2446,7 @@ public class GregorianCalendar extends Calendar {
fixedDateMonth1 = getFixedDateMonth1(cdate, fixedDate);
}
}
int realDayOfYear = (int)(fixedDate - fixedDateJan1) + 1;
cutoverGap = dayOfYear - realDayOfYear;
dayOfYear = realDayOfYear;
dayOfYear = (int)(fixedDate - fixedDateJan1) + 1;
relativeDayOfMonth = (int)(fixedDate - fixedDateMonth1);
}
internalSet(DAY_OF_YEAR, dayOfYear);

1
src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
View file

@ -2118,7 +2118,6 @@ class JapaneseImperialCalendar extends Calendar {
* @param fixedDate the fixed date representation of the date
*/
private long getFixedDateJan1(LocalGregorianCalendar.Date date, long fixedDate) {
Era era = date.getEra();
if (date.getEra() != null && date.getYear() == 1) {
for (int eraIndex = getEraIndex(date); eraIndex > 0; eraIndex--) {
CalendarDate d = eras[eraIndex].getSinceDate();