1.1 --- a/src/share/classes/java/util/CurrencyData.properties Thu Mar 15 15:17:02 2012 -0700
1.2 +++ b/src/share/classes/java/util/CurrencyData.properties Wed Mar 21 12:18:56 2012 -0700
1.3 @@ -26,8 +26,7 @@
1.4 formatVersion=1
1.5
1.6 # Version of the currency code information in this class.
1.7 -# It is a serial number that accompanies with each amendment, such as
1.8 -# 'MAxxx.doc'
1.9 +# It is a serial number that accompanies with each amendment.
1.10
1.11 dataVersion=153
1.12
1.13 @@ -49,7 +48,7 @@
1.14 NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
1.15 PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
1.16 SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
1.17 - SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
1.18 + SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
1.19 TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\
1.20 UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
1.21 XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
1.22 @@ -463,6 +462,8 @@
1.23 WS=WST
1.24 # SAN MARINO
1.25 SM=EUR
1.26 +# SOUTH SUDAN
1.27 +SS=SSP
1.28 # SAO TOME AND PRINCIPE
1.29 ST=STD
1.30 # SAUDI ARABIA
2.1 --- a/src/share/classes/java/util/LocaleISOData.java Thu Mar 15 15:17:02 2012 -0700
2.2 +++ b/src/share/classes/java/util/LocaleISOData.java Wed Mar 21 12:18:56 2012 -0700
2.3 @@ -1,5 +1,5 @@
2.4 /*
2.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
2.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2.8 *
2.9 * This code is free software; you can redistribute it and/or modify it
2.10 @@ -433,6 +433,7 @@
2.11 + "SN" + "SEN" // Senegal, Republic of
2.12 + "SO" + "SOM" // Somalia, Somali Republic
2.13 + "SR" + "SUR" // Suriname, Republic of
2.14 + + "SS" + "SSD" // South Sudan
2.15 + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of
2.16 + "SV" + "SLV" // El Salvador, Republic of
2.17 + "SX" + "SXM" // Sint Maarten (Dutch part)
3.1 --- a/src/share/classes/sun/util/resources/CurrencyNames.properties Thu Mar 15 15:17:02 2012 -0700
3.2 +++ b/src/share/classes/sun/util/resources/CurrencyNames.properties Wed Mar 21 12:18:56 2012 -0700
3.3 @@ -1,5 +1,5 @@
3.4 #
3.5 -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
3.6 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
3.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3.8 #
3.9 # This code is free software; you can redistribute it and/or modify it
3.10 @@ -26,7 +26,7 @@
3.11 #
3.12 # COPYRIGHT AND PERMISSION NOTICE
3.13 #
3.14 -# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
3.15 +# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
3.16 # Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
3.17 #
3.18 # Permission is hereby granted, free of charge, to any person obtaining
3.19 @@ -226,6 +226,7 @@
3.20 SOS=SOS
3.21 SRD=SRD
3.22 SRG=SRG
3.23 +SSP=SSP
3.24 STD=STD
3.25 SVC=SVC
3.26 SYP=SYP
3.27 @@ -443,6 +444,7 @@
3.28 sos=Somali Shilling
3.29 srd=Surinamese Dollar
3.30 srg=Surinamese Guilder
3.31 +ssp=South Sudanese Pound
3.32 std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
3.33 svc=Salvadoran Col\u00f3n
3.34 syp=Syrian Pound
3.35 @@ -486,7 +488,9 @@
3.36 xpd=Palladium
3.37 xpf=CFP Franc
3.38 xpt=Platinum
3.39 +xsu=Sucre
3.40 xts=Testing Currency Code
3.41 +xua=ADB Unit of Account
3.42 xxx=Unknown Currency
3.43 yer=Yemeni Rial
3.44 yum=Yugoslavian New Dinar (1994-2002)
4.1 --- a/src/share/classes/sun/util/resources/LocaleNames.properties Thu Mar 15 15:17:02 2012 -0700
4.2 +++ b/src/share/classes/sun/util/resources/LocaleNames.properties Wed Mar 21 12:18:56 2012 -0700
4.3 @@ -1,5 +1,5 @@
4.4 #
4.5 -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
4.6 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
4.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4.8 #
4.9 # This code is free software; you can redistribute it and/or modify it
4.10 @@ -1077,6 +1077,7 @@
4.11 SN=Senegal
4.12 SO=Somalia
4.13 SR=Suriname
4.14 +SS=South Sudan
4.15 ST=Sao Tome And Principe
4.16 SV=El Salvador
4.17 SX=Sint Maarten (Dutch part)
5.1 --- a/test/java/util/Currency/tablea1.txt Thu Mar 15 15:17:02 2012 -0700
5.2 +++ b/test/java/util/Currency/tablea1.txt Wed Mar 21 12:18:56 2012 -0700
5.3 @@ -1,6 +1,6 @@
5.4 #
5.5 #
5.6 -# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA153.doc
5.7 +# Amendments up until ISO 4217 AMENDMENT NUMBER 153
5.8 # (As of 12 January 2012)
5.9 #
5.10
5.11 @@ -227,6 +227,7 @@
5.12 SB SBD 90 2
5.13 SO SOS 706 2
5.14 ZA ZAR 710 2
5.15 +SS SSP 728 2
5.16 ES EUR 978 2
5.17 LK LKR 144 2
5.18 SD SDG 938 2
6.1 --- a/test/java/util/Locale/LocaleTest.java Thu Mar 15 15:17:02 2012 -0700
6.2 +++ b/test/java/util/Locale/LocaleTest.java Wed Mar 21 12:18:56 2012 -0700
6.3 @@ -1,5 +1,5 @@
6.4 /*
6.5 - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
6.6 + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
6.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6.8 *
6.9 * This code is free software; you can redistribute it and/or modify it
6.10 @@ -25,7 +25,7 @@
6.11 * @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613
6.12 * 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951
6.13 * 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549
6.14 - * 6786276 7066203
6.15 + * 6786276 7066203 7085757
6.16 * @summary test Locales
6.17 */
6.18 /*
6.19 @@ -400,7 +400,7 @@
6.20 }
6.21
6.22 /**
6.23 - * @bug 4106155 4118587 7066203
6.24 + * @bug 4106155 4118587 7066203 7085757
6.25 */
6.26 public void TestGetLangsAndCountries() {
6.27 // It didn't seem right to just do an exhaustive test of everything here, so I check
6.28 @@ -440,8 +440,8 @@
6.29 String[] spotCheck2 = { "US", "CA", "GB", "FR", "DE", "IT", "JP", "KR", "CN", "TW", "TH" };
6.30
6.31
6.32 - if (test.length != 249)
6.33 - errln("Expected getISOCountries to return 249 countries; it returned " + test.length);
6.34 + if (test.length != 250)
6.35 + errln("Expected getISOCountries to return 250 countries; it returned " + test.length);
6.36 else {
6.37 for (int i = 0; i < spotCheck2.length; i++) {
6.38 int j;
7.1 --- a/test/sun/text/resources/LocaleData Thu Mar 15 15:17:02 2012 -0700
7.2 +++ b/test/sun/text/resources/LocaleData Wed Mar 21 12:18:56 2012 -0700
7.3 @@ -7019,3 +7019,11 @@
7.4 FormatData/bg/DateTimePatterns/5=dd MMMM y
7.5 FormatData/bg/DateTimePatterns/6=dd.MM.yyyy
7.6 FormatData/bg/DateTimePatterns/7=dd.MM.yy
7.7 +
7.8 +# bug 7085757
7.9 +CurrencyNames//SSP=SSP
7.10 +CurrencyNames//ssp=South Sudanese Pound
7.11 +CurrencyNames//xsu=Sucre
7.12 +CurrencyNames//xua=ADB Unit of Account
7.13 +LocaleNames//SS=South Sudan
7.14 +LocaleNames/en/SS=South Sudan
7.15 \ No newline at end of file
8.1 --- a/test/sun/text/resources/LocaleDataTest.java Thu Mar 15 15:17:02 2012 -0700
8.2 +++ b/test/sun/text/resources/LocaleDataTest.java Wed Mar 21 12:18:56 2012 -0700
8.3 @@ -1,5 +1,5 @@
8.4 /*
8.5 - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
8.6 + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
8.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8.8 *
8.9 * This code is free software; you can redistribute it and/or modify it
8.10 @@ -34,7 +34,7 @@
8.11 * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
8.12 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
8.13 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
8.14 - * 7003124
8.15 + * 7003124 7085757
8.16 * @summary Verify locale data
8.17 *
8.18 */