From 232804b8ab74a2489fdf2f1ff6c8d0c8adf6a6eb Mon Sep 17 00:00:00 2001 From: Leo Jiang Date: Tue, 28 Aug 2018 20:05:41 -0700 Subject: [PATCH] 8208746: ISO 4217 Amendment #168 update 8209775: ISO 4217 Amendment #169 update Reviewed-by: naoto --- make/data/currency/CurrencyData.properties | 8 ++++---- .../classes/sun/util/resources/CurrencyNames.properties | 4 +++- test/jdk/java/util/Currency/ValidateISO4217.java | 1 + test/jdk/java/util/Currency/tablea1.txt | 8 ++++---- test/jdk/sun/text/resources/LocaleData | 7 +++++-- test/jdk/sun/text/resources/LocaleDataTest.java | 3 ++- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/make/data/currency/CurrencyData.properties b/make/data/currency/CurrencyData.properties index 60a2ae893f4..28c5748e672 100644 --- a/make/data/currency/CurrencyData.properties +++ b/make/data/currency/CurrencyData.properties @@ -32,7 +32,7 @@ formatVersion=3 # Version of the currency code information in this class. # It is a serial number that accompanies with each amendment. -dataVersion=167 +dataVersion=169 # List of all valid ISO 4217 currency codes. # To ensure compatibility, do not remove codes. @@ -54,7 +54,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036 SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ 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-\ - UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ + UYU858-UZS860-VEB862-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\ ZWN942-ZWR935 @@ -509,7 +509,7 @@ SR=SRD SJ=NOK # Sint Maarten (Dutch part) SX=ANG -# SWAZILAND +# ESWATINI SZ=SZL # SWEDEN SE=SEK @@ -564,7 +564,7 @@ UZ=UZS # VANUATU VU=VUV # VENEZUELA (BOLIVARIAN REPUBLIC OF) -VE=VEF +VE=VES # VIET NAM VN=VND # VIRGIN ISLANDS, BRITISH diff --git a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties index e9400ef31ff..238186bf219 100644 --- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties +++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties @@ -252,6 +252,7 @@ UYU=UYU UZS=UZS VEB=VEB VEF=VEF +VES=VES VND=VND VUV=VUV WST=WST @@ -421,7 +422,7 @@ omr=Omani Rial pab=Panamanian Balboa pen=Peruvian Sol pgk=Papua New Guinean Kina -php=Philippine Piso +php=Philippine Peso pkr=Pakistani Rupee pln=Polish Zloty pte=Portuguese Escudo @@ -474,6 +475,7 @@ uyu=Uruguayan Peso uzs=Uzbekistan Som veb=Venezuelan Bol\u00edvar (1871-2008) vef=Venezuelan Bol\u00edvar +ves=Venezuelan Bol\u00edvar Soberano vnd=Vietnamese Dong vuv=Vanuatu Vatu wst=Samoan Tala diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java index ef25d117f3a..4a93dc3604d 100644 --- a/test/jdk/java/util/Currency/ValidateISO4217.java +++ b/test/jdk/java/util/Currency/ValidateISO4217.java @@ -24,6 +24,7 @@ * @test * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759 * 8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269 + * 8208746 8209775 * @summary Validate ISO 4217 data for Currency class. * @modules java.base/java.util:open * jdk.localedata diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt index cff8463d1a4..c38e6f8dd86 100644 --- a/test/jdk/java/util/Currency/tablea1.txt +++ b/test/jdk/java/util/Currency/tablea1.txt @@ -1,12 +1,12 @@ # # -# Amendments up until ISO 4217 AMENDMENT NUMBER 167 -# (As of 4 June 2018) +# Amendments up until ISO 4217 AMENDMENT NUMBER 169 +# (As of 27 Aug 2018) # # Version FILEVERSION=3 -DATAVERSION=167 +DATAVERSION=169 # ISO 4217 currency data AF AFN 971 2 @@ -268,7 +268,7 @@ UY UYU 858 2 #UY UYI 940 0 UZ UZS 860 2 VU VUV 548 0 -VE VEF 937 2 +VE VES 928 2 VN VND 704 0 VG USD 840 2 VI USD 840 2 diff --git a/test/jdk/sun/text/resources/LocaleData b/test/jdk/sun/text/resources/LocaleData index 73b8ea62caa..925bc11dd71 100644 --- a/test/jdk/sun/text/resources/LocaleData +++ b/test/jdk/sun/text/resources/LocaleData @@ -8315,8 +8315,11 @@ 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//php=Philippine Peso CurrencyNames//azn=Azerbaijan Manat -# bug $8193552 +# bug #8193552 CurrencyNames//mru=Mauritanian Ouguiya + +# bug #8208746 +CurrencyNames//ves=Venezuelan Bol\u00edvar Soberano diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java index e49ea36c110..54c5b5b7bb7 100644 --- a/test/jdk/sun/text/resources/LocaleDataTest.java +++ b/test/jdk/sun/text/resources/LocaleDataTest.java @@ -38,7 +38,8 @@ * 7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695 * 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 8134916 * 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918 - * 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 + * 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746 + * 8209775 * @summary Verify locale data * @modules java.base/sun.util.resources * @modules jdk.localedata