diff options
author | naoto <unknown> | 2019-04-03 04:59:17 +0100 |
---|---|---|
committer | bell-sw <liberica@bell-sw.com> | 2019-04-20 16:52:25 +0300 |
commit | 1e4f3d333c1dab7e1b45070006a40b6471d317cb (patch) | |
tree | 640431e680a725477ae58174fbb72c0f0491f2a0 /src/share/classes/java | |
parent | 185369fdcd285dc7cd077d715246fe425be3865a (diff) | |
download | jdk8u_jdk-1e4f3d333c1dab7e1b45070006a40b6471d317cb.tar.gz |
8205432: Replace the placeholder Japanese era name
Reviewed-by: rriggs, chegar
Diffstat (limited to 'src/share/classes/java')
-rw-r--r-- | src/share/classes/java/time/chrono/JapaneseEra.java | 8 | ||||
-rw-r--r-- | src/share/classes/java/util/JapaneseImperialCalendar.java | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/share/classes/java/time/chrono/JapaneseEra.java b/src/share/classes/java/time/chrono/JapaneseEra.java index d7dac43d54..205238a4a7 100644 --- a/src/share/classes/java/time/chrono/JapaneseEra.java +++ b/src/share/classes/java/time/chrono/JapaneseEra.java @@ -151,14 +151,14 @@ public final class JapaneseEra */ public static final JapaneseEra HEISEI = new JapaneseEra(2, LocalDate.of(1989, 1, 8)); /** - * The singleton instance for the 'NewEra' era (2019-05-01 - current) + * The singleton instance for the 'Reiwa' era (2019-05-01 - ) * which has the value 3. */ - private static final JapaneseEra NEWERA = new JapaneseEra(3, LocalDate.of(2019, 5, 1)); + private static final JapaneseEra REIWA = new JapaneseEra(3, LocalDate.of(2019, 5, 1)); // The number of predefined JapaneseEra constants. // There may be a supplemental era defined by the property. - private static final int N_ERA_CONSTANTS = NEWERA.getValue() + ERA_OFFSET; + private static final int N_ERA_CONSTANTS = REIWA.getValue() + ERA_OFFSET; /** * Serialization version. @@ -176,7 +176,7 @@ public final class JapaneseEra KNOWN_ERAS[1] = TAISHO; KNOWN_ERAS[2] = SHOWA; KNOWN_ERAS[3] = HEISEI; - KNOWN_ERAS[4] = NEWERA; + KNOWN_ERAS[4] = REIWA; for (int i = N_ERA_CONSTANTS; i < ERA_CONFIG.length; i++) { CalendarDate date = ERA_CONFIG[i].getSinceDate(); LocalDate isoDate = LocalDate.of(date.getYear(), date.getMonth(), date.getDayOfMonth()); diff --git a/src/share/classes/java/util/JapaneseImperialCalendar.java b/src/share/classes/java/util/JapaneseImperialCalendar.java index 08bd975c8d..606132370e 100644 --- a/src/share/classes/java/util/JapaneseImperialCalendar.java +++ b/src/share/classes/java/util/JapaneseImperialCalendar.java @@ -50,7 +50,7 @@ import sun.util.calendar.ZoneInfo; * 2 Taisho 1912-07-30 midnight local time * 3 Showa 1926-12-25 midnight local time * 4 Heisei 1989-01-08 midnight local time - * 5 NewEra 2019-05-01 midnight local time + * 5 Reiwa 2019-05-01T00:00:00 local time * ------------------------------------------------------ * </tt></pre> * @@ -103,9 +103,9 @@ class JapaneseImperialCalendar extends Calendar { public static final int HEISEI = 4; /** - * The ERA constant designating the NewEra era. + * The ERA constant designating the Reiwa era. */ - private static final int NEWERA = 5; + private static final int REIWA = 5; private static final int EPOCH_OFFSET = 719163; // Fixed date of January 1, 1970 (Gregorian) private static final int EPOCH_YEAR = 1970; @@ -1729,12 +1729,12 @@ class JapaneseImperialCalendar extends Calendar { } } else if (transitionYear) { if (jdate.getYear() == 1) { - // As of NewEra (since Meiji) there's no case + // As of Reiwa (since Meiji) there's no case // that there are multiple transitions in a // year. Historically there was such // case. There might be such case again in the // future. - if (era > NEWERA) { + if (era > REIWA) { CalendarDate pd = eras[era - 1].getSinceDate(); if (normalizedYear == pd.getYear()) { d.setMonth(pd.getMonth()).setDayOfMonth(pd.getDayOfMonth()); |