6453901: (cal) clean up sun.util.calendar classes

Reviewed-by: naoto, lancea

Author: Justin Lu

src/java.base/share/classes/sun/util/calendar/AbstractCalendar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,7 +25,6 @@
 
 package sun.util.calendar;
 
-import java.util.Locale;
 import java.util.TimeZone;
 
 /**
@@ -81,20 +80,6 @@ public Era[] getEras() {
         return e;
     }
 
-    public void setEra(CalendarDate date, String eraName) {
-        if (eras == null) {
-            return; // should report an error???
-        }
-        for (int i = 0; i < eras.length; i++) {
-            Era e = eras[i];
-            if (e != null && e.getName().equals(eraName)) {
-                date.setEra(e);
-                return;
-            }
-        }
-        throw new IllegalArgumentException("unknown era name: " + eraName);
-    }
-
     protected void setEras(Era[] eras) {
         this.eras = eras;
     }
@@ -258,15 +243,6 @@ public CalendarDate setTimeOfDay(CalendarDate cdate, int fraction) {
         return cdate;
     }
 
-    /**
-     * Returns 7 in this default implementation.
-     *
-     * @return 7
-     */
-    public int getWeekLength() {
-        return 7;
-    }
-
     protected abstract boolean isLeapYear(CalendarDate date);
 
     public CalendarDate getNthDayOfWeek(int nth, int dayOfWeek, CalendarDate date) {
@@ -341,7 +317,7 @@ public static long getDayOfWeekDateOnOrBefore(long fixedDate, int dayOfWeek) {
      * method stores the calculated calendar field values in the specified
      * <code>CalendarDate</code>.
      *
-     * @param date a <code>CalendarDate</code> to stored the
+     * @param date a <code>CalendarDate</code> to store the
      * calculated calendar fields.
      * @param fixedDate a fixed date to calculate calendar fields
      * @see AbstractCalendar.html#fixed_date

src/java.base/share/classes/sun/util/calendar/BaseCalendar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -307,10 +307,6 @@ public int getYearLength(CalendarDate date) {
         return isLeapYear(((Date)date).getNormalizedYear()) ? 366 : 365;
     }
 
-    public int getYearLengthInMonths(CalendarDate date) {
-        return 12;
-    }
-
     static final int[] DAYS_IN_MONTH
         //  12   1   2   3   4   5   6   7   8   9  10  11  12
         = { 31, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
@@ -527,7 +523,7 @@ final int getGregorianYearFromFixedDate(long fixedDate) {
     /**
      * @return true if the specified year is a Gregorian leap year, or
      * false otherwise.
-     * @see BaseCalendar#isGregorianLeapYear
+     * @see CalendarUtils#isGregorianLeapYear
      */
     protected boolean isLeapYear(CalendarDate date) {
         return isLeapYear(((Date)date).getNormalizedYear());

src/java.base/share/classes/sun/util/calendar/CalendarDate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -152,7 +152,7 @@ public CalendarDate addYear(int n) {
      * @return <code>true</code> if this <code>CalendarDate</code> is
      * normalized and the year of this <code>CalendarDate</code> is a
      * leap year, or <code>false</code> otherwise.
-     * @see BaseCalendar#isGregorianLeapYear
+     * @see CalendarUtils#isGregorianLeapYear
      */
     public boolean isLeapYear() {
         return leapYear;
@@ -194,14 +194,6 @@ public CalendarDate setDayOfMonth(int date) {
         return this;
     }
 
-    public CalendarDate addDayOfMonth(int n) {
-        if (n != 0) {
-            dayOfMonth += n;
-            normalized = false;
-        }
-        return this;
-    }
-
     /**
      * Returns the day of week value. If this CalendarDate is not
      * normalized, {@link #FIELD_UNDEFINED} is returned.
@@ -247,14 +239,6 @@ public CalendarDate setMinutes(int minutes) {
         return this;
     }
 
-    public CalendarDate addMinutes(int n) {
-        if (n != 0) {
-            minutes += n;
-            normalized = false;
-        }
-        return this;
-    }
-
     public int getSeconds() {
         return seconds;
     }
@@ -267,14 +251,6 @@ public CalendarDate setSeconds(int seconds) {
         return this;
     }
 
-    public CalendarDate addSeconds(int n) {
-        if (n != 0) {
-            seconds += n;
-            normalized = false;
-        }
-        return this;
-    }
-
     public int getMillis() {
         return millis;
     }
@@ -287,14 +263,6 @@ public CalendarDate setMillis(int millis) {
         return this;
     }
 
-    public CalendarDate addMillis(int n) {
-        if (n != 0) {
-            millis += n;
-            normalized = false;
-        }
-        return this;
-    }
-
     public long getTimeOfDay() {
         if (!isNormalized()) {
             return fraction = TIME_UNDEFINED;
@@ -309,13 +277,6 @@ public CalendarDate setDate(int year, int month, int dayOfMonth) {
         return this;
     }
 
-    public CalendarDate addDate(int year, int month, int dayOfMonth) {
-        addYear(year);
-        addMonth(month);
-        addDayOfMonth(dayOfMonth);
-        return this;
-    }
-
     public CalendarDate setTimeOfDay(int hours, int minutes, int seconds, int millis) {
         setHours(hours);
         setMinutes(minutes);
@@ -324,14 +285,6 @@ public CalendarDate setTimeOfDay(int hours, int minutes, int seconds, int millis
         return this;
     }
 
-    public CalendarDate addTimeOfDay(int hours, int minutes, int seconds, int millis) {
-        addHours(hours);
-        addMinutes(minutes);
-        addSeconds(seconds);
-        addMillis(millis);
-        return this;
-    }
-
     protected void setTimeOfDay(long fraction) {
         this.fraction = fraction;
     }
@@ -345,10 +298,6 @@ public boolean isStandardTime() {
         return forceStandardTime;
     }
 
-    public void setStandardTime(boolean standardTime) {
-        forceStandardTime = standardTime;
-    }
-
     public boolean isDaylightTime() {
         if (isStandardTime()) {
             return false;
@@ -382,10 +331,9 @@ && getYear() == date.getYear()
     }
 
     public boolean equals(Object obj) {
-        if (!(obj instanceof CalendarDate)) {
+        if (!(obj instanceof CalendarDate that)) {
             return false;
         }
-        CalendarDate that = (CalendarDate) obj;
         if (isNormalized() != that.isNormalized()) {
             return false;
         }

src/java.base/share/classes/sun/util/calendar/CalendarSystem.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -234,14 +234,6 @@ public static CalendarSystem forName(String calendarName) {
      */
     public abstract int getYearLength(CalendarDate date);
 
-    /**
-     * Returns the number of months of the specified year. This method
-     * does not perform the normalization with the specified
-     * <code>CalendarDate</code>. The <code>CalendarDate</code> must
-     * be normalized to get a correct value.
-     */
-    public abstract int getYearLengthInMonths(CalendarDate date);
-
     /**
      * Returns the length in days of the month specified by the calendar
      * date. This method does not perform the normalization with the
@@ -255,13 +247,6 @@ public static CalendarSystem forName(String calendarName) {
      */
     public abstract int getMonthLength(CalendarDate date); // no setter
 
-    /**
-     * Returns the length in days of a week in this calendar
-     * system. If this calendar system has multiple radix weeks, this
-     * method returns only one of them.
-     */
-    public abstract int getWeekLength();
-
     /**
      * Returns the <code>Era</code> designated by the era name that
      * has to be known to this calendar system. If no Era is
@@ -287,13 +272,6 @@ public static CalendarSystem forName(String calendarName) {
      */
     public abstract Era[] getEras();
 
-    /**
-     * @throws IllegalArgumentException if the specified era name is
-     * unknown to this calendar system.
-     * @see Era
-     */
-    public abstract void setEra(CalendarDate date, String eraName);
-
     /**
      * Returns a <code>CalendarDate</code> of the n-th day of week
      * which is on, after or before the specified date. For example, the

src/java.base/share/classes/sun/util/calendar/CalendarUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -25,9 +25,6 @@
 
 package sun.util.calendar;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class CalendarUtils {
 
     /**
@@ -109,29 +106,6 @@ public static final int floorDivide(int n, int d, int[] r) {
         return q;
     }
 
-    /**
-     * Divides two integers and returns the floor of the quotient and
-     * the modulus remainder.  For example,
-     * <code>floorDivide(-1,4)</code> returns <code>-1</code> with
-     * <code>3</code> as its remainder, while <code>-1/4</code> is
-     * <code>0</code> and <code>-1%4</code> is <code>-1</code>.
-     *
-     * @param n the numerator
-     * @param d a divisor which must be {@literal > 0}
-     * @param r an array of at least one element in which the value
-     * <code>mod(n, d)</code> is returned.
-     * @return the floor of the quotient.
-     */
-    public static final int floorDivide(long n, int d, int[] r) {
-        if (n >= 0) {
-            r[0] = (int)(n % d);
-            return (int)(n / d);
-        }
-        int q = (int)(((n + 1) / d) - 1);
-        r[0] = (int)(n - (q * d));
-        return q;
-    }
-
     public static final long mod(long x, long y) {
         return (x - y * floorDivide(x, y));
     }

src/java.base/share/classes/sun/util/calendar/Era.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -79,9 +79,9 @@ public Era(String name, String abbr, long since, boolean localTime) {
         this.abbr = abbr;
         this.since = since;
         this.localTime = localTime;
-        Gregorian gcal = CalendarSystem.getGregorianCalendar();
-        BaseCalendar.Date d = gcal.newCalendarDate(null);
-        gcal.getCalendarDate(since, d);
+        Gregorian gCal = CalendarSystem.getGregorianCalendar();
+        BaseCalendar.Date d = gCal.newCalendarDate(null);
+        gCal.getCalendarDate(since, d);
         sinceDate = new ImmutableGregorianDate(d);
     }
 
@@ -97,10 +97,6 @@ public String getAbbreviation() {
         return abbr;
     }
 
-    public String getDiaplayAbbreviation(Locale locale) {
-        return abbr;
-    }
-
     public long getSince(TimeZone zone) {
         if (zone == null || !localTime) {
             return since;
@@ -118,10 +114,9 @@ public boolean isLocalTime() {
     }
 
     public boolean equals(Object o) {
-        if (!(o instanceof Era)) {
+        if (!(o instanceof Era that)) {
             return false;
         }
-        Era that = (Era) o;
         return name.equals(that.name)
             && abbr.equals(that.abbr)
             && since == that.since