archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8276536: Update TimeZoneNames files to follow the changes made by JDK-8275766

Browse source 
Reviewed-by: naoto, coffeys
This commit is contained in:
Yoshiki Sato 2021-11-11 01:39:06 +00:00 • committed by Naoto Sato
parent e27a67a916
commit ad3be04d2a
11 changed files with 88 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@ -353,7 +353,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Africa/Gaborone", CAT},
{"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Juba", CAT},
{"Africa/Kampala", EAT},
{"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
@ -380,7 +380,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
{"Africa/Windhoek", CAT},
{"Africa/Windhoek", new String[] {"Central African Time", "CAT",
"Western African Time", "WAT",
"Central African Time", "CAT"}},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@ -569,9 +571,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT",
"Dumont-d'Urville Summer Time", "DDUST",
"Dumont-d'Urville Time", "DDUT"}},
{"Antarctica/Macquarie", new String[] {"Macquarie Island Standard Time", "MIST",
"Macquarie Island Daylight Time", "MIDT",
"Macquarie Island Time", "MIST"}},
{"Antarctica/Macquarie", new String[] {"Australian Eastern Standard Time (Macquarie)", "AEST",
"Australian Eastern Daylight Time (Macquarie)", "AEDT",
"Australian Eastern Time (Macquarie)", "AET"}},
{"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT",
"Mawson Summer Time", "MAWST",
"Mawson Time", "MAWT"}},