Mercurial > hg > openjdk > jdk7 > jdk
changeset 4318:dd06e8d3da91
Merge
author | asaha |
---|---|
date | Thu, 21 Apr 2011 15:43:07 -0700 |
parents | 6133c9ee3a01 (diff) b626f78c57e1 (current diff) |
children | b2295905901a |
files | |
diffstat | 7 files changed, 28 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs.gmk Thu Apr 21 08:38:26 2011 -0700 +++ b/make/common/shared/Defs.gmk Thu Apr 21 15:43:07 2011 -0700 @@ -218,11 +218,7 @@ else LAUNCHER_NAME = java PRODUCT_NAME = Java(TM) - ifeq ($(J4B), true) - PRODUCT_SUFFIX = SE Runtime Environment for Business - else - PRODUCT_SUFFIX = SE Runtime Environment - endif + PRODUCT_SUFFIX = SE Runtime Environment JDK_RC_PLATFORM_NAME = Platform SE COMPANY_NAME = Oracle Corporation endif
--- a/src/share/classes/sun/util/resources/CurrencyNames_de.properties Thu Apr 21 08:38:26 2011 -0700 +++ b/src/share/classes/sun/util/resources/CurrencyNames_de.properties Thu Apr 21 15:43:07 2011 -0700 @@ -65,6 +65,8 @@ # adp=Andorranische Pesete aed=UAE Dirham +afa=Afghani (1927-2002) +afn=Afghani all=Lek amd=Dram ang=Niederl. Antillen Gulden @@ -85,6 +87,7 @@ bif=Burundi-Franc bmd=Bermuda-Dollar bnd=Brunei-Dollar +bob=Boliviano bov=Mvdol brl=Real bsd=Bahama-Dollar @@ -106,6 +109,7 @@ cve=Kap Verde Escudo cyp=Zypern-Pfund czk=Tschechische Krone +dem=Deutsche Mark djf=Dschibuti-Franc dkk=D\u00e4nische Krone dop=Dominikanischer Peso @@ -176,7 +180,9 @@ mtl=Maltesische Lira mur=Mauritius-Rupie mvr=Rufiyaa +mwk=Malawi Kwacha mxn=Mexikanischer Peso +mxv=Mexican Unidad de Inversion (UDI) myr=Malaysischer Ringgit mzm=Alter Metical mzn=Metical @@ -217,6 +223,7 @@ srd=Surinamischer Dollar srg=Suriname Gulden std=Dobra +svc=El Salvador Colon syp=Syrisches Pfund szl=Lilangeni thb=Baht
--- a/src/share/classes/sun/util/resources/CurrencyNames_it.properties Thu Apr 21 08:38:26 2011 -0700 +++ b/src/share/classes/sun/util/resources/CurrencyNames_it.properties Thu Apr 21 15:43:07 2011 -0700 @@ -86,6 +86,7 @@ bif=Franco del Burundi bmd=Dollaro delle Bermuda bnd=Dollaro del Brunei +bob=Boliviano bov=Mvdol Boliviano brl=Real Brasiliano bsd=Dollaro delle Bahamas
--- a/test/java/lang/invoke/ClassValueTest.java Thu Apr 21 08:38:26 2011 -0700 +++ b/test/java/lang/invoke/ClassValueTest.java Thu Apr 21 15:43:07 2011 -0700 @@ -52,9 +52,9 @@ static String nameForCV1(Class<?> type) { return "CV1:" + type.getName(); } - static int countForCV1; - static final ClassValue<String> CV1 = new CV1(); - private static class CV1 extends ClassValue<String> { + int countForCV1; + final ClassValue<String> CV1 = new CV1(); + private class CV1 extends ClassValue<String> { protected String computeValue(Class<?> type) { countForCV1++; return nameForCV1(type); @@ -103,8 +103,8 @@ static String nameForCVN(Class<?> type, int n) { return "CV[" + n + "]" + type.getName(); } - static int countForCVN; - static class CVN extends ClassValue<String> { + int countForCVN; + class CVN extends ClassValue<String> { final int n; CVN(int n) { this.n = n; } protected String computeValue(Class<?> type) {
--- a/test/java/util/Currency/CurrencyTest.java Thu Apr 21 08:38:26 2011 -0700 +++ b/test/java/util/Currency/CurrencyTest.java Thu Apr 21 15:43:07 2011 -0700 @@ -23,7 +23,7 @@ /* * @test * @bug 4290801 4692419 4693631 5101540 5104960 6296410 6336600 6371531 - * 6488442 + * 6488442 7036905 * @summary Basic tests for Currency class. */ @@ -249,7 +249,7 @@ testDisplayName("ITL", new Locale("it"), "Lira Italiana"); testDisplayName("JPY", Locale.JAPANESE, "\u65e5\u672c\u5186"); testDisplayName("KRW", Locale.KOREAN, "\ub300\ud55c\ubbfc\uad6d \uc6d0"); - testDisplayName("SEK", new Locale("sv"), "Svensk krona"); + testDisplayName("SEK", new Locale("sv"), "svensk krona"); testDisplayName("CNY", Locale.SIMPLIFIED_CHINESE, "\u4eba\u6c11\u5e01"); testDisplayName("TWD", Locale.TRADITIONAL_CHINESE, "\u65b0\u81fa\u5e63"); }
--- a/test/sun/text/resources/LocaleData Thu Apr 21 08:38:26 2011 -0700 +++ b/test/sun/text/resources/LocaleData Thu Apr 21 15:43:07 2011 -0700 @@ -6942,3 +6942,14 @@ CurrencyNames/zh_TW/xts=XTS CurrencyNames/zh_TW/xxx=XXX CurrencyNames/zh_TW/yer=\u8449\u9580\u91cc\u96c5 + +# bug 7036905 +CurrencyNames/de/afa=Afghani (1927-2002) +CurrencyNames/de/afn=Afghani +CurrencyNames/de/bob=Boliviano +CurrencyNames/de/dem=Deutsche Mark +CurrencyNames/de/mwk=Malawi Kwacha +CurrencyNames/de/mxv=Mexican Unidad de Inversion (UDI) +CurrencyNames/de/svc=El Salvador Colon + +CurrencyNames/it/bob=Boliviano
--- a/test/sun/text/resources/LocaleDataTest.java Thu Apr 21 08:38:26 2011 -0700 +++ b/test/sun/text/resources/LocaleDataTest.java Thu Apr 21 15:43:07 2011 -0700 @@ -33,7 +33,7 @@ * 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259 * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 - * 6919624 6998391 7019267 7020960 7025837 7020583 + * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 * @summary Verify locale data * */