8187946: Support ISO 4217 Amendments 163 and 164

Reviewed-by: naoto
This commit is contained in:
Leo Jiang 2018-01-14 21:46:14 -08:00
parent cc269bbcc4
commit 707eb1f2c2
6 changed files with 26 additions and 13 deletions
make/data/currency
src/java.base/share/classes/sun/util/resources
test/jdk

@ -32,7 +32,7 @@ formatVersion=3
# Version of the currency code information in this class. # Version of the currency code information in this class.
# It is a serial number that accompanies with each amendment. # It is a serial number that accompanies with each amendment.
dataVersion=162 dataVersion=164
# List of all valid ISO 4217 currency codes. # List of all valid ISO 4217 currency codes.
# To ensure compatibility, do not remove codes. # To ensure compatibility, do not remove codes.
@ -52,7 +52,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
@ -196,7 +196,7 @@ CU=CUP
CW=ANG CW=ANG
# CYPRUS # CYPRUS
CY=EUR CY=EUR
# CZECH REPUBLIC (THE) # CZECHIA
CZ=CZK CZ=CZK
# DENMARK # DENMARK
DK=DKK DK=DKK
@ -470,7 +470,7 @@ SM=EUR
# SOUTH SUDAN # SOUTH SUDAN
SS=SSP SS=SSP
# SAO TOME AND PRINCIPE # SAO TOME AND PRINCIPE
ST=STD ST=STN
# SAUDI ARABIA # SAUDI ARABIA
SA=SAR SA=SAR
# SENEGAL # SENEGAL

@ -226,6 +226,7 @@ SRD=SRD
SRG=SRG SRG=SRG
SSP=SSP SSP=SSP
STD=STD STD=STD
STN=STN
SVC=SVC SVC=SVC
SYP=SYP SYP=SYP
SZL=SZL SZL=SZL
@ -294,7 +295,7 @@ ats=Austrian Schilling
aud=Australian Dollar aud=Australian Dollar
awg=Aruban Florin awg=Aruban Florin
azm=Azerbaijani Manat (1993-2006) azm=Azerbaijani Manat (1993-2006)
azn=Azerbaijani Manat azn=Azerbaijan Manat
bam=Bosnia-Herzegovina Convertible Mark bam=Bosnia-Herzegovina Convertible Mark
bbd=Barbadian Dollar bbd=Barbadian Dollar
bdt=Bangladeshi Taka bdt=Bangladeshi Taka
@ -380,7 +381,7 @@ krw=South Korean Won
kwd=Kuwaiti Dinar kwd=Kuwaiti Dinar
kyd=Cayman Islands Dollar kyd=Cayman Islands Dollar
kzt=Kazakhstani Tenge kzt=Kazakhstani Tenge
lak=Laotian Kip lak=Lao Kip
lbp=Lebanese Pound lbp=Lebanese Pound
lkr=Sri Lankan Rupee lkr=Sri Lankan Rupee
lrd=Liberian Dollar lrd=Liberian Dollar
@ -418,7 +419,7 @@ omr=Omani Rial
pab=Panamanian Balboa pab=Panamanian Balboa
pen=Peruvian Sol pen=Peruvian Sol
pgk=Papua New Guinean Kina pgk=Papua New Guinean Kina
php=Philippine Peso php=Philippine Piso
pkr=Pakistani Rupee pkr=Pakistani Rupee
pln=Polish Zloty pln=Polish Zloty
pte=Portuguese Escudo pte=Portuguese Escudo
@ -446,6 +447,7 @@ srd=Surinamese Dollar
srg=Surinamese Guilder srg=Surinamese Guilder
ssp=South Sudanese Pound ssp=South Sudanese Pound
std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
svc=Salvadoran Col\u00f3n svc=Salvadoran Col\u00f3n
syp=Syrian Pound syp=Syrian Pound
szl=Swazi Lilangeni szl=Swazi Lilangeni

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759 * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
* 8039317 8074350 8074351 8145952 * 8039317 8074350 8074351 8145952 8187946
* @summary Validate ISO 4217 data for Currency class. * @summary Validate ISO 4217 data for Currency class.
* @modules java.base/java.util:open * @modules java.base/java.util:open
* jdk.localedata * jdk.localedata
@ -95,7 +95,11 @@ public class ValidateISO4217 {
/* Codes that are obsolete, do not have related country */ /* Codes that are obsolete, do not have related country */
static final String otherCodes = static final String otherCodes =
"ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-PTE-ROL-RUR-SDD-SIT-SKK-SRG-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-YUM-ZMK-ZWD-ZWN-ZWR"; "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-BYR-CHE-CHW-CLF-COU-CUC-CYP-"
+ "DEM-EEK-ESP-FIM-FRF-GHC-GRD-GWP-IEP-ITL-LUF-MGF-MTL-MXV-MZM-NLG-"
+ "PTE-ROL-RUR-SDD-SIT-SKK-SRG-STD-TMM-TPE-TRL-VEF-UYI-USN-USS-VEB-"
+ "XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-XPT-XSU-XTS-XUA-XXX-"
+ "YUM-ZMK-ZWD-ZWN-ZWR";
static boolean err = false; static boolean err = false;

@ -1,12 +1,12 @@
# #
# #
# Amendments up until ISO 4217 AMENDMENT NUMBER 162 # Amendments up until ISO 4217 AMENDMENT NUMBER 164
# (As of 30 Auguest 2016) # (As of 22 September 2017)
# #
# Version # Version
FILEVERSION=3 FILEVERSION=3
DATAVERSION=162 DATAVERSION=164
# ISO 4217 currency data # ISO 4217 currency data
AF AFN 971 2 AF AFN 971 2
@ -210,7 +210,7 @@ PM EUR 978 2
VC XCD 951 2 VC XCD 951 2
WS WST 882 2 WS WST 882 2
SM EUR 978 2 SM EUR 978 2
ST STD 678 2 ST STN 930 2
SA SAR 682 2 SA SAR 682 2
SN XOF 952 0 SN XOF 952 0
# MA 134 # MA 134

@ -8312,3 +8312,9 @@ FormatData/sv/NumberPatterns/2=#,##0 %
# bug #8081643 # bug #8081643
FormatData/sr-Latin/NumberElements/0=, FormatData/sr-Latin/NumberElements/0=,
FormatData/sr-Latin/NumberElements/1=. FormatData/sr-Latin/NumberElements/1=.
# bug #8187946
CurrencyNames//stn=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
CurrencyNames//lak=Lao Kip
CurrencyNames//php=Philippine Piso
CurrencyNames//azn=Azerbaijan Manat

@ -38,6 +38,7 @@
* 7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695 * 7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695
* 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916 * 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916
* 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918 * 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
* 8187946
* @summary Verify locale data * @summary Verify locale data
* @modules java.base/sun.util.resources * @modules java.base/sun.util.resources
* @modules jdk.localedata * @modules jdk.localedata