From 638f713d26d6ad6aac344911a2e6cf9b335e4a8b Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Fri, 6 Sep 2024 10:12:58 -0700 Subject: [PATCH] initial commit --- .../tools/tzdb/TzdbZoneRulesProvider.java | 38 +++++++++---------- src/java.base/share/data/tzdata/asia | 6 +-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java b/make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java index d82e58e34206a..4c3e72fe9eac0 100644 --- a/make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java +++ b/make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, 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 @@ -365,31 +365,31 @@ int parseYear(String year, int defaultYear) { Month parseMonth(String mon) { switch (mon) { - case "Jan": return Month.JANUARY; - case "Feb": return Month.FEBRUARY; - case "Mar": return Month.MARCH; - case "Apr": return Month.APRIL; + case "Jan", "January": return Month.JANUARY; + case "Feb", "February": return Month.FEBRUARY; + case "Mar", "March": return Month.MARCH; + case "Apr", "April": return Month.APRIL; case "May": return Month.MAY; - case "Jun": return Month.JUNE; - case "Jul": return Month.JULY; - case "Aug": return Month.AUGUST; - case "Sep": return Month.SEPTEMBER; - case "Oct": return Month.OCTOBER; - case "Nov": return Month.NOVEMBER; - case "Dec": return Month.DECEMBER; + case "Jun", "June": return Month.JUNE; + case "Jul", "July": return Month.JULY; + case "Aug", "August": return Month.AUGUST; + case "Sep", "September": return Month.SEPTEMBER; + case "Oct", "October": return Month.OCTOBER; + case "Nov", "November": return Month.NOVEMBER; + case "Dec", "December": return Month.DECEMBER; } throw new IllegalArgumentException("Unknown month: " + mon); } DayOfWeek parseDayOfWeek(String dow) { switch (dow) { - case "Mon": return DayOfWeek.MONDAY; - case "Tue": return DayOfWeek.TUESDAY; - case "Wed": return DayOfWeek.WEDNESDAY; - case "Thu": return DayOfWeek.THURSDAY; - case "Fri": return DayOfWeek.FRIDAY; - case "Sat": return DayOfWeek.SATURDAY; - case "Sun": return DayOfWeek.SUNDAY; + case "Mon", "Monday": return DayOfWeek.MONDAY; + case "Tue", "Tuesday": return DayOfWeek.TUESDAY; + case "Wed", "Wednesday": return DayOfWeek.WEDNESDAY; + case "Thu", "Thursday": return DayOfWeek.THURSDAY; + case "Fri", "Friday": return DayOfWeek.FRIDAY; + case "Sat", "Saturday": return DayOfWeek.SATURDAY; + case "Sun", "Sunday": return DayOfWeek.SUNDAY; } throw new IllegalArgumentException("Unknown day-of-week: " + dow); } diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia index 3a54291919d60..b43a64288a1d9 100644 --- a/src/java.base/share/data/tzdata/asia +++ b/src/java.base/share/data/tzdata/asia @@ -408,7 +408,7 @@ Rule Shang 1919 only - Sep 30 24:00 0 S Rule Shang 1940 only - Jun 1 0:00 1:00 D Rule Shang 1940 only - Oct 12 24:00 0 S Rule Shang 1941 only - Mar 15 0:00 1:00 D -Rule Shang 1941 only - Nov 1 24:00 0 S +Rule Shang 1941 only - November 1 24:00 0 S Rule Shang 1942 only - Jan 31 0:00 1:00 D Rule Shang 1945 only - Sep 1 24:00 0 S Rule Shang 1946 only - May 15 0:00 1:00 D @@ -469,7 +469,7 @@ Rule Shang 1948 1949 - Sep 30 24:00 0 S #plan # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule PRC 1986 only - May 4 2:00 1:00 D -Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S +Rule PRC 1986 1991 - Sep Sunday>=11 2:00 0 S Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D # From Anthony Fok (2001-12-20): @@ -1116,7 +1116,7 @@ Rule Macau 1947 only - Nov 30 23:00s 0 S Rule Macau 1948 only - May 2 23:00s 1:00 D Rule Macau 1948 only - Oct 31 23:00s 0 S Rule Macau 1949 1950 - Apr Sat>=1 23:00s 1:00 D -Rule Macau 1949 1950 - Oct lastSat 23:00s 0 S +Rule Macau 1949 1950 - Oct lastSaturday 23:00s 0 S Rule Macau 1951 only - Mar 31 23:00s 1:00 D Rule Macau 1951 only - Oct 28 23:00s 0 S Rule Macau 1952 1953 - Apr Sat>=1 23:00s 1:00 D