From 7e1ed8f785adf7272559c3a82a028f3aa615fedb Mon Sep 17 00:00:00 2001 From: Yong Jeffrey Huang Date: Wed, 29 Jul 2015 23:36:51 -0700 Subject: [PATCH] 8129361: ISO 4217 amendment 160 Reviewed-by: naoto --- .../data/currency/CurrencyData.properties | 78 +++++++++---------- .../util/resources/CurrencyNames.properties | 5 +- jdk/test/java/util/Currency/tablea1.txt | 6 +- jdk/test/sun/text/resources/LocaleData | 3 + .../sun/text/resources/LocaleDataTest.java | 2 +- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/jdk/make/data/currency/CurrencyData.properties b/jdk/make/data/currency/CurrencyData.properties index 4123814c849..808d01d6958 100644 --- a/jdk/make/data/currency/CurrencyData.properties +++ b/jdk/make/data/currency/CurrencyData.properties @@ -31,7 +31,7 @@ formatVersion=2 # Version of the currency code information in this class. # It is a serial number that accompanies with each amendment. -dataVersion=159 +dataVersion=160 # List of all valid ISO 4217 currency codes. # To ensure compatibility, do not remove codes. @@ -109,7 +109,7 @@ AU=AUD AT=EUR # AZERBAIJAN AZ=AZN -# BAHAMAS +# BAHAMAS (THE) BS=BSD # BAHRAIN BH=BHD @@ -131,7 +131,7 @@ BM=BMD BQ=USD # BHUTAN BT=BTN -# BOLIVIA +# BOLIVIA (PLURINATIONAL STATE OF) BO=BOB # BOSNIA AND HERZEGOVINA BA=BAM @@ -141,7 +141,7 @@ BW=BWP BV=NOK # BRAZIL BR=BRL -# BRITISH INDIAN OCEAN TERRITORY +# BRITISH INDIAN OCEAN TERRITORY (THE) IO=USD # BRUNEI DARUSSALAM BN=BND @@ -159,9 +159,9 @@ CM=XAF CA=CAD # CAPE VERDE CV=CVE -# CAYMAN ISLANDS +# CAYMAN ISLANDS (THE) KY=KYD -# CENTRAL AFRICAN REPUBLIC +# CENTRAL AFRICAN REPUBLIC (THE) CF=XAF # CHAD TD=XAF @@ -171,17 +171,17 @@ CL=CLP CN=CNY # CHRISTMAS ISLAND CX=AUD -# COCOS (KEELING) ISLANDS +# COCOS (KEELING) ISLANDS (THE) CC=AUD # COLOMBIA CO=COP -# COMOROS +# COMOROS (THE) KM=KMF -# CONGO +# CONGO (THE) CG=XAF -# CONGO, THE DEMOCRATIC REPUBLIC OF THE +# CONGO (THE DEMOCRATIC REPUBLIC OF THE) CD=CDF -# COOK ISLANDS +# COOK ISLANDS (THE) CK=NZD # COSTA RICA CR=CRC @@ -195,7 +195,7 @@ CU=CUP CW=ANG # CYPRUS CY=EUR -# CZECH REPUBLIC +# CZECH REPUBLIC (THE) CZ=CZK # DENMARK DK=DKK @@ -203,7 +203,7 @@ DK=DKK DJ=DJF # DOMINICA DM=XCD -# DOMINICAN REPUBLIC +# DOMINICAN REPUBLIC (THE) DO=DOP # ECUADOR EC=USD @@ -220,9 +220,9 @@ ER=ERN EE=EUR # ETHIOPIA ET=ETB -# FALKLAND ISLANDS (MALVINAS) +# FALKLAND ISLANDS (THE) [MALVINAS] FK=FKP -# FAROE ISLANDS +# FAROE ISLANDS (THE) FO=DKK # FIJI FJ=FJD @@ -234,11 +234,11 @@ FR=EUR GF=EUR # FRENCH POLYNESIA PF=XPF -# FRENCH SOUTHERN TERRITORIES +# FRENCH SOUTHERN TERRITORIES (THE) TF=EUR # GABON GA=XAF -# GAMBIA +# GAMBIA (THE) GM=GMD # GEORGIA GE=GEL @@ -272,7 +272,7 @@ GY=GYD HT=HTG # HEARD ISLAND AND MCDONALD ISLANDS HM=AUD -# HOLY SEE (VATICAN CITY STATE) +# HOLY SEE (THE) VA=EUR # HONDURAS HN=HNL @@ -286,7 +286,7 @@ IS=ISK IN=INR # INDONESIA ID=IDR -# IRAN, ISLAMIC REPUBLIC OF +# IRAN (ISLAMIC REPUBLIC OF) IR=IRR # IRAQ IQ=IQD @@ -312,15 +312,15 @@ KZ=KZT KE=KES # KIRIBATI KI=AUD -# KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF +# KOREA (THE DEMOCRATIC PEOPLE'S REPUBLIC OF) KP=KPW -# KOREA, REPUBLIC OF +# KOREA (THE REPUBLIC OF) KR=KRW # KUWAIT KW=KWD # KYRGYZSTAN KG=KGS -# LAO PEOPLE'S DEMOCRATIC REPUBLIC +# LAO PEOPLE'S DEMOCRATIC REPUBLIC (THE) LA=LAK # LATVIA LV=LVL;2013-12-31-22-00-00;EUR @@ -340,7 +340,7 @@ LT=LTL;2014-12-31-22-00-00;EUR LU=EUR # MACAU MO=MOP -# MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF +# MACEDONIA (THE FORMER YUGOSLAV REPUBLIC OF) MK=MKD # MADAGASCAR MG=MGA @@ -354,7 +354,7 @@ MV=MVR ML=XOF # MALTA MT=EUR -# MARSHALL ISLANDS +# MARSHALL ISLANDS (THE) MH=USD # MARTINIQUE MQ=EUR @@ -366,9 +366,9 @@ MU=MUR YT=EUR # MEXICO MX=MXN -# MICRONESIA, FEDERATED STATES OF +# MICRONESIA (FEDERATED STATES OF) FM=USD -# MOLDOVA, REPUBLIC OF +# MOLDOVA (THE REPUBLIC OF) MD=MDL # MONACO MC=EUR @@ -390,7 +390,7 @@ NA=NAD NR=AUD # NEPAL NP=NPR -# NETHERLANDS +# NETHERLANDS (THE) NL=EUR # NETHERLANDS ANTILLES AN=ANG @@ -400,7 +400,7 @@ NC=XPF NZ=NZD # NICARAGUA NI=NIO -# NIGER +# NIGER (THE) NE=XOF # NIGERIA NG=NGN @@ -408,7 +408,7 @@ NG=NGN NU=NZD # NORFOLK ISLAND NF=AUD -# NORTHERN MARIANA ISLANDS +# NORTHERN MARIANA ISLANDS (THE) MP=USD # NORWAY NO=NOK @@ -428,7 +428,7 @@ PG=PGK PY=PYG # PERU PE=PEN -# PHILIPPINES +# PHILIPPINES (THE) PH=PHP # PITCAIRN PN=NZD @@ -444,7 +444,7 @@ QA=QAR RE=EUR # ROMANIA RO=RON -# RUSSIAN FEDERATION +# RUSSIAN FEDERATION (THE) RU=RUB # RWANDA RW=RWF @@ -500,7 +500,7 @@ GS=GBP ES=EUR # SRI LANKA LK=LKR -# SUDAN +# SUDAN (THE) SD=SDG # SURINAME SR=SRD @@ -516,7 +516,7 @@ SE=SEK CH=CHF # SYRIAN ARAB REPUBLIC SY=SYP -# TAIWAN +# TAIWAN (PROVINCE OF CHINA) TW=TWD # TAJIKISTAN TJ=TJS @@ -540,7 +540,7 @@ TN=TND TR=TRY # TURKMENISTAN TM=TMT -# TURKS AND CAICOS ISLANDS +# TURKS AND CAICOS ISLANDS (THE) TC=USD # TUVALU TV=AUD @@ -548,13 +548,13 @@ TV=AUD UG=UGX # UKRAINE UA=UAH -# UNITED ARAB EMIRATES +# UNITED ARAB EMIRATES (THE) AE=AED -# UNITED KINGDOM +# UNITED KINGDOM OF GREAT BRITAIN AND NORTHERN IRELAND (THE) GB=GBP -# UNITED STATES +# UNITED STATES OF AMERICA (THE) US=USD -# UNITED STATES MINOR OUTLYING ISLANDS +# UNITED STATES MINOR OUTLYING ISLANDS (THE) UM=USD # URUGUAY UY=UYU @@ -562,7 +562,7 @@ UY=UYU UZ=UZS # VANUATU VU=VUV -# VENEZUELA +# VENEZUELA (BOLIVARIAN REPUBLIC OF) VE=VEF # VIET NAM VN=VND diff --git a/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties index 55ecf42d704..b002202875b 100644 --- a/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties +++ b/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties @@ -60,9 +60,6 @@ # or other dealings in these Data Files or Software without prior # written authorization of the copyright holder. -# -# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! -# ADP=ADP AED=AED AFA=AFA @@ -358,7 +355,7 @@ gwp=Guinea-Bissau Peso gyd=Guyanaese Dollar hkd=Hong Kong Dollar hnl=Honduran Lempira -hrk=Croatian Kuna +hrk=Kuna htg=Haitian Gourde huf=Hungarian Forint idr=Indonesian Rupiah diff --git a/jdk/test/java/util/Currency/tablea1.txt b/jdk/test/java/util/Currency/tablea1.txt index 12c9f7e2024..92e43adf2be 100644 --- a/jdk/test/java/util/Currency/tablea1.txt +++ b/jdk/test/java/util/Currency/tablea1.txt @@ -1,12 +1,12 @@ # # -# Amendments up until ISO 4217 AMENDMENT NUMBER 159 -# (As of 15 August 2014) +# Amendments up until ISO 4217 AMENDMENT NUMBER 160 +# (As of 19 June 2015) # # Version FILEVERSION=2 -DATAVERSION=159 +DATAVERSION=160 # ISO 4217 currency data AF AFN 971 2 diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData index 38d3109fcf9..53516a7ead4 100644 --- a/jdk/test/sun/text/resources/LocaleData +++ b/jdk/test/sun/text/resources/LocaleData @@ -8284,3 +8284,6 @@ FormatData/fi/DatePatterns/3=d.M.yyyy # bug #8075173 FormatData/de/standalone.MonthAbbreviations/2=M\u00e4r + +# bug #8129361 +CurrencyNames//hrk=Kuna diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java index 04bff28d95c..626842ff2e2 100644 --- a/jdk/test/sun/text/resources/LocaleDataTest.java +++ b/jdk/test/sun/text/resources/LocaleDataTest.java @@ -36,7 +36,7 @@ * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509 * 7114053 7074882 7040556 8008577 8013836 8021121 6192407 6931564 8027695 - * 8017142 8037343 8055222 8042126 8074791 8075173 8080774 + * 8017142 8037343 8055222 8042126 8074791 8075173 8080774 8129361 * @summary Verify locale data * @run main LocaleDataTest * @run main LocaleDataTest -cldr