Mercurial > hg > openjdk > jdk8u > jdk
changeset 10422:ca1adc7c8483 jdk8u31-b08
8055222: Currency update needed for ISO 4217 Amendment #159
Reviewed-by: naoto
author | yhuang |
---|---|
date | Mon, 08 Sep 2014 20:01:46 -0700 |
parents | 51422e80e75c |
children | a2a7f63b811c |
files | src/share/classes/java/util/CurrencyData.properties src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties test/java/util/Currency/tablea1.txt test/sun/text/resources/LocaleData test/sun/text/resources/LocaleDataTest.java |
diffstat | 5 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/CurrencyData.properties Fri Sep 12 15:17:05 2014 +0400 +++ b/src/share/classes/java/util/CurrencyData.properties Mon Sep 08 20:01:46 2014 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2014, 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 @@ -28,7 +28,7 @@ # Version of the currency code information in this class. # It is a serial number that accompanies with each amendment. -dataVersion=156 +dataVersion=159 # List of all valid ISO 4217 currency codes. # To ensure compatibility, do not remove codes. @@ -332,7 +332,7 @@ # LIECHTENSTEIN LI=CHF # LITHUANIA -LT=LTL +LT=LTL;2014-12-31-22-00-00;EUR # LUXEMBOURG LU=EUR # MACAU
--- a/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties Fri Sep 12 15:17:05 2014 +0400 +++ b/src/share/classes/sun/util/resources/lt/CurrencyNames_lt_LT.properties Mon Sep 08 20:01:46 2014 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2014, 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 @@ -35,4 +35,5 @@ # This notice and attribution to Taligent may not be removed. # Taligent is a registered trademark of Taligent, Inc. +EUR=\u20AC LTL=Lt
--- a/test/java/util/Currency/tablea1.txt Fri Sep 12 15:17:05 2014 +0400 +++ b/test/java/util/Currency/tablea1.txt Mon Sep 08 20:01:46 2014 -0700 @@ -1,12 +1,12 @@ # # -# Amendments up until ISO 4217 AMENDMENT NUMBER 156 -# (As of 23 July 2013) +# Amendments up until ISO 4217 AMENDMENT NUMBER 159 +# (As of 15 August 2014) # # Version FILEVERSION=1 -DATAVERSION=156 +DATAVERSION=159 # ISO 4217 currency data AF AFN 971 2 @@ -142,7 +142,7 @@ LR LRD 430 2 LY LYD 434 3 LI CHF 756 2 -LT LTL 440 2 +LT LTL 440 2 2014-12-31-22-00-00 EUR 978 2 LU EUR 978 2 MO MOP 446 2 MK MKD 807 2
--- a/test/sun/text/resources/LocaleData Fri Sep 12 15:17:05 2014 +0400 +++ b/test/sun/text/resources/LocaleData Mon Sep 08 20:01:46 2014 -0700 @@ -7699,3 +7699,6 @@ # bug 8037343 FormatData/es_DO/DatePatterns/2=dd/MM/yyyy FormatData/es_DO/DatePatterns/3=dd/MM/yy + +# bug 8055222 +CurrencyNames/lt_LT/EUR=\u20AC
--- a/test/sun/text/resources/LocaleDataTest.java Fri Sep 12 15:17:05 2014 +0400 +++ b/test/sun/text/resources/LocaleDataTest.java Mon Sep 08 20:01:46 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2014, 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 @@ -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 8013836 8021121 6192407 6931564 8027695 7090826 - * 8017142 8037343 + * 8017142 8037343 8055222 * @summary Verify locale data * */