{@code CalendarBuilder} retains the semantic of the pseudo
+ * timestamp for fields. {@code CalendarBuilder} uses a single
+ * int array combining fields[] and stamp[] of {@code Calendar}.
+ *
+ * @author Masayoshi Okutsu
+ */
+class CalendarBuilder {
+ /*
+ * Pseudo time stamp constants used in java.util.Calendar
+ */
+ private static final int UNSET = 0;
+ private static final int COMPUTED = 1;
+ private static final int MINIMUM_USER_STAMP = 2;
+
+ private static final int MAX_FIELD = FIELD_COUNT + 1;
+
+ public static final int WEEK_YEAR = FIELD_COUNT;
+ public static final int ISO_DAY_OF_WEEK = 1000; // pseudo field index
+
+ // stamp[] (lower half) and field[] (upper half) combined
+ private final int[] field;
+ private int nextStamp;
+ private int maxFieldIndex;
+
+ CalendarBuilder() {
+ field = new int[MAX_FIELD * 2];
+ nextStamp = MINIMUM_USER_STAMP;
+ maxFieldIndex = -1;
+ }
+
+ CalendarBuilder set(int index, int value) {
+ if (index == ISO_DAY_OF_WEEK) {
+ index = DAY_OF_WEEK;
+ value = toCalendarDayOfWeek(value);
+ }
+ field[index] = nextStamp++;
+ field[MAX_FIELD + index] = value;
+ if (index > maxFieldIndex && index < FIELD_COUNT) {
+ maxFieldIndex = index;
+ }
+ return this;
+ }
+
+ CalendarBuilder addYear(int value) {
+ field[MAX_FIELD + YEAR] += value;
+ field[MAX_FIELD + WEEK_YEAR] += value;
+ return this;
+ }
+
+ boolean isSet(int index) {
+ if (index == ISO_DAY_OF_WEEK) {
+ index = DAY_OF_WEEK;
+ }
+ return field[index] > UNSET;
+ }
+
+ Calendar establish(Calendar cal) {
+ boolean weekDate = isSet(WEEK_YEAR)
+ && field[WEEK_YEAR] > field[YEAR];
+ if (weekDate && !cal.isWeekDateSupported()) {
+ // Use YEAR instead
+ if (!isSet(YEAR)) {
+ set(YEAR, field[MAX_FIELD + WEEK_YEAR]);
+ }
+ weekDate = false;
+ }
+
+ cal.clear();
+ // Set the fields from the min stamp to the max stamp so that
+ // the field resolution works in the Calendar.
+ for (int stamp = MINIMUM_USER_STAMP; stamp < nextStamp; stamp++) {
+ for (int index = 0; index <= maxFieldIndex; index++) {
+ if (field[index] == stamp) {
+ cal.set(index, field[MAX_FIELD + index]);
+ break;
+ }
+ }
+ }
+
+ if (weekDate) {
+ int weekOfYear = isSet(WEEK_OF_YEAR) ? field[MAX_FIELD + WEEK_OF_YEAR] : 1;
+ int dayOfWeek = isSet(DAY_OF_WEEK) ?
+ field[MAX_FIELD + DAY_OF_WEEK] : cal.getFirstDayOfWeek();
+ if (!isValidDayOfWeek(dayOfWeek) && cal.isLenient()) {
+ if (dayOfWeek >= 8) {
+ dayOfWeek--;
+ weekOfYear += dayOfWeek / 7;
+ dayOfWeek = (dayOfWeek % 7) + 1;
+ } else {
+ while (dayOfWeek <= 0) {
+ dayOfWeek += 7;
+ weekOfYear--;
+ }
+ }
+ dayOfWeek = toCalendarDayOfWeek(dayOfWeek);
+ }
+ cal.setWeekDate(field[MAX_FIELD + WEEK_YEAR], weekOfYear, dayOfWeek);
+ }
+ return cal;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("CalendarBuilder:[");
+ for (int i = 0; i < field.length; i++) {
+ if (isSet(i)) {
+ sb.append(i).append('=').append(field[MAX_FIELD + i]).append(',');
+ }
+ }
+ int lastIndex = sb.length() - 1;
+ if (sb.charAt(lastIndex) == ',') {
+ sb.setLength(lastIndex);
+ }
+ sb.append(']');
+ return sb.toString();
+ }
+
+ static int toISODayOfWeek(int calendarDayOfWeek) {
+ return calendarDayOfWeek == SUNDAY ? 7 : calendarDayOfWeek - 1;
+ }
+
+ static int toCalendarDayOfWeek(int isoDayOfWeek) {
+ if (!isValidDayOfWeek(isoDayOfWeek)) {
+ // adjust later for lenient mode
+ return isoDayOfWeek;
+ }
+ return isoDayOfWeek == 7 ? SUNDAY : isoDayOfWeek + 1;
+ }
+
+ static boolean isValidDayOfWeek(int dayOfWeek) {
+ return dayOfWeek > 0 && dayOfWeek <= 7;
+ }
+}
diff -r 7bbabd9b79e6 -r 27cfdd5d48d1 jdk/src/share/classes/java/text/DateFormatSymbols.java
--- a/jdk/src/share/classes/java/text/DateFormatSymbols.java Wed Sep 01 16:15:57 2010 -0700
+++ b/jdk/src/share/classes/java/text/DateFormatSymbols.java Thu Sep 02 00:02:23 2010 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
@@ -226,7 +226,29 @@
* Unlocalized date-time pattern characters. For example: 'y', 'd', etc.
* All locales use the same these unlocalized pattern characters.
*/
- static final String patternChars = "GyMdkHmsSEDFwWahKzZ";
+ static final String patternChars = "GyMdkHmsSEDFwWahKzZYu";
+
+ static final int PATTERN_ERA = 0; // G
+ static final int PATTERN_YEAR = 1; // y
+ static final int PATTERN_MONTH = 2; // M
+ static final int PATTERN_DAY_OF_MONTH = 3; // d
+ static final int PATTERN_HOUR_OF_DAY1 = 4; // k
+ static final int PATTERN_HOUR_OF_DAY0 = 5; // H
+ static final int PATTERN_MINUTE = 6; // m
+ static final int PATTERN_SECOND = 7; // s
+ static final int PATTERN_MILLISECOND = 8; // S
+ static final int PATTERN_DAY_OF_WEEK = 9; // E
+ static final int PATTERN_DAY_OF_YEAR = 10; // D
+ static final int PATTERN_DAY_OF_WEEK_IN_MONTH = 11; // F
+ static final int PATTERN_WEEK_OF_YEAR = 12; // w
+ static final int PATTERN_WEEK_OF_MONTH = 13; // W
+ static final int PATTERN_AM_PM = 14; // a
+ static final int PATTERN_HOUR1 = 15; // h
+ static final int PATTERN_HOUR0 = 16; // K
+ static final int PATTERN_ZONE_NAME = 17; // z
+ static final int PATTERN_ZONE_VALUE = 18; // Z
+ static final int PATTERN_WEEK_YEAR = 19; // Y
+ static final int PATTERN_ISO_DAY_OF_WEEK = 20; // u
/**
* Localized date-time pattern characters. For example, a locale may
@@ -505,7 +527,7 @@
* @return the localized date-time pattern characters.
*/
public String getLocalPatternChars() {
- return new String(localPatternChars);
+ return localPatternChars;
}
/**
@@ -514,7 +536,8 @@
* pattern characters.
*/
public void setLocalPatternChars(String newLocalPatternChars) {
- localPatternChars = new String(newLocalPatternChars);
+ // Call toString() to throw an NPE in case the argument is null
+ localPatternChars = newLocalPatternChars.toString();
}
/**
@@ -699,7 +722,7 @@
} else {
dst.zoneStrings = null;
}
- dst.localPatternChars = new String (src.localPatternChars);
+ dst.localPatternChars = src.localPatternChars;
}
/**
diff -r 7bbabd9b79e6 -r 27cfdd5d48d1 jdk/src/share/classes/java/text/SimpleDateFormat.java
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java Wed Sep 01 16:15:57 2010 -0700
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java Thu Sep 02 00:02:23 2010 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2010, 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
@@ -55,6 +55,8 @@
import sun.util.calendar.ZoneInfoFile;
import sun.util.resources.LocaleData;
+import static java.text.DateFormatSymbols.*;
+
/**
* SimpleDateFormat is a concrete class for formatting and
* parsing dates in a locale-sensitive manner. It allows for formatting
@@ -108,40 +110,50 @@
*
1996; 96
* Y
+ * 2009; 09
+ * M
* July; Jul; 07
- * w
* 27
- * W
* 2
- * D
* 189
- * d
* 10
- * F
* 2
- * E
- * Tuesday; Tue
+ * u
+ * 1
* a
* For parsing, RFC 822 time zones are also
- * accepted.
+ * accepted.