From chris.hegarty at oracle.com Wed Jun 4 12:44:59 2014 From: chris.hegarty at oracle.com (Chris Hegarty) Date: Wed, 04 Jun 2014 13:44:59 +0100 Subject: RFR [9] 8043613: Update .properties files for serialver tool Message-ID: <538F14CB.6080801@oracle.com> Michael, This is a very trivial request, and follows JDK-8042887 "Remove serialver -show, this tool does not need a GUI". The only changes required are the removal of several values from the two localized property files. No additional translation is required. diff --git a/src/share/classes/sun/tools/serialver/resources/serialver_ja.properties b/src/share/classes/sun/tools/serialver/resources/serialver_ja.properties --- a/src/share/classes/sun/tools/serialver/resources/serialver_ja.properties +++ b/src/share/classes/sun/tools/serialver/resources/serialver_ja.properties @@ -1,13 +1,6 @@ -SerialVersionInspector=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u30FB\u30A4\u30F3\u30B9\u30DA\u30AF\u30BF -File=\u30D5\u30A1\u30A4\u30EB -Exit=\u7D42\u4E86 -Show=\u8868\u793A -FullClassName=\u5B8C\u5168\u30AF\u30E9\u30B9\u540D: -SerialVersion=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3: NotSerializable=\u30AF\u30E9\u30B9{0}\u306F\u76F4\u5217\u5316\u3067\u304D\u307E\u305B\u3093\u3002 ClassNotFound=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 error.parsing.classpath=\u30AF\u30E9\u30B9\u30D1\u30B9{0}\u306E\u89E3\u6790\u30A8\u30E9\u30FC\u3067\u3059\u3002 error.missing.classpath=-classpath\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 invalid.flag=\u7121\u52B9\u306A\u30D5\u30E9\u30B0{0}\u3002 -ignoring.classes=-show\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6301\u3064\u30AF\u30E9\u30B9\u5F15\u6570\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093 -usage=\u4F7F\u7528\u65B9\u6CD5: serialver [-classpath classpath] [-show] [classname...] +usage=\u4F7F\u7528\u65B9\u6CD5: serialver [-classpath classpath] [classname...] diff --git a/src/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties b/src/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties --- a/src/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties +++ b/src/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties @@ -1,13 +1,6 @@ -SerialVersionInspector=\u5E8F\u5217\u7248\u672C\u68C0\u67E5\u5668 -File=\u6587\u4EF6 -Exit=\u9000\u51FA -Show=\u663E\u793A -FullClassName=\u5B8C\u6574\u7684\u7C7B\u540D: -SerialVersion=\u5E8F\u5217\u7248\u672C: NotSerializable=\u7C7B{0}\u65E0\u6CD5\u5E8F\u5217\u5316\u3002 ClassNotFound=\u627E\u4E0D\u5230\u7C7B{0}\u3002 error.parsing.classpath=\u89E3\u6790\u7C7B\u8DEF\u5F84 {0} \u65F6\u51FA\u9519\u3002 error.missing.classpath=\u7F3A\u5C11 -classpath \u9009\u9879\u7684\u53C2\u6570 invalid.flag=\u65E0\u6548\u6807\u8BB0{0}\u3002 -ignoring.classes=\u65E0\u6CD5\u4F7F\u7528 -show \u9009\u9879\u6307\u5B9A\u7C7B\u53C2\u6570 -usage=\u7528\u6CD5: serialver [-classpath \u7C7B\u8DEF\u5F84] [-show] [\u7C7B\u540D\u79F0...] +usage=\u7528\u6CD5: serialver [-classpath \u7C7B\u8DEF\u5F84] [\u7C7B\u540D\u79F0...] -Chris. From Alan.Bateman at oracle.com Wed Jun 4 12:45:11 2014 From: Alan.Bateman at oracle.com (Alan Bateman) Date: Wed, 04 Jun 2014 13:45:11 +0100 Subject: RFR [9] 8043613: Update .properties files for serialver tool In-Reply-To: <538F14CB.6080801@oracle.com> References: <538F14CB.6080801@oracle.com> Message-ID: <538F14D7.5000505@oracle.com> On 04/06/2014 13:44, Chris Hegarty wrote: > Michael, > > This is a very trivial request, and follows JDK-8042887 "Remove > serialver -show, this tool does not need a GUI". > > The only changes required are the removal of several values from the > two localized property files. No additional translation is required. Won't this resolve this when the when translation drop happens? Normally we are not supposed to touch the translated properties files. The changes to these files were deliberately left out of Pavel's patch. -Alan. From michael.fang at oracle.com Wed Jun 4 15:30:19 2014 From: michael.fang at oracle.com (Michael Fang) Date: Wed, 04 Jun 2014 08:30:19 -0700 Subject: RFR [9] 8043613: Update .properties files for serialver tool In-Reply-To: <538F14D7.5000505@oracle.com> References: <538F14CB.6080801@oracle.com> <538F14D7.5000505@oracle.com> Message-ID: <538F3B8B.1090900@oracle.com> Hi Alan, Yes, typically, we request dev team not to update l10n files (especially .rc files that are difficult to merge). But it's fine for me in this case for jdk9 since we are not planning to update the l10n resource files until after feature complete. thanks, -michael On 14?06?04? 05:45 ??, Alan Bateman wrote: > On 04/06/2014 13:44, Chris Hegarty wrote: >> Michael, >> >> This is a very trivial request, and follows JDK-8042887 "Remove >> serialver -show, this tool does not need a GUI". >> >> The only changes required are the removal of several values from the >> two localized property files. No additional translation is required. > Won't this resolve this when the when translation drop happens? > Normally we are not supposed to touch the translated properties files. > The changes to these files were deliberately left out of Pavel's patch. > > -Alan. From michael.fang at oracle.com Fri Jun 6 16:32:59 2014 From: michael.fang at oracle.com (Michael Fang) Date: Fri, 06 Jun 2014 09:32:59 -0700 Subject: RFR [9] 8043613: Update .properties files for serialver tool In-Reply-To: <538F3B8B.1090900@oracle.com> References: <538F14CB.6080801@oracle.com> <538F14D7.5000505@oracle.com> <538F3B8B.1090900@oracle.com> Message-ID: <5391ED3B.4060508@oracle.com> Another thing is this is an ASCII file, so it's less risky for dev team to touch it. In the past there has been several times that .rc files got corrupted by dev team trying to edit the file in English environment or merging the files. So, we are more careful about non-ASCII files. thanks, -michael On 14?06?04? 08:30 ??, Michael Fang wrote: > Hi Alan, > > Yes, typically, we request dev team not to update l10n files > (especially .rc files that are difficult to merge). But it's fine for > me in this case for jdk9 since we are not planning to update the l10n > resource files until after feature complete. > > thanks, > > -michael > > On 14?06?04? 05:45 ??, Alan Bateman wrote: >> On 04/06/2014 13:44, Chris Hegarty wrote: >>> Michael, >>> >>> This is a very trivial request, and follows JDK-8042887 "Remove >>> serialver -show, this tool does not need a GUI". >>> >>> The only changes required are the removal of several values from the >>> two localized property files. No additional translation is required. >> Won't this resolve this when the when translation drop happens? >> Normally we are not supposed to touch the translated properties >> files. The changes to these files were deliberately left out of >> Pavel's patch. >> >> -Alan. From michael.fang at oracle.com Thu Jun 12 22:32:06 2014 From: michael.fang at oracle.com (Michael Fang) Date: Thu, 12 Jun 2014 15:32:06 -0700 Subject: Review request for 8037343 Wrong dateformat for locale es_DO (backport from 9 to 8u-dev) In-Reply-To: <537E417F.7040206@oracle.com> References: <537CEA1C.4030004@oracle.com> <537CFB35.6050409@oracle.com> <537D4134.7030807@oracle.com> <537D437E.6040906@oracle.com> <537E417F.7040206@oracle.com> Message-ID: <539A2A66.6060007@oracle.com> Hi, I tried to backport the fix from 9 to 8u-dev. The patch applied OK except for test/sun/text/resources/LocaleDataTest.java in the bugid list section. Please help to review the manual merge of test/sun/text/resources/LocaleDataTest.java (one line only). jdk9 webrev (reference): http://cr.openjdk.java.net/~mfang/8037343/webrev.00/ jdk8u-dev webrev (to review): http://cr.openjdk.java.net/~mfang/8037343/8u20/webrev.00/ thanks, -michael On 14?05?22? 11:27 ??, Michael Fang wrote: > Thanks Masayoshi. I have pushed the changeset to jdk9/dev. > > thanks, > > -michael > > On 14?05?21? 05:23 ??, Masayoshi Okutsu wrote: >> Sorry, I forgot about LocaleDataTest. The fix looks good to me. >> >> Masayoshi >> >> On 5/22/2014 9:13 AM, Michael Fang wrote: >>> Hi all, >>> >>> I created a test build and ran regression tests. LocaleDataTest >>> failed. I have updated the test data related to this bug fix. Please >>> review the changes related to LocaleDataTest. >>> >>> http://cr.openjdk.java.net/~mfang/8037343/webrev.00/ >>> >>> thanks, >>> >>> -michael >>> >>> On 14?05?21? 12:15 ??, Michael Fang wrote: >>>> You are welcome, Sandipan. >>>> >>>> Thanks for your contribution. >>>> >>>> -michael >>>> >>>> On 14?05?21? 11:53 ??, Sandipan Razzaque wrote: >>>>> Thanks Michael& team! >>>>> >>>>> Cheers, >>>>> SR >>>>> Sandipan Razzaque | www.sandipan.net >>>>> >>>>> >>>>> On Wed, May 21, 2014 at 2:02 PM, Michael >>>>> Fang wrote: >>>>>> Thanks Sandipan. >>>>>> >>>>>> I will work with our team to import, test, and push it to jdk9. >>>>>> >>>>>> thanks, >>>>>> >>>>>> -michael >>>>>> >>>>>> On 14?05?21? 06:18 ??, Sandipan Razzaque wrote: >>>>>>> Hi all, >>>>>>> >>>>>>> Take 2 - inlined into the email this time. >>>>>>> >>>>>>> Cheers, >>>>>>> SR >>>>>>> >>>>>>> --- >>>>>>> old/src/share/classes/sun/text/resources/es/FormatData_es_DO.java >>>>>>> 2014-05-14 22:28:33.393717389 -0400 >>>>>>> +++ >>>>>>> new/src/share/classes/sun/text/resources/es/FormatData_es_DO.java >>>>>>> 2014-05-14 22:28:33.277717384 -0400 >>>>>>> @@ -75,8 +75,8 @@ >>>>>>> new String[] { >>>>>>> "EEEE d' de 'MMMM' de 'yyyy", // full >>>>>>> date pattern >>>>>>> "d' de 'MMMM' de 'yyyy", // long date >>>>>>> pattern >>>>>>> - "MM/dd/yyyy", // medium date pattern >>>>>>> - "MM/dd/yy", // short date pattern >>>>>>> + "dd/MM/yyyy", // medium date pattern >>>>>>> + "dd/MM/yy", // short date pattern >>>>>>> } >>>>>>> }, >>>>>>> { "DateTimePatterns", >>>>>>> --- /dev/null 2014-05-11 05:40:37.233580026 -0400 >>>>>>> +++ new/test/sun/text/resources/Format/Bug8037343.java 2014-05-14 >>>>>>> 22:28:33.713717403 -0400 >>>>>>> @@ -0,0 +1,71 @@ >>>>>>> +/* >>>>>>> + * Copyright (c) 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 >>>>>>> + * under the terms of the GNU General Public License version 2 >>>>>>> only, as >>>>>>> + * published by the Free Software Foundation. >>>>>>> + * >>>>>>> + * This code is distributed in the hope that it will be useful, >>>>>>> but >>>>>>> WITHOUT >>>>>>> + * ANY WARRANTY; without even the implied warranty of >>>>>>> MERCHANTABILITY or >>>>>>> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General >>>>>>> Public License >>>>>>> + * version 2 for more details (a copy is included in the >>>>>>> LICENSE file >>>>>>> that >>>>>>> + * accompanied this code). >>>>>>> + * >>>>>>> + * You should have received a copy of the GNU General Public >>>>>>> License >>>>>>> version >>>>>>> + * 2 along with this work; if not, write to the Free Software >>>>>>> Foundation, >>>>>>> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. >>>>>>> + * >>>>>>> + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, >>>>>>> CA 94065 >>>>>>> USA >>>>>>> + * or visit www.oracle.com if you need additional information >>>>>>> or have any >>>>>>> + * questions. >>>>>>> + */ >>>>>>> + >>>>>>> +/* >>>>>>> + * @test >>>>>>> + * @bug 8037343 >>>>>>> + * @summary updating dateformat for es_DO >>>>>>> + */ >>>>>>> + >>>>>>> +import java.text.DateFormat; >>>>>>> +import java.util.Calendar; >>>>>>> +import java.util.Locale; >>>>>>> + >>>>>>> +public class Bug8037343 >>>>>>> +{ >>>>>>> + >>>>>>> + public static void main(String[] arg) >>>>>>> + { >>>>>>> + final Locale esDO = new Locale("es", "DO"); >>>>>>> + final String expectedShort = "31/03/12"; >>>>>>> + final String expectedMedium = "31/03/2012"; >>>>>>> + >>>>>>> + int errors = 0; >>>>>>> + DateFormat format; >>>>>>> + String result; >>>>>>> + >>>>>>> + Calendar cal = Calendar.getInstance(esDO); >>>>>>> + cal.set(Calendar.DAY_OF_MONTH, 31); >>>>>>> + cal.set(Calendar.MONTH, Calendar.MARCH); >>>>>>> + cal.set(Calendar.YEAR, 2012); >>>>>>> + >>>>>>> + format = DateFormat.getDateInstance(DateFormat.SHORT, >>>>>>> esDO); >>>>>>> + result = format.format(cal.getTime()); >>>>>>> + if (!expectedShort.equals(result)) { >>>>>>> + System.out.println(String.format("Short Date format >>>>>>> for >>>>>>> es_DO is not as expected. Expected: [%s] Actual: [%s]", >>>>>>> expectedShort, >>>>>>> result)); >>>>>>> + errors++; >>>>>>> + } >>>>>>> + >>>>>>> + format = DateFormat.getDateInstance(DateFormat.MEDIUM, >>>>>>> esDO); >>>>>>> + result = format.format(cal.getTime()); >>>>>>> + if (!expectedMedium.equals(result)) { >>>>>>> + System.out.println(String.format("Medium Date >>>>>>> format for >>>>>>> es_DO is not as expected. Expected: [%s] Actual: [%s]", >>>>>>> expectedMedium, result)); >>>>>>> + errors++; >>>>>>> + } >>>>>>> + >>>>>>> + if (errors> 0) { >>>>>>> + throw new RuntimeException(); >>>>>>> + } >>>>>>> + } >>>>>>> + >>>>>>> +} >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> Sandipan Razzaque | www.sandipan.net >>>>>>> >>>>>>> >>>>>>> On Wed, May 21, 2014 at 8:06 AM, Sandipan Razzaque >>>>>>> wrote: >>>>>>>> Hi all, >>>>>>>> >>>>>>>> Patch 8037343 has been reviewed and is ready for merge. Please >>>>>>>> find it >>>>>>>> attached to this email. >>>>>>>> >>>>>>>> Cheers, >>>>>>>> SR >>>>>>>> >>>>>>>> Sandipan Razzaque | www.sandipan.net >> From masayoshi.okutsu at oracle.com Fri Jun 13 09:00:18 2014 From: masayoshi.okutsu at oracle.com (Masayoshi Okutsu) Date: Fri, 13 Jun 2014 18:00:18 +0900 Subject: Review request for 8037343 Wrong dateformat for locale es_DO (backport from 9 to 8u-dev) In-Reply-To: <539A2A66.6060007@oracle.com> References: <537CEA1C.4030004@oracle.com> <537CFB35.6050409@oracle.com> <537D4134.7030807@oracle.com> <537D437E.6040906@oracle.com> <537E417F.7040206@oracle.com> <539A2A66.6060007@oracle.com> Message-ID: <539ABDA2.8000103@oracle.com> Looks good to me. Masayoshi On 6/13/2014 7:32 AM, Michael Fang wrote: > Hi, > > I tried to backport the fix from 9 to 8u-dev. The patch applied OK > except for test/sun/text/resources/LocaleDataTest.java in the bugid > list section. > > Please help to review the manual merge of > test/sun/text/resources/LocaleDataTest.java (one line only). > > jdk9 webrev (reference): > http://cr.openjdk.java.net/~mfang/8037343/webrev.00/ > > jdk8u-dev webrev (to review): > http://cr.openjdk.java.net/~mfang/8037343/8u20/webrev.00/ > > > thanks, > > -michael > > > On 14?05?22? 11:27 ??, Michael Fang wrote: >> Thanks Masayoshi. I have pushed the changeset to jdk9/dev. >> >> thanks, >> >> -michael >> >> On 14?05?21? 05:23 ??, Masayoshi Okutsu wrote: >>> Sorry, I forgot about LocaleDataTest. The fix looks good to me. >>> >>> Masayoshi >>> >>> On 5/22/2014 9:13 AM, Michael Fang wrote: >>>> Hi all, >>>> >>>> I created a test build and ran regression tests. LocaleDataTest >>>> failed. I have updated the test data related to this bug fix. >>>> Please review the changes related to LocaleDataTest. >>>> >>>> http://cr.openjdk.java.net/~mfang/8037343/webrev.00/ >>>> >>>> thanks, >>>> >>>> -michael >>>> >>>> On 14?05?21? 12:15 ??, Michael Fang wrote: >>>>> You are welcome, Sandipan. >>>>> >>>>> Thanks for your contribution. >>>>> >>>>> -michael >>>>> >>>>> On 14?05?21? 11:53 ??, Sandipan Razzaque wrote: >>>>>> Thanks Michael& team! >>>>>> >>>>>> Cheers, >>>>>> SR >>>>>> Sandipan Razzaque | www.sandipan.net >>>>>> >>>>>> >>>>>> On Wed, May 21, 2014 at 2:02 PM, Michael >>>>>> Fang wrote: >>>>>>> Thanks Sandipan. >>>>>>> >>>>>>> I will work with our team to import, test, and push it to jdk9. >>>>>>> >>>>>>> thanks, >>>>>>> >>>>>>> -michael >>>>>>> >>>>>>> On 14?05?21? 06:18 ??, Sandipan Razzaque wrote: >>>>>>>> Hi all, >>>>>>>> >>>>>>>> Take 2 - inlined into the email this time. >>>>>>>> >>>>>>>> Cheers, >>>>>>>> SR >>>>>>>> >>>>>>>> --- >>>>>>>> old/src/share/classes/sun/text/resources/es/FormatData_es_DO.java >>>>>>>> 2014-05-14 22:28:33.393717389 -0400 >>>>>>>> +++ >>>>>>>> new/src/share/classes/sun/text/resources/es/FormatData_es_DO.java >>>>>>>> 2014-05-14 22:28:33.277717384 -0400 >>>>>>>> @@ -75,8 +75,8 @@ >>>>>>>> new String[] { >>>>>>>> "EEEE d' de 'MMMM' de 'yyyy", // full >>>>>>>> date pattern >>>>>>>> "d' de 'MMMM' de 'yyyy", // long date >>>>>>>> pattern >>>>>>>> - "MM/dd/yyyy", // medium date pattern >>>>>>>> - "MM/dd/yy", // short date pattern >>>>>>>> + "dd/MM/yyyy", // medium date pattern >>>>>>>> + "dd/MM/yy", // short date pattern >>>>>>>> } >>>>>>>> }, >>>>>>>> { "DateTimePatterns", >>>>>>>> --- /dev/null 2014-05-11 05:40:37.233580026 -0400 >>>>>>>> +++ new/test/sun/text/resources/Format/Bug8037343.java 2014-05-14 >>>>>>>> 22:28:33.713717403 -0400 >>>>>>>> @@ -0,0 +1,71 @@ >>>>>>>> +/* >>>>>>>> + * Copyright (c) 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 >>>>>>>> + * under the terms of the GNU General Public License version 2 >>>>>>>> only, as >>>>>>>> + * published by the Free Software Foundation. >>>>>>>> + * >>>>>>>> + * This code is distributed in the hope that it will be >>>>>>>> useful, but >>>>>>>> WITHOUT >>>>>>>> + * ANY WARRANTY; without even the implied warranty of >>>>>>>> MERCHANTABILITY or >>>>>>>> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General >>>>>>>> Public License >>>>>>>> + * version 2 for more details (a copy is included in the >>>>>>>> LICENSE file >>>>>>>> that >>>>>>>> + * accompanied this code). >>>>>>>> + * >>>>>>>> + * You should have received a copy of the GNU General Public >>>>>>>> License >>>>>>>> version >>>>>>>> + * 2 along with this work; if not, write to the Free Software >>>>>>>> Foundation, >>>>>>>> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. >>>>>>>> + * >>>>>>>> + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, >>>>>>>> CA 94065 >>>>>>>> USA >>>>>>>> + * or visit www.oracle.com if you need additional information >>>>>>>> or have any >>>>>>>> + * questions. >>>>>>>> + */ >>>>>>>> + >>>>>>>> +/* >>>>>>>> + * @test >>>>>>>> + * @bug 8037343 >>>>>>>> + * @summary updating dateformat for es_DO >>>>>>>> + */ >>>>>>>> + >>>>>>>> +import java.text.DateFormat; >>>>>>>> +import java.util.Calendar; >>>>>>>> +import java.util.Locale; >>>>>>>> + >>>>>>>> +public class Bug8037343 >>>>>>>> +{ >>>>>>>> + >>>>>>>> + public static void main(String[] arg) >>>>>>>> + { >>>>>>>> + final Locale esDO = new Locale("es", "DO"); >>>>>>>> + final String expectedShort = "31/03/12"; >>>>>>>> + final String expectedMedium = "31/03/2012"; >>>>>>>> + >>>>>>>> + int errors = 0; >>>>>>>> + DateFormat format; >>>>>>>> + String result; >>>>>>>> + >>>>>>>> + Calendar cal = Calendar.getInstance(esDO); >>>>>>>> + cal.set(Calendar.DAY_OF_MONTH, 31); >>>>>>>> + cal.set(Calendar.MONTH, Calendar.MARCH); >>>>>>>> + cal.set(Calendar.YEAR, 2012); >>>>>>>> + >>>>>>>> + format = DateFormat.getDateInstance(DateFormat.SHORT, >>>>>>>> esDO); >>>>>>>> + result = format.format(cal.getTime()); >>>>>>>> + if (!expectedShort.equals(result)) { >>>>>>>> + System.out.println(String.format("Short Date >>>>>>>> format for >>>>>>>> es_DO is not as expected. Expected: [%s] Actual: [%s]", >>>>>>>> expectedShort, >>>>>>>> result)); >>>>>>>> + errors++; >>>>>>>> + } >>>>>>>> + >>>>>>>> + format = DateFormat.getDateInstance(DateFormat.MEDIUM, >>>>>>>> esDO); >>>>>>>> + result = format.format(cal.getTime()); >>>>>>>> + if (!expectedMedium.equals(result)) { >>>>>>>> + System.out.println(String.format("Medium Date format for >>>>>>>> es_DO is not as expected. Expected: [%s] Actual: [%s]", >>>>>>>> expectedMedium, result)); >>>>>>>> + errors++; >>>>>>>> + } >>>>>>>> + >>>>>>>> + if (errors> 0) { >>>>>>>> + throw new RuntimeException(); >>>>>>>> + } >>>>>>>> + } >>>>>>>> + >>>>>>>> +} >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> Sandipan Razzaque | www.sandipan.net >>>>>>>> >>>>>>>> >>>>>>>> On Wed, May 21, 2014 at 8:06 AM, Sandipan >>>>>>>> Razzaque >>>>>>>> wrote: >>>>>>>>> Hi all, >>>>>>>>> >>>>>>>>> Patch 8037343 has been reviewed and is ready for merge. Please >>>>>>>>> find it >>>>>>>>> attached to this email. >>>>>>>>> >>>>>>>>> Cheers, >>>>>>>>> SR >>>>>>>>> >>>>>>>>> Sandipan Razzaque | www.sandipan.net >>> From michael.fang at oracle.com Fri Jun 13 14:52:53 2014 From: michael.fang at oracle.com (Michael Fang) Date: Fri, 13 Jun 2014 07:52:53 -0700 Subject: Review request for 8037343 Wrong dateformat for locale es_DO (backport from 9 to 8u-dev) In-Reply-To: <539ABDA2.8000103@oracle.com> References: <537CEA1C.4030004@oracle.com> <537CFB35.6050409@oracle.com> <537D4134.7030807@oracle.com> <537D437E.6040906@oracle.com> <537E417F.7040206@oracle.com> <539A2A66.6060007@oracle.com> <539ABDA2.8000103@oracle.com> Message-ID: <539B1045.4070408@oracle.com> Thanks Masayoshi. -michael On 14?06?13? 02:00 ??, Masayoshi Okutsu wrote: > Looks good to me. > > Masayoshi > > On 6/13/2014 7:32 AM, Michael Fang wrote: >> Hi, >> >> I tried to backport the fix from 9 to 8u-dev. The patch applied OK >> except for test/sun/text/resources/LocaleDataTest.java in the bugid >> list section. >> >> Please help to review the manual merge of >> test/sun/text/resources/LocaleDataTest.java (one line only). >> >> jdk9 webrev (reference): >> http://cr.openjdk.java.net/~mfang/8037343/webrev.00/ >> >> jdk8u-dev webrev (to review): >> http://cr.openjdk.java.net/~mfang/8037343/8u20/webrev.00/ >> >> >> thanks, >> >> -michael >> >> >> On 14?05?22? 11:27 ??, Michael Fang wrote: >>> Thanks Masayoshi. I have pushed the changeset to jdk9/dev. >>> >>> thanks, >>> >>> -michael >>> >>> On 14?05?21? 05:23 ??, Masayoshi Okutsu wrote: >>>> Sorry, I forgot about LocaleDataTest. The fix looks good to me. >>>> >>>> Masayoshi >>>> >>>> On 5/22/2014 9:13 AM, Michael Fang wrote: >>>>> Hi all, >>>>> >>>>> I created a test build and ran regression tests. LocaleDataTest >>>>> failed. I have updated the test data related to this bug fix. >>>>> Please review the changes related to LocaleDataTest. >>>>> >>>>> http://cr.openjdk.java.net/~mfang/8037343/webrev.00/ >>>>> >>>>> thanks, >>>>> >>>>> -michael >>>>> >>>>> On 14?05?21? 12:15 ??, Michael Fang wrote: >>>>>> You are welcome, Sandipan. >>>>>> >>>>>> Thanks for your contribution. >>>>>> >>>>>> -michael >>>>>> >>>>>> On 14?05?21? 11:53 ??, Sandipan Razzaque wrote: >>>>>>> Thanks Michael& team! >>>>>>> >>>>>>> Cheers, >>>>>>> SR >>>>>>> Sandipan Razzaque | www.sandipan.net >>>>>>> >>>>>>> >>>>>>> On Wed, May 21, 2014 at 2:02 PM, Michael >>>>>>> Fang wrote: >>>>>>>> Thanks Sandipan. >>>>>>>> >>>>>>>> I will work with our team to import, test, and push it to jdk9. >>>>>>>> >>>>>>>> thanks, >>>>>>>> >>>>>>>> -michael >>>>>>>> >>>>>>>> On 14?05?21? 06:18 ??, Sandipan Razzaque wrote: >>>>>>>>> Hi all, >>>>>>>>> >>>>>>>>> Take 2 - inlined into the email this time. >>>>>>>>> >>>>>>>>> Cheers, >>>>>>>>> SR >>>>>>>>> >>>>>>>>> --- >>>>>>>>> old/src/share/classes/sun/text/resources/es/FormatData_es_DO.java >>>>>>>>> 2014-05-14 22:28:33.393717389 -0400 >>>>>>>>> +++ >>>>>>>>> new/src/share/classes/sun/text/resources/es/FormatData_es_DO.java >>>>>>>>> 2014-05-14 22:28:33.277717384 -0400 >>>>>>>>> @@ -75,8 +75,8 @@ >>>>>>>>> new String[] { >>>>>>>>> "EEEE d' de 'MMMM' de 'yyyy", // full >>>>>>>>> date pattern >>>>>>>>> "d' de 'MMMM' de 'yyyy", // long date >>>>>>>>> pattern >>>>>>>>> - "MM/dd/yyyy", // medium date pattern >>>>>>>>> - "MM/dd/yy", // short date pattern >>>>>>>>> + "dd/MM/yyyy", // medium date pattern >>>>>>>>> + "dd/MM/yy", // short date pattern >>>>>>>>> } >>>>>>>>> }, >>>>>>>>> { "DateTimePatterns", >>>>>>>>> --- /dev/null 2014-05-11 05:40:37.233580026 -0400 >>>>>>>>> +++ new/test/sun/text/resources/Format/Bug8037343.java 2014-05-14 >>>>>>>>> 22:28:33.713717403 -0400 >>>>>>>>> @@ -0,0 +1,71 @@ >>>>>>>>> +/* >>>>>>>>> + * Copyright (c) 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 >>>>>>>>> + * under the terms of the GNU General Public License version >>>>>>>>> 2 only, as >>>>>>>>> + * published by the Free Software Foundation. >>>>>>>>> + * >>>>>>>>> + * This code is distributed in the hope that it will be >>>>>>>>> useful, but >>>>>>>>> WITHOUT >>>>>>>>> + * ANY WARRANTY; without even the implied warranty of >>>>>>>>> MERCHANTABILITY or >>>>>>>>> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General >>>>>>>>> Public License >>>>>>>>> + * version 2 for more details (a copy is included in the >>>>>>>>> LICENSE file >>>>>>>>> that >>>>>>>>> + * accompanied this code). >>>>>>>>> + * >>>>>>>>> + * You should have received a copy of the GNU General Public >>>>>>>>> License >>>>>>>>> version >>>>>>>>> + * 2 along with this work; if not, write to the Free Software >>>>>>>>> Foundation, >>>>>>>>> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. >>>>>>>>> + * >>>>>>>>> + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, >>>>>>>>> CA 94065 >>>>>>>>> USA >>>>>>>>> + * or visit www.oracle.com if you need additional information >>>>>>>>> or have any >>>>>>>>> + * questions. >>>>>>>>> + */ >>>>>>>>> + >>>>>>>>> +/* >>>>>>>>> + * @test >>>>>>>>> + * @bug 8037343 >>>>>>>>> + * @summary updating dateformat for es_DO >>>>>>>>> + */ >>>>>>>>> + >>>>>>>>> +import java.text.DateFormat; >>>>>>>>> +import java.util.Calendar; >>>>>>>>> +import java.util.Locale; >>>>>>>>> + >>>>>>>>> +public class Bug8037343 >>>>>>>>> +{ >>>>>>>>> + >>>>>>>>> + public static void main(String[] arg) >>>>>>>>> + { >>>>>>>>> + final Locale esDO = new Locale("es", "DO"); >>>>>>>>> + final String expectedShort = "31/03/12"; >>>>>>>>> + final String expectedMedium = "31/03/2012"; >>>>>>>>> + >>>>>>>>> + int errors = 0; >>>>>>>>> + DateFormat format; >>>>>>>>> + String result; >>>>>>>>> + >>>>>>>>> + Calendar cal = Calendar.getInstance(esDO); >>>>>>>>> + cal.set(Calendar.DAY_OF_MONTH, 31); >>>>>>>>> + cal.set(Calendar.MONTH, Calendar.MARCH); >>>>>>>>> + cal.set(Calendar.YEAR, 2012); >>>>>>>>> + >>>>>>>>> + format = DateFormat.getDateInstance(DateFormat.SHORT, >>>>>>>>> esDO); >>>>>>>>> + result = format.format(cal.getTime()); >>>>>>>>> + if (!expectedShort.equals(result)) { >>>>>>>>> + System.out.println(String.format("Short Date >>>>>>>>> format for >>>>>>>>> es_DO is not as expected. Expected: [%s] Actual: [%s]", >>>>>>>>> expectedShort, >>>>>>>>> result)); >>>>>>>>> + errors++; >>>>>>>>> + } >>>>>>>>> + >>>>>>>>> + format = >>>>>>>>> DateFormat.getDateInstance(DateFormat.MEDIUM, esDO); >>>>>>>>> + result = format.format(cal.getTime()); >>>>>>>>> + if (!expectedMedium.equals(result)) { >>>>>>>>> + System.out.println(String.format("Medium Date format for >>>>>>>>> es_DO is not as expected. Expected: [%s] Actual: [%s]", >>>>>>>>> expectedMedium, result)); >>>>>>>>> + errors++; >>>>>>>>> + } >>>>>>>>> + >>>>>>>>> + if (errors> 0) { >>>>>>>>> + throw new RuntimeException(); >>>>>>>>> + } >>>>>>>>> + } >>>>>>>>> + >>>>>>>>> +} >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> Sandipan Razzaque | www.sandipan.net >>>>>>>>> >>>>>>>>> >>>>>>>>> On Wed, May 21, 2014 at 8:06 AM, Sandipan >>>>>>>>> Razzaque >>>>>>>>> wrote: >>>>>>>>>> Hi all, >>>>>>>>>> >>>>>>>>>> Patch 8037343 has been reviewed and is ready for merge. >>>>>>>>>> Please find it >>>>>>>>>> attached to this email. >>>>>>>>>> >>>>>>>>>> Cheers, >>>>>>>>>> SR >>>>>>>>>> >>>>>>>>>> Sandipan Razzaque | www.sandipan.net >>>> > From naoto.sato at oracle.com Wed Jun 25 23:16:35 2014 From: naoto.sato at oracle.com (Naoto Sato) Date: Wed, 25 Jun 2014 16:16:35 -0700 Subject: [9] RFR: 8039317: Read currency.data read as a resource Message-ID: <53AB5853.9010504@oracle.com> Hello, Please review the proposed fix to the subject issue: https://bugs.openjdk.java.net/browse/JDK-8039317 The fix is to move "currency.data" file from "lib" directory into "resources.jar" file, as this file is merely a data file: http://cr.openjdk.java.net/~naoto/8039317/webrev.0/ Naoto From Alan.Bateman at oracle.com Thu Jun 26 12:08:43 2014 From: Alan.Bateman at oracle.com (Alan Bateman) Date: Thu, 26 Jun 2014 13:08:43 +0100 Subject: [9] RFR: 8039317: Read currency.data read as a resource In-Reply-To: <53AB5853.9010504@oracle.com> References: <53AB5853.9010504@oracle.com> Message-ID: <53AC0D4B.4060100@oracle.com> On 26/06/2014 00:16, Naoto Sato wrote: > Hello, > > Please review the proposed fix to the subject issue: > > https://bugs.openjdk.java.net/browse/JDK-8039317 > > The fix is to move "currency.data" file from "lib" directory into > "resources.jar" file, as this file is merely a data file: > > http://cr.openjdk.java.net/~naoto/8039317/webrev.0/ I assume that jdk/make/profile-includes.txt will need to be updated too, otherwise it looks okay to me. -Alan. From chris.hegarty at oracle.com Thu Jun 26 12:29:20 2014 From: chris.hegarty at oracle.com (Chris Hegarty) Date: Thu, 26 Jun 2014 13:29:20 +0100 Subject: [9] RFR: 8039317: Read currency.data read as a resource In-Reply-To: <53AC0D4B.4060100@oracle.com> References: <53AB5853.9010504@oracle.com> <53AC0D4B.4060100@oracle.com> Message-ID: On 26 Jun 2014, at 13:08, Alan Bateman wrote: > On 26/06/2014 00:16, Naoto Sato wrote: >> Hello, >> >> Please review the proposed fix to the subject issue: >> >> https://bugs.openjdk.java.net/browse/JDK-8039317 >> >> The fix is to move "currency.data" file from "lib" directory into "resources.jar" file, as this file is merely a data file: >> >> http://cr.openjdk.java.net/~naoto/8039317/webrev.0/ > I assume that jdk/make/profile-includes.txt will need to be updated too, otherwise it looks okay to me. +1. Trivially, you could probably move homeDir down just below the try/catch where it is now first being used. -Chris From naoto.sato at oracle.com Thu Jun 26 16:22:04 2014 From: naoto.sato at oracle.com (Naoto Sato) Date: Thu, 26 Jun 2014 09:22:04 -0700 Subject: [9] RFR: 8039317: Read currency.data read as a resource In-Reply-To: References: <53AB5853.9010504@oracle.com> <53AC0D4B.4060100@oracle.com> Message-ID: <53AC48AC.5060705@oracle.com> Hi Alan, Chris, Thank you for the review. I updated the fix (actually I forgot to add the changes to the tests the first time) according to your suggestions: http://cr.openjdk.java.net/~naoto/8039317/webrev.1/ I'd appreciate your reviews. Naoto On 6/26/14, 5:29 AM, Chris Hegarty wrote: > On 26 Jun 2014, at 13:08, Alan Bateman wrote: > >> On 26/06/2014 00:16, Naoto Sato wrote: >>> Hello, >>> >>> Please review the proposed fix to the subject issue: >>> >>> https://bugs.openjdk.java.net/browse/JDK-8039317 >>> >>> The fix is to move "currency.data" file from "lib" directory into "resources.jar" file, as this file is merely a data file: >>> >>> http://cr.openjdk.java.net/~naoto/8039317/webrev.0/ >> I assume that jdk/make/profile-includes.txt will need to be updated too, otherwise it looks okay to me. > > +1. Trivially, you could probably move homeDir down just below the try/catch where it is now first being used. > > -Chris > From chris.hegarty at oracle.com Thu Jun 26 16:28:47 2014 From: chris.hegarty at oracle.com (Chris Hegarty) Date: Thu, 26 Jun 2014 17:28:47 +0100 Subject: [9] RFR: 8039317: Read currency.data read as a resource In-Reply-To: <53AC48AC.5060705@oracle.com> References: <53AB5853.9010504@oracle.com> <53AC0D4B.4060100@oracle.com> <53AC48AC.5060705@oracle.com> Message-ID: <97521490-D891-42B7-BC88-6B19766F065D@oracle.com> On 26 Jun 2014, at 17:22, Naoto Sato wrote: > Hi Alan, Chris, > > Thank you for the review. I updated the fix (actually I forgot to add the changes to the tests the first time) according to your suggestions: > > http://cr.openjdk.java.net/~naoto/8039317/webrev.1/ Looks good. Thanks Naoto. -Chris. > > I'd appreciate your reviews. > > Naoto > > On 6/26/14, 5:29 AM, Chris Hegarty wrote: >> On 26 Jun 2014, at 13:08, Alan Bateman wrote: >> >>> On 26/06/2014 00:16, Naoto Sato wrote: >>>> Hello, >>>> >>>> Please review the proposed fix to the subject issue: >>>> >>>> https://bugs.openjdk.java.net/browse/JDK-8039317 >>>> >>>> The fix is to move "currency.data" file from "lib" directory into "resources.jar" file, as this file is merely a data file: >>>> >>>> http://cr.openjdk.java.net/~naoto/8039317/webrev.0/ >>> I assume that jdk/make/profile-includes.txt will need to be updated too, otherwise it looks okay to me. >> >> +1. Trivially, you could probably move homeDir down just below the try/catch where it is now first being used. >> >> -Chris >> From naoto.sato at oracle.com Mon Jun 30 17:35:53 2014 From: naoto.sato at oracle.com (Naoto Sato) Date: Mon, 30 Jun 2014 10:35:53 -0700 Subject: [9] RFR: 8038092: Re-examine Bidi reflective dependency on java.awt.font Message-ID: <53B19FF9.4000801@oracle.com> Hello, Please review the fix for the subject bug: https://bugs.openjdk.java.net/browse/JDK-8038092 The proposed change is located at: http://cr.openjdk.java.net/~naoto/8038092/webrev.0/ Naoto