organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 14:05:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

Initial ChineseDateFormat implementation

Browse source 
X-SVN-Rev: 2968
This commit is contained in:
Alan Liu 2000-11-21 06:58:06 +00:00
parent c9793c6267
commit 4c09473098
14 changed files with 472 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4j/src/com/ibm/icu/dev/test/calendar/CalendarTest.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/CalendarTest.java,v $
* $Date: 2000/11/18 00:17:58 $
* $Revision: 1.7 $
* $Date: 2000/11/21 06:58:06 $
* $Revision: 1.8 $
*
*****************************************************************************************
*/
@ -77,10 +77,10 @@ public class CalendarTest extends TestFmwk {
// Get a format to use for printing dates in the calendar system we're testing
DateFormat format = DateFormat.getDateTimeInstance(cal, DateFormat.SHORT, -1, Locale.getDefault());
// TODO Fix this to include the ERA ("G") again once ChineseDateFormat
// is implemented - Liu
final String pattern = "E, MM/dd/yyyy HH:mm:ss.S z";
final String pattern = (cal instanceof ChineseCalendar) ?
"E MMl/dd/y G HH:mm:ss.S z" :
"E, MM/dd/yyyy G HH:mm:ss.S z";
((SimpleDateFormat)format).applyPattern(pattern);

73
icu4j/src/com/ibm/icu/dev/test/calendar/ChineseTest.java
View file

@ -3,11 +3,12 @@
* others. All Rights Reserved.
*********************************************************************
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/ChineseTest.java,v $
* $Date: 2000/11/18 00:17:58 $
* $Revision: 1.1 $
* $Date: 2000/11/21 06:58:06 $
* $Revision: 1.2 $
*/
package com.ibm.test.calendar;
import com.ibm.util.*;
import com.ibm.text.*;
import java.util.Date;
import java.util.Locale;
@ -189,4 +190,72 @@ public class ChineseTest extends CalendarTest {
cal.setLenient(true);
doTestCases(tests, cal);
}
/**
* Test formatting.
*
* Leap months in this century:
* Wed May 23 2001 = Month 4(leap), Day 1, Year 18, Cycle 78
* Sun Mar 21 2004 = Month 2(leap), Day 1, Year 21, Cycle 78
* Thu Aug 24 2006 = Month 7(leap), Day 1, Year 23, Cycle 78
* Tue Jun 23 2009 = Month 5(leap), Day 1, Year 26, Cycle 78
* Mon May 21 2012 = Month 4(leap), Day 1, Year 29, Cycle 78
* Fri Oct 24 2014 = Month 9(leap), Day 1, Year 31, Cycle 78
* Sun Jul 23 2017 = Month 6(leap), Day 1, Year 34, Cycle 78
* Sat May 23 2020 = Month 4(leap), Day 1, Year 37, Cycle 78
* Wed Mar 22 2023 = Month 2(leap), Day 1, Year 40, Cycle 78
* Fri Jul 25 2025 = Month 6(leap), Day 1, Year 42, Cycle 78
* Fri Jun 23 2028 = Month 5(leap), Day 1, Year 45, Cycle 78
* Tue Apr 22 2031 = Month 3(leap), Day 1, Year 48, Cycle 78
* Thu Dec 22 2033 = Month 11(leap), Day 1, Year 50, Cycle 78
* Wed Jul 23 2036 = Month 6(leap), Day 1, Year 53, Cycle 78
* Wed Jun 22 2039 = Month 5(leap), Day 1, Year 56, Cycle 78
* Sat Mar 22 2042 = Month 2(leap), Day 1, Year 59, Cycle 78
* Tue Aug 23 2044 = Month 7(leap), Day 1, Year 01, Cycle 79
* Sun Jun 23 2047 = Month 5(leap), Day 1, Year 04, Cycle 79
* Thu Apr 21 2050 = Month 3(leap), Day 1, Year 07, Cycle 79
* Mon Sep 23 2052 = Month 8(leap), Day 1, Year 09, Cycle 79
* Sat Jul 24 2055 = Month 6(leap), Day 1, Year 12, Cycle 79
* Wed May 22 2058 = Month 4(leap), Day 1, Year 15, Cycle 79
* Wed Apr 20 2061 = Month 3(leap), Day 1, Year 18, Cycle 79
* Fri Aug 24 2063 = Month 7(leap), Day 1, Year 20, Cycle 79
* Wed Jun 23 2066 = Month 5(leap), Day 1, Year 23, Cycle 79
* Tue May 21 2069 = Month 4(leap), Day 1, Year 26, Cycle 79
* Thu Sep 24 2071 = Month 8(leap), Day 1, Year 28, Cycle 79
* Tue Jul 24 2074 = Month 6(leap), Day 1, Year 31, Cycle 79
* Sat May 22 2077 = Month 4(leap), Day 1, Year 34, Cycle 79
* Sat Apr 20 2080 = Month 3(leap), Day 1, Year 37, Cycle 79
* Mon Aug 24 2082 = Month 7(leap), Day 1, Year 39, Cycle 79
* Fri Jun 22 2085 = Month 5(leap), Day 1, Year 42, Cycle 79
* Fri May 21 2088 = Month 4(leap), Day 1, Year 45, Cycle 79
* Sun Sep 24 2090 = Month 8(leap), Day 1, Year 47, Cycle 79
* Thu Jul 23 2093 = Month 6(leap), Day 1, Year 50, Cycle 79
* Tue May 22 2096 = Month 4(leap), Day 1, Year 53, Cycle 79
* Sun Mar 22 2099 = Month 2(leap), Day 1, Year 56, Cycle 79
*/
public void TestFormat() {
ChineseCalendar cal = new ChineseCalendar();
DateFormat fmt = cal.getDateTimeFormat(
DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault());
Date[] DATA = {
new Date(2001-1900, Calendar.MAY, 22),
new Date(2001-1900, Calendar.MAY, 23)
};
for (int i=0; i<DATA.length; ++i) {
String s = fmt.format(DATA[i]);
try {
Date e = fmt.parse(s);
if (e.equals(DATA[i])) {
logln("Ok: " + DATA[i] + " -> " + s + " -> " + e);
} else {
errln("FAIL: " + DATA[i] + " -> " + s + " -> " + e);
}
} catch (java.text.ParseException e) {
errln("Fail: " + s + " -> parse failure at " + e.getErrorOffset());
errln(e.toString());
}
}
}
}

25
icu4j/src/com/ibm/icu/impl/data/ChineseCalendarSymbols.java
View file

@ -2,14 +2,31 @@ package com.ibm.util.resources;
import java.util.ListResourceBundle;
/**
* Default Date Format symbols for the Chinese calendar. This is a
* temporary class that may be removed when the ChineseDateFormat is
* finished.
* Default Date Format symbols for the Chinese calendar.
*/
public class ChineseCalendarSymbols extends ListResourceBundle {
static final Object[][] fContents = {
{ "", "" },
{ "IsLeapMonth",
new String[] {
"",
"*"
},
},
{ "DateTimePatterns",
new String[] {
"h:mm:ss a z", // full time pattern
"h:mm:ss a z", // long time pattern
"h:mm:ss a", // medium time pattern
"h:mm a", // short time pattern
// TODO Fix the following
"EEEE y'x'G-Ml-d", // full date pattern
"y'x'G-Ml-d", // long date pattern
"y'x'G-Ml-d", // medium date pattern
"y'x'G-Ml-d", // short date pattern
"{1} {0}" // date-time pattern
}
},
};
public synchronized Object[][] getContents() {

52
icu4j/src/com/ibm/icu/text/DateFormatSymbols.java
View file

@ -4,9 +4,9 @@
* others. All Rights Reserved. *
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java,v $
* $Date: 2000/10/17 20:54:59 $
* $Revision: 1.6 $
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/DateFormatSymbols.java,v $
* $Date: 2000/11/21 06:54:53 $
* $Revision: 1.7 $
*
*****************************************************************************************
*/
@ -452,7 +452,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
{
/* We have to handle two different formats of DateFormatZoneData.
* The first is used in JDK 1.2.2:
*
*
* | public Object[][] getContents() {
* | return new Object[][] {
* | {"zoneStrings",
@ -467,7 +467,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* | }
*
* The second is used in JDK 1.3:
*
*
* | public Object[][] getContents() {
* | return new Object[][] {
* | {"America/Los_Angeles", new String[] {"America/Los_Angeles", "Pacific Standard Time", "PST",
@ -620,7 +620,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* For example, the bundle corresponding to "com.ibm.util.HebrewCalendar"
* is "com.ibm.util.resources.HebrewCalendarSymbols".
* <p>
* Within the ResourceBundle, this method searches for five keys:
* Within the ResourceBundle, this method searches for five keys:
* <ul>
* <li><b>DayNames</b> -
* An array of strings corresponding to each possible
@ -666,13 +666,18 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* @see DateFormatSymbols#DateFormatSymbols(java.util.Locale)
*/
public DateFormatSymbols(Calendar cal, Locale locale) {
this(cal==null?null:cal.getClass(), locale);
}
public DateFormatSymbols(Class calendarClass, Locale locale) {
this(locale); // old-style construction
if (cal != null) {
if (calendarClass != null) {
ResourceBundle bundle = null;
try {
bundle = getDateFormatBundle(cal, locale);
bundle = getDateFormatBundle(calendarClass, locale);
} catch (MissingResourceException e) {
if (!(cal instanceof GregorianCalendar)) {
//if (!(cal instanceof GregorianCalendar)) {
if (!(GregorianCalendar.class.isAssignableFrom(calendarClass))) {
// Ok for symbols to be missing for a Gregorian calendar, but
// not for any other type.
throw e;
@ -696,7 +701,17 @@ public class DateFormatSymbols implements Serializable, Cloneable {
constructCalendarSpecific(bundle);
}
private void constructCalendarSpecific(ResourceBundle bundle) {
/**
* Given a resource bundle specific to the given Calendar class,
* initialize this object. Member variables will have already been
* initialized using the default mechanism, so only those that differ
* from or supplement the standard resource data need be handled here.
* If subclasses override this method, they should call
* <code>super.constructCalendarSpecific(bundle)</code> as needed to
* handle the "DayNames", "DayAbbreviations", "MonthNames",
* "MonthAbbreviations", and "Eras" resource data.
*/
protected void constructCalendarSpecific(ResourceBundle bundle) {
// Fetch the day names from the resource bundle. If they're not found,
// it's ok; we'll just use the default ones.
@ -752,26 +767,28 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* For example, the bundle corresponding to "com.ibm.util.HebrewCalendar"
* is "com.ibm.util.resources.HebrewCalendarSymbols".
*/
static public ResourceBundle getDateFormatBundle(Calendar cal, Locale locale)
static public ResourceBundle getDateFormatBundle(Class calendarClass, Locale locale)
throws MissingResourceException {
// Find the calendar's class name, which we're going to use to construct the
// resource bundle name.
String fullName = cal.getClass().getName();
String fullName = calendarClass.getName();
int lastDot = fullName.lastIndexOf('.');
String className = fullName.substring(lastDot+1);
// The name of the ResourceBundle itself is the calendar's fully-qualified
// name, with ".resources" inserted in the package and "Symbols" appended
// name, with ".resources" inserted in the package and "Symbols" appended.
// E.g., "my.pkg.MyCalendar" -> "my.pkg.resources.MyCalendarSymbols"
String bundleName = fullName.substring(0, lastDot+1) + "resources."
+ className + "Symbols";
ResourceBundle result = null;
try {
result = ResourceBundle.getBundle(bundleName, locale);
}
catch (MissingResourceException e) {
if (!(cal instanceof GregorianCalendar)) {
//if (!(cal instanceof GregorianCalendar)) {
if (!(GregorianCalendar.class.isAssignableFrom(calendarClass))) {
// Ok for symbols to be missing for a Gregorian calendar, but
// not for any other type.
throw e;
@ -779,4 +796,9 @@ public class DateFormatSymbols implements Serializable, Cloneable {
}
return result;
}
static public ResourceBundle getDateFormatBundle(Calendar cal, Locale locale)
throws MissingResourceException {
return getDateFormatBundle(cal==null?null:cal.getClass(), locale);
}
}

86
icu4j/src/com/ibm/icu/text/SimpleDateFormat.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java,v $
* $Date: 2000/05/26 21:38:55 $
* $Revision: 1.6 $
* $Date: 2000/11/21 06:54:53 $
* $Revision: 1.7 $
*
*****************************************************************************************
*/
@ -60,6 +60,7 @@ import java.lang.StringIndexOutOfBoundsException;
* ------ ------- ------------ -------
* G era designator (Text) AD
* y year (Number) 1996
* u extended year (Number) 4601
* M month in year (Text & Number) July & 07
* d day in month (Number) 10
* h hour in am/pm (1~12) (Number) 12
@ -461,7 +462,17 @@ public class SimpleDateFormat extends DateFormat {
DateFormat.TIMEZONE_FIELD,
};
// Private member function that does the real date/time formatting.
/**
* Format a single field, given its pattern character. Subclasses may
* override this method in order to modify or add formatting
* capabilities.
* @param ch the pattern character
* @param count the number of times ch is repeated in the pattern
* @param beginOffset the offset of the output string at the start of
* this field; used to set pos when appropriate
* @param pos receives the position of a field, when appropriate
* @param formatData the symbols for this formatter
*/
protected String subFormat(char ch, int count, int beginOffset,
FieldPosition pos, DateFormatSymbols formatData)
throws IllegalArgumentException
@ -470,6 +481,12 @@ public class SimpleDateFormat extends DateFormat {
int maxIntCount = Integer.MAX_VALUE;
String current = "";
// TEMPORARY HACK TODO fix this
if (ch == 'u') { // 'u' - EXTENDED_YEAR
return zeroPaddingNumber(calendar.get(Calendar.EXTENDED_YEAR),
1, maxIntCount);
}
if ((patternCharIndex=formatData.patternChars.indexOf(ch)) == -1)
throw new IllegalArgumentException("Illegal pattern character " +
"'" + ch + "'");
@ -830,15 +847,22 @@ public class SimpleDateFormat extends DateFormat {
}
/**
* Private code-size reduction function used by subParse.
* Attempt to match the text at a given position against an array of
* strings. Since multiple strings in the array may match (for
* example, if the array contains "a", "ab", and "abc", all will match
* the input string "abcd") the longest match is returned. As a side
* effect, the given field of <code>calendar</code> is set to the index
* of the best match, if there is one.
* @param text the time text being parsed.
* @param start where to start parsing.
* @param field the date field being parsed.
* @param data the string array to parsed.
* @return the new start position if matching succeeded; a negative number
* indicating matching failure, otherwise.
* @return the new start position if matching succeeded; a negative
* number indicating matching failure, otherwise. As a side effect,
* sets the <code>calendar</code> field <code>field</code> to the index
* of the best match, if matching succeeded.
*/
private int matchString(String text, int start, int field, String[] data)
protected int matchString(String text, int start, int field, String[] data)
{
int i = 0;
int count = data.length;
@ -929,8 +953,10 @@ public class SimpleDateFormat extends DateFormat {
}
/**
* Private member function that converts the parsed date strings into
* timeFields. Returns -start (for ParsePosition) if failed.
* Protected method that converts one field of the input string into a
* numeric field value in <code>calendar</code>. Returns -start (for
* ParsePosition) if failed. Subclasses may override this method to
* modify or add parsing capabilities.
* @param text the time text to be parsed.
* @param start where to start parsing.
* @param ch the pattern character for the date field text to be parsed.
@ -939,11 +965,13 @@ public class SimpleDateFormat extends DateFormat {
* and we should use the count to know when to stop parsing.
* @param ambiguousYear return parameter; upon return, if ambiguousYear[0]
* is true, then a two-digit year was parsed and may need to be readjusted.
* @return the new start position if matching succeeded; a negative number
* indicating matching failure, otherwise.
* @return the new start position if matching succeeded; a negative
* number indicating matching failure, otherwise. As a side effect,
* set the appropriate field of <code>calendar</code> with the parsed
* value.
*/
private int subParse(String text, int start, char ch, int count,
boolean obeyCount, boolean[] ambiguousYear)
protected int subParse(String text, int start, char ch, int count,
boolean obeyCount, boolean[] ambiguousYear)
{
Number number = null;
int value = 0;
@ -951,6 +979,31 @@ public class SimpleDateFormat extends DateFormat {
ParsePosition pos = new ParsePosition(0);
int patternCharIndex = -1;
// TEMPORARY HACK TODO fix this
if (ch == 'u') { // 'u' - EXTENDED_YEAR
pos.setIndex(start);
for (;;) {
if (pos.getIndex() >= text.length()) return -start;
char c = text.charAt(pos.getIndex());
if (c != ' ' && c != '\t') break;
pos.setIndex(pos.getIndex()+1);
}
if (obeyCount) {
if ((start+count) > text.length()) {
return -start;
}
number = numberFormat.parse(text.substring(0, start+count), pos);
} else {
number = numberFormat.parse(text, pos);
}
if (number == null) {
return -start;
}
value = number.intValue();
calendar.set(Calendar.EXTENDED_YEAR, value);
return pos.getIndex();
}
if ((patternCharIndex=formatData.patternChars.indexOf(ch)) == -1)
return -start;
@ -1289,6 +1342,13 @@ public class SimpleDateFormat extends DateFormat {
this.formatData = (DateFormatSymbols)newFormatSymbols.clone();
}
/**
* Method for subclasses to access the DateFormatSymbols.
*/
protected DateFormatSymbols getSymbols() {
return formatData;
}
/**
* Overrides Cloneable
*/

24
icu4j/src/com/ibm/icu/util/Calendar.java
View file

@ -368,7 +368,7 @@ import com.ibm.text.SimpleDateFormat;
* @see GregorianCalendar
* @see TimeZone
* @see DateFormat
* @version $Revision: 1.11 $ $Date: 2000/11/18 01:07:18 $
* @version $Revision: 1.12 $ $Date: 2000/11/21 06:55:09 $
* @author Mark Davis, David Goldsmith, Chen-Lieh Huang, Alan Liu, Laura Werner
* @since JDK1.1
*/
@ -2174,6 +2174,17 @@ public abstract class Calendar implements Serializable, Cloneable {
public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, Locale loc) {
return formatHelper(this, loc, dateStyle, timeStyle);
}
/**
* Framework method to create a calendar-specific DateFormat object
* using the the given pattern. This method is responsible for
* creating the calendar- specific DateFormat and DateFormatSymbols
* objects as needed.
*/
protected DateFormat handleGetDateFormat(String pattern, Locale locale) {
DateFormatSymbols symbols = new DateFormatSymbols(this, locale);
return new SimpleDateFormat(pattern, symbols);
}
static private DateFormat formatHelper(Calendar cal, Locale loc,
int dateStyle, int timeStyle)
@ -2181,17 +2192,10 @@ public abstract class Calendar implements Serializable, Cloneable {
// See if there are any custom resources for this calendar
// If not, just use the default DateFormat
DateFormat result = null;
DateFormatSymbols symbols = null;
ResourceBundle bundle = DateFormatSymbols.getDateFormatBundle(cal, loc);
if (bundle != null) {
//if (cal instanceof com.ibm.util.Calendar) {
// symbols = ((com.ibm.util.Calendar)cal).getDateFormatSymbols(loc);
//} else {
// symbols = getDateFormatSymbols(null, bundle, loc);
//}
symbols = new DateFormatSymbols(cal, loc);
try {
String[] patterns = bundle.getStringArray("DateTimePatterns");
@ -2211,7 +2215,7 @@ public abstract class Calendar implements Serializable, Cloneable {
else {
throw new IllegalArgumentException("No date or time style specified");
}
result = new SimpleDateFormat(pattern, symbols);
result = cal.handleGetDateFormat(pattern, loc);
} catch (MissingResourceException e) {
// No custom patterns
if (dateStyle == -1) {
@ -2221,7 +2225,7 @@ public abstract class Calendar implements Serializable, Cloneable {
} else {
result = SimpleDateFormat.getDateTimeInstance(dateStyle, timeStyle, loc);
}
//((java.text.SimpleDateFormat)result).setDateFormatSymbols(oldStyleSymbols(symbols, loc));
DateFormatSymbols symbols = new DateFormatSymbols(cal, loc);
((SimpleDateFormat)result).setDateFormatSymbols(symbols); // aliu
}
} else {

16
icu4j/src/com/ibm/icu/util/ChineseCalendar.java
View file

@ -3,10 +3,11 @@
* others. All Rights Reserved.
*********************************************************************
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/ChineseCalendar.java,v $
* $Date: 2000/11/18 01:07:18 $
* $Revision: 1.3 $
* $Date: 2000/11/21 06:55:09 $
* $Revision: 1.4 $
*/
package com.ibm.util;
import com.ibm.text.*;
import java.util.Date;
import java.util.Locale;
@ -248,6 +249,17 @@ public class ChineseCalendar extends Calendar {
return nextStart - thisStart;
}
/**
* Framework method to create a calendar-specific DateFormat object
* using the the given pattern. This method is responsible for
* creating the calendar- specific DateFormat and DateFormatSymbols
* objects as needed.
*/
protected DateFormat handleGetDateFormat(String pattern, Locale locale) {
return new ChineseDateFormat(pattern, locale);
}
//------------------------------------------------------------------
// Support methods and constants
//------------------------------------------------------------------

12
icu4j/src/com/ibm/test/calendar/CalendarTest.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/test/calendar/Attic/CalendarTest.java,v $
* $Date: 2000/11/18 00:17:58 $
* $Revision: 1.7 $
* $Date: 2000/11/21 06:58:06 $
* $Revision: 1.8 $
*
*****************************************************************************************
*/
@ -77,10 +77,10 @@ public class CalendarTest extends TestFmwk {
// Get a format to use for printing dates in the calendar system we're testing
DateFormat format = DateFormat.getDateTimeInstance(cal, DateFormat.SHORT, -1, Locale.getDefault());
// TODO Fix this to include the ERA ("G") again once ChineseDateFormat
// is implemented - Liu
final String pattern = "E, MM/dd/yyyy HH:mm:ss.S z";
final String pattern = (cal instanceof ChineseCalendar) ?
"E MMl/dd/y G HH:mm:ss.S z" :
"E, MM/dd/yyyy G HH:mm:ss.S z";
((SimpleDateFormat)format).applyPattern(pattern);

73
icu4j/src/com/ibm/test/calendar/ChineseTest.java
View file

@ -3,11 +3,12 @@
* others. All Rights Reserved.
*********************************************************************
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/test/calendar/Attic/ChineseTest.java,v $
* $Date: 2000/11/18 00:17:58 $
* $Revision: 1.1 $
* $Date: 2000/11/21 06:58:06 $
* $Revision: 1.2 $
*/
package com.ibm.test.calendar;
import com.ibm.util.*;
import com.ibm.text.*;
import java.util.Date;
import java.util.Locale;
@ -189,4 +190,72 @@ public class ChineseTest extends CalendarTest {
cal.setLenient(true);
doTestCases(tests, cal);
}
/**
* Test formatting.
*
* Leap months in this century:
* Wed May 23 2001 = Month 4(leap), Day 1, Year 18, Cycle 78
* Sun Mar 21 2004 = Month 2(leap), Day 1, Year 21, Cycle 78
* Thu Aug 24 2006 = Month 7(leap), Day 1, Year 23, Cycle 78
* Tue Jun 23 2009 = Month 5(leap), Day 1, Year 26, Cycle 78
* Mon May 21 2012 = Month 4(leap), Day 1, Year 29, Cycle 78
* Fri Oct 24 2014 = Month 9(leap), Day 1, Year 31, Cycle 78
* Sun Jul 23 2017 = Month 6(leap), Day 1, Year 34, Cycle 78
* Sat May 23 2020 = Month 4(leap), Day 1, Year 37, Cycle 78
* Wed Mar 22 2023 = Month 2(leap), Day 1, Year 40, Cycle 78
* Fri Jul 25 2025 = Month 6(leap), Day 1, Year 42, Cycle 78
* Fri Jun 23 2028 = Month 5(leap), Day 1, Year 45, Cycle 78
* Tue Apr 22 2031 = Month 3(leap), Day 1, Year 48, Cycle 78
* Thu Dec 22 2033 = Month 11(leap), Day 1, Year 50, Cycle 78
* Wed Jul 23 2036 = Month 6(leap), Day 1, Year 53, Cycle 78
* Wed Jun 22 2039 = Month 5(leap), Day 1, Year 56, Cycle 78
* Sat Mar 22 2042 = Month 2(leap), Day 1, Year 59, Cycle 78
* Tue Aug 23 2044 = Month 7(leap), Day 1, Year 01, Cycle 79
* Sun Jun 23 2047 = Month 5(leap), Day 1, Year 04, Cycle 79
* Thu Apr 21 2050 = Month 3(leap), Day 1, Year 07, Cycle 79
* Mon Sep 23 2052 = Month 8(leap), Day 1, Year 09, Cycle 79
* Sat Jul 24 2055 = Month 6(leap), Day 1, Year 12, Cycle 79
* Wed May 22 2058 = Month 4(leap), Day 1, Year 15, Cycle 79
* Wed Apr 20 2061 = Month 3(leap), Day 1, Year 18, Cycle 79
* Fri Aug 24 2063 = Month 7(leap), Day 1, Year 20, Cycle 79
* Wed Jun 23 2066 = Month 5(leap), Day 1, Year 23, Cycle 79
* Tue May 21 2069 = Month 4(leap), Day 1, Year 26, Cycle 79
* Thu Sep 24 2071 = Month 8(leap), Day 1, Year 28, Cycle 79
* Tue Jul 24 2074 = Month 6(leap), Day 1, Year 31, Cycle 79
* Sat May 22 2077 = Month 4(leap), Day 1, Year 34, Cycle 79
* Sat Apr 20 2080 = Month 3(leap), Day 1, Year 37, Cycle 79
* Mon Aug 24 2082 = Month 7(leap), Day 1, Year 39, Cycle 79
* Fri Jun 22 2085 = Month 5(leap), Day 1, Year 42, Cycle 79
* Fri May 21 2088 = Month 4(leap), Day 1, Year 45, Cycle 79
* Sun Sep 24 2090 = Month 8(leap), Day 1, Year 47, Cycle 79
* Thu Jul 23 2093 = Month 6(leap), Day 1, Year 50, Cycle 79
* Tue May 22 2096 = Month 4(leap), Day 1, Year 53, Cycle 79
* Sun Mar 22 2099 = Month 2(leap), Day 1, Year 56, Cycle 79
*/
public void TestFormat() {
ChineseCalendar cal = new ChineseCalendar();
DateFormat fmt = cal.getDateTimeFormat(
DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault());
Date[] DATA = {
new Date(2001-1900, Calendar.MAY, 22),
new Date(2001-1900, Calendar.MAY, 23)
};
for (int i=0; i<DATA.length; ++i) {
String s = fmt.format(DATA[i]);
try {
Date e = fmt.parse(s);
if (e.equals(DATA[i])) {
logln("Ok: " + DATA[i] + " -> " + s + " -> " + e);
} else {
errln("FAIL: " + DATA[i] + " -> " + s + " -> " + e);
}
} catch (java.text.ParseException e) {
errln("Fail: " + s + " -> parse failure at " + e.getErrorOffset());
errln(e.toString());
}
}
}
}

52
icu4j/src/com/ibm/text/DateFormatSymbols.java
View file

@ -4,9 +4,9 @@
* others. All Rights Reserved. *
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/DateFormatSymbols.java,v $
* $Date: 2000/10/17 20:54:59 $
* $Revision: 1.6 $
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/DateFormatSymbols.java,v $
* $Date: 2000/11/21 06:54:53 $
* $Revision: 1.7 $
*
*****************************************************************************************
*/
@ -452,7 +452,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
{
/* We have to handle two different formats of DateFormatZoneData.
* The first is used in JDK 1.2.2:
*
*
* | public Object[][] getContents() {
* | return new Object[][] {
* | {"zoneStrings",
@ -467,7 +467,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* | }
*
* The second is used in JDK 1.3:
*
*
* | public Object[][] getContents() {
* | return new Object[][] {
* | {"America/Los_Angeles", new String[] {"America/Los_Angeles", "Pacific Standard Time", "PST",
@ -620,7 +620,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* For example, the bundle corresponding to "com.ibm.util.HebrewCalendar"
* is "com.ibm.util.resources.HebrewCalendarSymbols".
* <p>
* Within the ResourceBundle, this method searches for five keys:
* Within the ResourceBundle, this method searches for five keys:
* <ul>
* <li><b>DayNames</b> -
* An array of strings corresponding to each possible
@ -666,13 +666,18 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* @see DateFormatSymbols#DateFormatSymbols(java.util.Locale)
*/
public DateFormatSymbols(Calendar cal, Locale locale) {
this(cal==null?null:cal.getClass(), locale);
}
public DateFormatSymbols(Class calendarClass, Locale locale) {
this(locale); // old-style construction
if (cal != null) {
if (calendarClass != null) {
ResourceBundle bundle = null;
try {
bundle = getDateFormatBundle(cal, locale);
bundle = getDateFormatBundle(calendarClass, locale);
} catch (MissingResourceException e) {
if (!(cal instanceof GregorianCalendar)) {
//if (!(cal instanceof GregorianCalendar)) {
if (!(GregorianCalendar.class.isAssignableFrom(calendarClass))) {
// Ok for symbols to be missing for a Gregorian calendar, but
// not for any other type.
throw e;
@ -696,7 +701,17 @@ public class DateFormatSymbols implements Serializable, Cloneable {
constructCalendarSpecific(bundle);
}
private void constructCalendarSpecific(ResourceBundle bundle) {
/**
* Given a resource bundle specific to the given Calendar class,
* initialize this object. Member variables will have already been
* initialized using the default mechanism, so only those that differ
* from or supplement the standard resource data need be handled here.
* If subclasses override this method, they should call
* <code>super.constructCalendarSpecific(bundle)</code> as needed to
* handle the "DayNames", "DayAbbreviations", "MonthNames",
* "MonthAbbreviations", and "Eras" resource data.
*/
protected void constructCalendarSpecific(ResourceBundle bundle) {
// Fetch the day names from the resource bundle. If they're not found,
// it's ok; we'll just use the default ones.
@ -752,26 +767,28 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* For example, the bundle corresponding to "com.ibm.util.HebrewCalendar"
* is "com.ibm.util.resources.HebrewCalendarSymbols".
*/
static public ResourceBundle getDateFormatBundle(Calendar cal, Locale locale)
static public ResourceBundle getDateFormatBundle(Class calendarClass, Locale locale)
throws MissingResourceException {
// Find the calendar's class name, which we're going to use to construct the
// resource bundle name.
String fullName = cal.getClass().getName();
String fullName = calendarClass.getName();
int lastDot = fullName.lastIndexOf('.');
String className = fullName.substring(lastDot+1);
// The name of the ResourceBundle itself is the calendar's fully-qualified
// name, with ".resources" inserted in the package and "Symbols" appended
// name, with ".resources" inserted in the package and "Symbols" appended.
// E.g., "my.pkg.MyCalendar" -> "my.pkg.resources.MyCalendarSymbols"
String bundleName = fullName.substring(0, lastDot+1) + "resources."
+ className + "Symbols";
ResourceBundle result = null;
try {
result = ResourceBundle.getBundle(bundleName, locale);
}
catch (MissingResourceException e) {
if (!(cal instanceof GregorianCalendar)) {
//if (!(cal instanceof GregorianCalendar)) {
if (!(GregorianCalendar.class.isAssignableFrom(calendarClass))) {
// Ok for symbols to be missing for a Gregorian calendar, but
// not for any other type.
throw e;
@ -779,4 +796,9 @@ public class DateFormatSymbols implements Serializable, Cloneable {
}
return result;
}
static public ResourceBundle getDateFormatBundle(Calendar cal, Locale locale)
throws MissingResourceException {
return getDateFormatBundle(cal==null?null:cal.getClass(), locale);
}
}

86
icu4j/src/com/ibm/text/SimpleDateFormat.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/SimpleDateFormat.java,v $
* $Date: 2000/05/26 21:38:55 $
* $Revision: 1.6 $
* $Date: 2000/11/21 06:54:53 $
* $Revision: 1.7 $
*
*****************************************************************************************
*/
@ -60,6 +60,7 @@ import java.lang.StringIndexOutOfBoundsException;
* ------ ------- ------------ -------
* G era designator (Text) AD
* y year (Number) 1996
* u extended year (Number) 4601
* M month in year (Text & Number) July & 07
* d day in month (Number) 10
* h hour in am/pm (1~12) (Number) 12
@ -461,7 +462,17 @@ public class SimpleDateFormat extends DateFormat {
DateFormat.TIMEZONE_FIELD,
};
// Private member function that does the real date/time formatting.
/**
* Format a single field, given its pattern character. Subclasses may
* override this method in order to modify or add formatting
* capabilities.
* @param ch the pattern character
* @param count the number of times ch is repeated in the pattern
* @param beginOffset the offset of the output string at the start of
* this field; used to set pos when appropriate
* @param pos receives the position of a field, when appropriate
* @param formatData the symbols for this formatter
*/
protected String subFormat(char ch, int count, int beginOffset,
FieldPosition pos, DateFormatSymbols formatData)
throws IllegalArgumentException
@ -470,6 +481,12 @@ public class SimpleDateFormat extends DateFormat {
int maxIntCount = Integer.MAX_VALUE;
String current = "";
// TEMPORARY HACK TODO fix this
if (ch == 'u') { // 'u' - EXTENDED_YEAR
return zeroPaddingNumber(calendar.get(Calendar.EXTENDED_YEAR),
1, maxIntCount);
}
if ((patternCharIndex=formatData.patternChars.indexOf(ch)) == -1)
throw new IllegalArgumentException("Illegal pattern character " +
"'" + ch + "'");
@ -830,15 +847,22 @@ public class SimpleDateFormat extends DateFormat {
}
/**
* Private code-size reduction function used by subParse.
* Attempt to match the text at a given position against an array of
* strings. Since multiple strings in the array may match (for
* example, if the array contains "a", "ab", and "abc", all will match
* the input string "abcd") the longest match is returned. As a side
* effect, the given field of <code>calendar</code> is set to the index
* of the best match, if there is one.
* @param text the time text being parsed.
* @param start where to start parsing.
* @param field the date field being parsed.
* @param data the string array to parsed.
* @return the new start position if matching succeeded; a negative number
* indicating matching failure, otherwise.
* @return the new start position if matching succeeded; a negative
* number indicating matching failure, otherwise. As a side effect,
* sets the <code>calendar</code> field <code>field</code> to the index
* of the best match, if matching succeeded.
*/
private int matchString(String text, int start, int field, String[] data)
protected int matchString(String text, int start, int field, String[] data)
{
int i = 0;
int count = data.length;
@ -929,8 +953,10 @@ public class SimpleDateFormat extends DateFormat {
}
/**
* Private member function that converts the parsed date strings into
* timeFields. Returns -start (for ParsePosition) if failed.
* Protected method that converts one field of the input string into a
* numeric field value in <code>calendar</code>. Returns -start (for
* ParsePosition) if failed. Subclasses may override this method to
* modify or add parsing capabilities.
* @param text the time text to be parsed.
* @param start where to start parsing.
* @param ch the pattern character for the date field text to be parsed.
@ -939,11 +965,13 @@ public class SimpleDateFormat extends DateFormat {
* and we should use the count to know when to stop parsing.
* @param ambiguousYear return parameter; upon return, if ambiguousYear[0]
* is true, then a two-digit year was parsed and may need to be readjusted.
* @return the new start position if matching succeeded; a negative number
* indicating matching failure, otherwise.
* @return the new start position if matching succeeded; a negative
* number indicating matching failure, otherwise. As a side effect,
* set the appropriate field of <code>calendar</code> with the parsed
* value.
*/
private int subParse(String text, int start, char ch, int count,
boolean obeyCount, boolean[] ambiguousYear)
protected int subParse(String text, int start, char ch, int count,
boolean obeyCount, boolean[] ambiguousYear)
{
Number number = null;
int value = 0;
@ -951,6 +979,31 @@ public class SimpleDateFormat extends DateFormat {
ParsePosition pos = new ParsePosition(0);
int patternCharIndex = -1;
// TEMPORARY HACK TODO fix this
if (ch == 'u') { // 'u' - EXTENDED_YEAR
pos.setIndex(start);
for (;;) {
if (pos.getIndex() >= text.length()) return -start;
char c = text.charAt(pos.getIndex());
if (c != ' ' && c != '\t') break;
pos.setIndex(pos.getIndex()+1);
}
if (obeyCount) {
if ((start+count) > text.length()) {
return -start;
}
number = numberFormat.parse(text.substring(0, start+count), pos);
} else {
number = numberFormat.parse(text, pos);
}
if (number == null) {
return -start;
}
value = number.intValue();
calendar.set(Calendar.EXTENDED_YEAR, value);
return pos.getIndex();
}
if ((patternCharIndex=formatData.patternChars.indexOf(ch)) == -1)
return -start;
@ -1289,6 +1342,13 @@ public class SimpleDateFormat extends DateFormat {
this.formatData = (DateFormatSymbols)newFormatSymbols.clone();
}
/**
* Method for subclasses to access the DateFormatSymbols.
*/
protected DateFormatSymbols getSymbols() {
return formatData;
}
/**
* Overrides Cloneable
*/

24
icu4j/src/com/ibm/util/Calendar.java
View file

@ -368,7 +368,7 @@ import com.ibm.text.SimpleDateFormat;
* @see GregorianCalendar
* @see TimeZone
* @see DateFormat
* @version $Revision: 1.11 $ $Date: 2000/11/18 01:07:18 $
* @version $Revision: 1.12 $ $Date: 2000/11/21 06:55:09 $
* @author Mark Davis, David Goldsmith, Chen-Lieh Huang, Alan Liu, Laura Werner
* @since JDK1.1
*/
@ -2174,6 +2174,17 @@ public abstract class Calendar implements Serializable, Cloneable {
public DateFormat getDateTimeFormat(int dateStyle, int timeStyle, Locale loc) {
return formatHelper(this, loc, dateStyle, timeStyle);
}
/**
* Framework method to create a calendar-specific DateFormat object
* using the the given pattern. This method is responsible for
* creating the calendar- specific DateFormat and DateFormatSymbols
* objects as needed.
*/
protected DateFormat handleGetDateFormat(String pattern, Locale locale) {
DateFormatSymbols symbols = new DateFormatSymbols(this, locale);
return new SimpleDateFormat(pattern, symbols);
}
static private DateFormat formatHelper(Calendar cal, Locale loc,
int dateStyle, int timeStyle)
@ -2181,17 +2192,10 @@ public abstract class Calendar implements Serializable, Cloneable {
// See if there are any custom resources for this calendar
// If not, just use the default DateFormat
DateFormat result = null;
DateFormatSymbols symbols = null;
ResourceBundle bundle = DateFormatSymbols.getDateFormatBundle(cal, loc);
if (bundle != null) {
//if (cal instanceof com.ibm.util.Calendar) {
// symbols = ((com.ibm.util.Calendar)cal).getDateFormatSymbols(loc);
//} else {
// symbols = getDateFormatSymbols(null, bundle, loc);
//}
symbols = new DateFormatSymbols(cal, loc);
try {
String[] patterns = bundle.getStringArray("DateTimePatterns");
@ -2211,7 +2215,7 @@ public abstract class Calendar implements Serializable, Cloneable {
else {
throw new IllegalArgumentException("No date or time style specified");
}
result = new SimpleDateFormat(pattern, symbols);
result = cal.handleGetDateFormat(pattern, loc);
} catch (MissingResourceException e) {
// No custom patterns
if (dateStyle == -1) {
@ -2221,7 +2225,7 @@ public abstract class Calendar implements Serializable, Cloneable {
} else {
result = SimpleDateFormat.getDateTimeInstance(dateStyle, timeStyle, loc);
}
//((java.text.SimpleDateFormat)result).setDateFormatSymbols(oldStyleSymbols(symbols, loc));
DateFormatSymbols symbols = new DateFormatSymbols(cal, loc);
((SimpleDateFormat)result).setDateFormatSymbols(symbols); // aliu
}
} else {

16
icu4j/src/com/ibm/util/ChineseCalendar.java
View file

@ -3,10 +3,11 @@
* others. All Rights Reserved.
*********************************************************************
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/util/Attic/ChineseCalendar.java,v $
* $Date: 2000/11/18 01:07:18 $
* $Revision: 1.3 $
* $Date: 2000/11/21 06:55:09 $
* $Revision: 1.4 $
*/
package com.ibm.util;
import com.ibm.text.*;
import java.util.Date;
import java.util.Locale;
@ -248,6 +249,17 @@ public class ChineseCalendar extends Calendar {
return nextStart - thisStart;
}
/**
* Framework method to create a calendar-specific DateFormat object
* using the the given pattern. This method is responsible for
* creating the calendar- specific DateFormat and DateFormatSymbols
* objects as needed.
*/
protected DateFormat handleGetDateFormat(String pattern, Locale locale) {
return new ChineseDateFormat(pattern, locale);
}
//------------------------------------------------------------------
// Support methods and constants
//------------------------------------------------------------------

25
icu4j/src/com/ibm/util/resources/ChineseCalendarSymbols.java
View file

@ -2,14 +2,31 @@ package com.ibm.util.resources;
import java.util.ListResourceBundle;
/**
* Default Date Format symbols for the Chinese calendar. This is a
* temporary class that may be removed when the ChineseDateFormat is
* finished.
* Default Date Format symbols for the Chinese calendar.
*/
public class ChineseCalendarSymbols extends ListResourceBundle {
static final Object[][] fContents = {
{ "", "" },
{ "IsLeapMonth",
new String[] {
"",
"*"
},
},
{ "DateTimePatterns",
new String[] {
"h:mm:ss a z", // full time pattern
"h:mm:ss a z", // long time pattern
"h:mm:ss a", // medium time pattern
"h:mm a", // short time pattern
// TODO Fix the following
"EEEE y'x'G-Ml-d", // full date pattern
"y'x'G-Ml-d", // long date pattern
"y'x'G-Ml-d", // medium date pattern
"y'x'G-Ml-d", // short date pattern
"{1} {0}" // date-time pattern
}
},
};
public synchronized Object[][] getContents() {