infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-17 10:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8075548: SimpleDateFormat formatting of "LLLL" in English is incorrect; should be identical to "MMMM"

Browse Source 
Reviewed-by: naoto
This commit is contained in:
Masayoshi Okutsu 2015-03-30 16:31:18 +09:00
parent c189249408
commit 90e30c53bc
3 changed files with 172 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
jdk/src/java.base/share/classes/java/util/Calendar.java
View File

@ -2083,17 +2083,33 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
return null;
}
String calendarType = getCalendarType();
int fieldValue = get(field);
// the standalone and narrow styles are supported only through CalendarDataProviders.
if (isStandaloneStyle(style) || isNarrowStyle(style)) {
return CalendarDataUtility.retrieveFieldValueName(getCalendarType(),
field, get(field),
style, locale);
if (isStandaloneStyle(style) || isNarrowFormatStyle(style)) {
String val = CalendarDataUtility.retrieveFieldValueName(calendarType,
field, fieldValue,
style, locale);
// Perform fallback here to follow the CLDR rules
if (val == null) {
if (isNarrowFormatStyle(style)) {
val = CalendarDataUtility.retrieveFieldValueName(calendarType,
field, fieldValue,
toStandaloneStyle(style),
locale);
} else if (isStandaloneStyle(style)) {
val = CalendarDataUtility.retrieveFieldValueName(calendarType,
field, fieldValue,
getBaseStyle(style),
locale);
}
}
return val;
}
DateFormatSymbols symbols = DateFormatSymbols.getInstance(locale);
String[] strings = getFieldStrings(field, style, symbols);
if (strings != null) {
int fieldValue = get(field);
if (fieldValue < strings.length) {
return strings[fieldValue];
}
@ -2155,10 +2171,26 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
ERA_MASK|MONTH_MASK|DAY_OF_WEEK_MASK|AM_PM_MASK)) {
return null;
}
if (style == ALL_STYLES || isStandaloneStyle(style)) {
return CalendarDataUtility.retrieveFieldValueNames(getCalendarType(), field, style, locale);
String calendarType = getCalendarType();
if (style == ALL_STYLES || isStandaloneStyle(style) || isNarrowFormatStyle(style)) {
Map<String, Integer> map;
map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field, style, locale);
// Perform fallback here to follow the CLDR rules
if (map == null) {
if (isNarrowFormatStyle(style)) {
map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field,
toStandaloneStyle(style), locale);
} else if (style != ALL_STYLES) {
map = CalendarDataUtility.retrieveFieldValueNames(calendarType, field,
getBaseStyle(style), locale);
}
}
return map;
}
// SHORT, LONG, or NARROW
// SHORT or LONG
return getDisplayNamesImpl(field, style, locale);
}
@ -2544,14 +2576,22 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
return style & ~STANDALONE_MASK;
}
boolean isStandaloneStyle(int style) {
private int toStandaloneStyle(int style) {
return style | STANDALONE_MASK;
}
private boolean isStandaloneStyle(int style) {
return (style & STANDALONE_MASK) != 0;
}
boolean isNarrowStyle(int style) {
private boolean isNarrowStyle(int style) {
return style == NARROW_FORMAT || style == NARROW_STANDALONE;
}
private boolean isNarrowFormatStyle(int style) {
return style == NARROW_FORMAT;
}
/**
* Returns the pseudo-time-stamp for two fields, given their
* individual pseudo-time-stamps. If either of the fields

108
jdk/test/java/util/Calendar/Bug8075548.java Normal file
View File

@ -0,0 +1,108 @@
/*
* Copyright (c) 2015, 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 8075548
* @summary Make sure that the format form of month names are produced when there are
* no stand-alone ones available.
*/
import java.text.*;
import java.util.*;
import static java.util.Calendar.*;
public class Bug8075548 {
static int errors = 0;
public static void main(String[] args) throws Throwable {
Date date = new SimpleDateFormat("yyyy-MM-dd", Locale.US).parse("2010-09-15");
String[][] FORMAT_PAIRS = {
{ "LLLL", "MMMM" },
{ "LLL", "MMM" }
};
Locale[] LOCALES = {
Locale.ENGLISH, Locale.FRENCH, Locale.GERMAN, Locale.JAPANESE
};
for (Locale locale : LOCALES) {
for (String[] formats : FORMAT_PAIRS) {
String el = new SimpleDateFormat(formats[0], locale).format(date);
String em = new SimpleDateFormat(formats[1], locale).format(date);
if (!el.equals(em)) {
errors++;
System.err.println(locale + ": " +
formats[0] + " -> " + el + ", " +
formats[1] + " -> " + em);
}
}
}
// Test Calendar.getDisplayName() and .getDisplayNames().
for (Locale locale : LOCALES) {
testDisplayNames(locale, LONG_FORMAT, LONG_STANDALONE);
testDisplayNames(locale, SHORT_FORMAT, SHORT_STANDALONE);
testDisplayNames(locale, NARROW_FORMAT, NARROW_STANDALONE);
}
if (errors > 0) {
throw new RuntimeException("Failed");
}
}
private static void testDisplayNames(Locale locale, int formatStyle, int standaloneStyle) {
Map<String, Integer> map = new HashMap<>();
for (int month = JANUARY; month <= DECEMBER; month++) {
Calendar cal = new GregorianCalendar(2015, month, 1);
String format = cal.getDisplayName(MONTH, formatStyle, locale);
String standalone = cal.getDisplayName(MONTH, standaloneStyle, locale);
if (!format.equals(standalone)) {
System.err.println("Calendar.getDisplayName: " + (month+1) +
", locale=" + locale +
", format=" + format + ", standalone=" + standalone);
errors++;
}
if (standalone != null) {
map.put(standalone, month);
}
}
if (formatStyle == NARROW_FORMAT) {
// Narrow styles don't support unique names.
// (e.g., "J" for JANUARY, JUNE, and JULY)
return;
}
Calendar cal = new GregorianCalendar(2015, JANUARY, 1);
Map<String, Integer> mapStandalone = cal.getDisplayNames(MONTH, standaloneStyle, locale);
if (!map.equals(mapStandalone)) {
System.err.printf("Calendar.getDisplayNames: locale=%s%n map=%s%n mapStandalone=%s%n",
locale, map, mapStandalone);
errors++;
}
Map<String, Integer> mapAll = cal.getDisplayNames(MONTH, ALL_STYLES, locale);
if (!mapAll.entrySet().containsAll(map.entrySet())) {
System.err.printf("Calendar.getDisplayNames: locale=%s%n map=%s%n mapAll=%s%n",
locale, map, mapAll);
errors++;
}
}
}

16
jdk/test/java/util/Calendar/NarrowNamesTest.java
View File

@ -86,7 +86,19 @@ public class NarrowNamesTest {
"\u6728",
"\u91d1",
"\u571f");
testMap(THTH, MONTH, NARROW_FORMAT); // expect null
testMap(THTH, MONTH, NARROW_FORMAT,
"\u0e21.\u0e04.",
"\u0e01.\u0e1e.",
"\u0e21\u0e35.\u0e04.",
"\u0e40\u0e21.\u0e22.",
"\u0e1e.\u0e04.",
"\u0e21\u0e34.\u0e22", // no last dot
"\u0e01.\u0e04.",
"\u0e2a.\u0e04.",
"\u0e01.\u0e22.",
"\u0e15.\u0e04.",
"\u0e1e.\u0e22.",
"\u0e18.\u0e04.");
testMap(THTH, MONTH, NARROW_STANDALONE,
"\u0e21.\u0e04.",
"\u0e01.\u0e1e.",
@ -146,7 +158,7 @@ public class NarrowNamesTest {
Calendar cal = Calendar.getInstance(locale);
Map<String, Integer> got = cal.getDisplayNames(field, style, locale);
if (!(expectedMap == null && got == null)
&& !expectedMap.equals(got)) {
&& !(expectedMap != null && expectedMap.equals(got))) {
System.err.printf("testMap: locale=%s, field=%d, style=%d, expected=%s, got=%s%n",
locale, field, style, expectedMap, got);
errors++;