Mercurial > hg > openjdk > jdk8u > jdk
changeset 5143:27f0c08c427c jdk8-b31
Merge
author | katleman |
---|---|
date | Wed, 21 Mar 2012 12:18:56 -0700 |
parents | c373b5baa1e9 (current diff) f7dedbbb52eb (diff) |
children | 97cf70c92ee6 5e32f84f0ca9 |
files | |
diffstat | 8 files changed, 31 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/CurrencyData.properties Thu Mar 15 15:17:02 2012 -0700 +++ b/src/share/classes/java/util/CurrencyData.properties Wed Mar 21 12:18:56 2012 -0700 @@ -26,8 +26,7 @@ formatVersion=1 # Version of the currency code information in this class. -# It is a serial number that accompanies with each amendment, such as -# 'MAxxx.doc' +# It is a serial number that accompanies with each amendment. dataVersion=153 @@ -49,7 +48,7 @@ NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ - SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ + SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\ UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ @@ -463,6 +462,8 @@ WS=WST # SAN MARINO SM=EUR +# SOUTH SUDAN +SS=SSP # SAO TOME AND PRINCIPE ST=STD # SAUDI ARABIA
--- a/src/share/classes/java/util/LocaleISOData.java Thu Mar 15 15:17:02 2012 -0700 +++ b/src/share/classes/java/util/LocaleISOData.java Wed Mar 21 12:18:56 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -433,6 +433,7 @@ + "SN" + "SEN" // Senegal, Republic of + "SO" + "SOM" // Somalia, Somali Republic + "SR" + "SUR" // Suriname, Republic of + + "SS" + "SSD" // South Sudan + "ST" + "STP" // Sao Tome and Principe, Democratic Republic of + "SV" + "SLV" // El Salvador, Republic of + "SX" + "SXM" // Sint Maarten (Dutch part)
--- a/src/share/classes/sun/util/resources/CurrencyNames.properties Thu Mar 15 15:17:02 2012 -0700 +++ b/src/share/classes/sun/util/resources/CurrencyNames.properties Wed Mar 21 12:18:56 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ # # COPYRIGHT AND PERMISSION NOTICE # -# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved. +# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. # Distributed under the Terms of Use in http://www.unicode.org/copyright.html. # # Permission is hereby granted, free of charge, to any person obtaining @@ -226,6 +226,7 @@ SOS=SOS SRD=SRD SRG=SRG +SSP=SSP STD=STD SVC=SVC SYP=SYP @@ -443,6 +444,7 @@ sos=Somali Shilling srd=Surinamese Dollar srg=Surinamese Guilder +ssp=South Sudanese Pound std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra svc=Salvadoran Col\u00f3n syp=Syrian Pound @@ -486,7 +488,9 @@ xpd=Palladium xpf=CFP Franc xpt=Platinum +xsu=Sucre xts=Testing Currency Code +xua=ADB Unit of Account xxx=Unknown Currency yer=Yemeni Rial yum=Yugoslavian New Dinar (1994-2002)
--- a/src/share/classes/sun/util/resources/LocaleNames.properties Thu Mar 15 15:17:02 2012 -0700 +++ b/src/share/classes/sun/util/resources/LocaleNames.properties Wed Mar 21 12:18:56 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -1077,6 +1077,7 @@ SN=Senegal SO=Somalia SR=Suriname +SS=South Sudan ST=Sao Tome And Principe SV=El Salvador SX=Sint Maarten (Dutch part)
--- a/test/java/util/Currency/tablea1.txt Thu Mar 15 15:17:02 2012 -0700 +++ b/test/java/util/Currency/tablea1.txt Wed Mar 21 12:18:56 2012 -0700 @@ -1,6 +1,6 @@ # # -# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA153.doc +# Amendments up until ISO 4217 AMENDMENT NUMBER 153 # (As of 12 January 2012) # @@ -227,6 +227,7 @@ SB SBD 90 2 SO SOS 706 2 ZA ZAR 710 2 +SS SSP 728 2 ES EUR 978 2 LK LKR 144 2 SD SDG 938 2
--- a/test/java/util/Locale/LocaleTest.java Thu Mar 15 15:17:02 2012 -0700 +++ b/test/java/util/Locale/LocaleTest.java Wed Mar 21 12:18:56 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613 * 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951 * 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549 - * 6786276 7066203 + * 6786276 7066203 7085757 * @summary test Locales */ /* @@ -400,7 +400,7 @@ } /** - * @bug 4106155 4118587 7066203 + * @bug 4106155 4118587 7066203 7085757 */ public void TestGetLangsAndCountries() { // It didn't seem right to just do an exhaustive test of everything here, so I check @@ -440,8 +440,8 @@ String[] spotCheck2 = { "US", "CA", "GB", "FR", "DE", "IT", "JP", "KR", "CN", "TW", "TH" }; - if (test.length != 249) - errln("Expected getISOCountries to return 249 countries; it returned " + test.length); + if (test.length != 250) + errln("Expected getISOCountries to return 250 countries; it returned " + test.length); else { for (int i = 0; i < spotCheck2.length; i++) { int j;
--- a/test/sun/text/resources/LocaleData Thu Mar 15 15:17:02 2012 -0700 +++ b/test/sun/text/resources/LocaleData Wed Mar 21 12:18:56 2012 -0700 @@ -7019,3 +7019,11 @@ FormatData/bg/DateTimePatterns/5=dd MMMM y FormatData/bg/DateTimePatterns/6=dd.MM.yyyy FormatData/bg/DateTimePatterns/7=dd.MM.yy + +# bug 7085757 +CurrencyNames//SSP=SSP +CurrencyNames//ssp=South Sudanese Pound +CurrencyNames//xsu=Sucre +CurrencyNames//xua=ADB Unit of Account +LocaleNames//SS=South Sudan +LocaleNames/en/SS=South Sudan \ No newline at end of file
--- a/test/sun/text/resources/LocaleDataTest.java Thu Mar 15 15:17:02 2012 -0700 +++ b/test/sun/text/resources/LocaleDataTest.java Wed Mar 21 12:18:56 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495 - * 7003124 + * 7003124 7085757 * @summary Verify locale data * */