OpenJDK / jdk / jdk12

changeset 41001:a9586ec364da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Fri, 02 Sep 2016 21:42:27 +0000
parents 89ceb93b1af5 d4774f7f8484
children cb178d94b40e
files
diffstat 8 files changed, 27 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/data/currency/CurrencyData.properties	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/make/data/currency/CurrencyData.properties	Fri Sep 02 21:42:27 2016 +0000
@@ -32,14 +32,14 @@
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=160
+dataVersion=162
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
 
 all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036-\
     AWG533-AYM945-AZM031-AZN944-BAM977-BBD052-BDT050-BEF056-BGL100-BGN975-BHD048-BIF108-\
-    BMD060-BND096-BOB068-BOV984-BRL986-BSD044-BTN064-BWP072-BYB112-BYR974-\
+    BMD060-BND096-BOB068-BOV984-BRL986-BSD044-BTN064-BWP072-BYB112-BYR974-BYN933-\
     BZD084-CAD124-CDF976-CHE947-CHF756-CHW948-CLF990-CLP152-CNY156-COP170-COU970-CRC188-CSD891-CUP192-CUC931-\
     CVE132-CYP196-CZK203-DEM276-DJF262-DKK208-DOP214-DZD012-EEK233-EGP818-\
     ERN232-ESP724-ETB230-EUR978-FIM246-FJD242-FKP238-FRF250-GBP826-GEL981-\
@@ -119,7 +119,7 @@
 # BARBADOS
 BB=BBD
 # BELARUS
-BY=BYR
+BY=BYN
 # BELGIUM
 BE=EUR
 # BELIZE
--- a/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties	Fri Sep 02 21:42:27 2016 +0000
@@ -92,6 +92,7 @@
 BTN=BTN
 BWP=BWP
 BYB=BYB
+BYN=BYN
 BYR=BYR
 BZD=BZD
 CAD=CAD
@@ -310,8 +311,9 @@
 bsd=Bahamian Dollar
 btn=Bhutanese Ngultrum
 bwp=Botswanan Pula
-byb=Belarusian New Ruble (1994-1999)
-byr=Belarusian Ruble
+byb=Belarusian Ruble (1994-1999)
+byn=Belarusian Ruble
+byr=Belarusian Ruble (2000-2016)
 bzd=Belize Dollar
 cad=Canadian Dollar
 cdf=Congolese Franc
@@ -399,7 +401,7 @@
 mtl=Maltese Lira
 mur=Mauritian Rupee
 mvr=Maldivian Rufiyaa
-mwk=Malawian Kwacha
+mwk=Malawian Malawi Kwacha
 mxn=Mexican Peso
 mxv=Mexican Investment Unit
 myr=Malaysian Ringgit
@@ -414,7 +416,7 @@
 nzd=New Zealand Dollar
 omr=Omani Rial
 pab=Panamanian Balboa
-pen=Peruvian Nuevo Sol
+pen=Peruvian Sol
 pgk=Papua New Guinean Kina
 php=Philippine Peso
 pkr=Pakistani Rupee
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_be_BY.properties	Fri Sep 02 21:42:27 2016 +0000
@@ -35,4 +35,5 @@
 # This notice and attribution to Taligent may not be removed.
 # Taligent is a registered trademark of Taligent, Inc.
 
+BYN=\u0420\u0443\u0431
 BYR=\u0420\u0443\u0431
--- a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties	Fri Sep 02 21:42:27 2016 +0000
@@ -265,8 +265,6 @@
 	No constructor matching {0} found in {1}.
 javac.err.wrong.number.args=\
 	Wrong number of arguments in {0}.
-javac.err.wrong.number.args=\
-	Wrong number of arguments in {0}.
 javac.err.forward.ref=\
 	Can''t make forward reference to {0} in {1}.
 javac.err.array.dim.missing=\
--- a/jdk/test/java/util/Currency/ValidateISO4217.java	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/test/java/util/Currency/ValidateISO4217.java	Fri Sep 02 21:42:27 2016 +0000
@@ -23,7 +23,7 @@
 /*
  * @test
  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
- *     8039317 8074350 8074351
+ *      8039317 8074350 8074351 8145952
  * @summary Validate ISO 4217 data for Currency class.
  */
 
@@ -93,7 +93,7 @@
 
     /* Codes that are obsolete, do not have related country */
     static final String otherCodes =
-        "ADP-AFA-ATS-AYM-AZM-BEF-BGL-BOV-BYB-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-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;
 
--- a/jdk/test/java/util/Currency/tablea1.txt	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/test/java/util/Currency/tablea1.txt	Fri Sep 02 21:42:27 2016 +0000
@@ -1,12 +1,12 @@
 #
 #
-# Amendments up until ISO 4217 AMENDMENT NUMBER 160
-#   (As of 19 June 2015)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 162
+#   (As of 30 Auguest 2016)
 #
 
 # Version
 FILEVERSION=3
-DATAVERSION=160
+DATAVERSION=162
 
 # ISO 4217 currency data
 AF	AFN	971	2
@@ -28,7 +28,7 @@
 BH	BHD	48	3
 BD	BDT	50	2
 BB	BBD	52	2
-BY	BYR	974	0
+BY	BYN	933	2
 BE	EUR	978	2
 BZ	BZD	84	2
 BJ	XOF	952	0
--- a/jdk/test/sun/text/resources/LocaleData	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/test/sun/text/resources/LocaleData	Fri Sep 02 21:42:27 2016 +0000
@@ -6403,8 +6403,8 @@
 CurrencyNames//bif=Burundian Franc
 CurrencyNames//bob=Bolivian Boliviano
 CurrencyNames//btn=Bhutanese Ngultrum
-CurrencyNames//byb=Belarusian New Ruble (1994-1999)
-CurrencyNames//byr=Belarusian Ruble
+CurrencyNames//byb=Belarusian Ruble (1994-1999)
+CurrencyNames//byr=Belarusian Ruble (2000-2016)
 CurrencyNames//cdf=Congolese Franc
 CurrencyNames//clf=Chilean Unit of Account (UF)
 CurrencyNames//cny=Chinese Yuan
@@ -6436,7 +6436,6 @@
 CurrencyNames//mro=Mauritanian Ouguiya
 CurrencyNames//mur=Mauritian Rupee
 CurrencyNames//mvr=Maldivian Rufiyaa
-CurrencyNames//mwk=Malawian Kwacha
 CurrencyNames//mxv=Mexican Investment Unit
 CurrencyNames//mzm=Mozambican Metical (1980-2006)
 CurrencyNames//mzn=Mozambican Metical
@@ -6444,7 +6443,6 @@
 CurrencyNames//nio=Nicaraguan C\u00f3rdoba
 CurrencyNames//nlg=Dutch Guilder
 CurrencyNames//omr=Omani Rial
-CurrencyNames//pen=Peruvian Nuevo Sol
 CurrencyNames//pgk=Papua New Guinean Kina
 CurrencyNames//pkr=Pakistani Rupee
 CurrencyNames//pyg=Paraguayan Guarani
@@ -8287,3 +8285,11 @@
 
 # bug #8129361
 CurrencyNames//hrk=Kuna
+
+# bug #8164784
+CurrencyNames//mwk=Malawian Malawi Kwacha
+CurrencyNames//pen=Peruvian Sol
+
+# bug #8145952
+CurrencyNames//byn=Belarusian Ruble
+CurrencyNames/be_BY/BYN=\u0420\u0443\u0431
--- a/jdk/test/sun/text/resources/LocaleDataTest.java	Fri Sep 02 11:29:02 2016 -0700
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java	Fri Sep 02 21:42:27 2016 +0000
@@ -37,7 +37,7 @@
  *      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 8129361 8134916
- *      8145136
+ *      8145136 8145952 8164784
  * @summary Verify locale data
  * @modules java.base/sun.util.resources
  * @run main LocaleDataTest
© 2007, 2022 Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks