ICU-3348 tags cleanup
X-SVN-Rev: 13910
This commit is contained in:
Doug Felt
parent
5d0e4f98e5
commit
99f2ec50f9
@ -5,8 +5,8 @@
|
||||
*******************************************************************************
|
||||
*
|
||||
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/ByteArrayWrapper.java,v $
|
||||
* $Date: 2003/09/23 04:16:45 $
|
||||
* $Revision: 1.2 $
|
||||
* $Date: 2003/12/01 21:17:31 $
|
||||
* $Revision: 1.3 $
|
||||
*
|
||||
*******************************************************************************
|
||||
*/
|
||||
@ -42,6 +42,15 @@ public class ByteArrayWrapper
|
||||
*/
|
||||
public int size;
|
||||
|
||||
// public constructor ------------------------------------------------
|
||||
|
||||
/**
|
||||
* Construct a new ByteArrayWrapper with no data.
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public ByteArrayWrapper() {
|
||||
}
|
||||
|
||||
// public methods ----------------------------------------------------
|
||||
|
||||
/**
|
||||
@ -69,6 +78,7 @@ public class ByteArrayWrapper
|
||||
* @param src source byte array to copy from
|
||||
* @param start start offset of src to copy from
|
||||
* @param limit end + 1 offset of src to copy from
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public final void set(byte[] src, int start, int limit)
|
||||
{
|
||||
@ -117,7 +127,6 @@ public class ByteArrayWrapper
|
||||
* @param tgt target byte array to copy to
|
||||
* @param tgtoff start offset of tgt to copy to
|
||||
* @param length size of contents to copy
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
private static final void copyBytes(byte[] src, int srcoff, byte[] tgt,
|
||||
int tgtoff, int length) {
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
*******************************************************************************
|
||||
*
|
||||
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/EasterHoliday.java,v $
|
||||
* $Date: 2003/10/02 20:50:26 $
|
||||
* $Revision: 1.11 $
|
||||
* $Date: 2003/12/01 21:18:22 $
|
||||
* $Revision: 1.12 $
|
||||
*
|
||||
*****************************************************************************************
|
||||
*/
|
||||
@ -19,7 +19,7 @@ import java.util.Date;
|
||||
* A Holiday subclass which represents holidays that occur
|
||||
* a fixed number of days before or after Easter. Supports both the
|
||||
* Western and Orthodox methods for calculating Easter.
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public class EasterHoliday extends Holiday
|
||||
{
|
||||
@ -27,7 +27,7 @@ public class EasterHoliday extends Holiday
|
||||
* Construct a holiday that falls on Easter Sunday every year
|
||||
*
|
||||
* @param name The name of the holiday
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public EasterHoliday(String name)
|
||||
{
|
||||
@ -40,7 +40,7 @@ public class EasterHoliday extends Holiday
|
||||
*
|
||||
* @param daysAfter The number of days before (-) or after (+) Easter
|
||||
* @param name The name of the holiday
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public EasterHoliday(int daysAfter, String name)
|
||||
{
|
||||
@ -55,7 +55,7 @@ public class EasterHoliday extends Holiday
|
||||
* @param daysAfter The number of days before (-) or after (+) Easter
|
||||
* @param orthodox Use the Orthodox calendar?
|
||||
* @param name The name of the holiday
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public EasterHoliday(int daysAfter, boolean orthodox, String name)
|
||||
{
|
||||
@ -64,73 +64,73 @@ public class EasterHoliday extends Holiday
|
||||
|
||||
/**
|
||||
* Shrove Tuesday, aka Mardi Gras, 48 days before Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday SHROVE_TUESDAY = new EasterHoliday(-48, "Shrove Tuesday");
|
||||
|
||||
/**
|
||||
* Ash Wednesday, start of Lent, 47 days before Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday ASH_WEDNESDAY = new EasterHoliday(-47, "Ash Wednesday");
|
||||
|
||||
/**
|
||||
* Palm Sunday, 7 days before Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday PALM_SUNDAY = new EasterHoliday( -7, "Palm Sunday");
|
||||
|
||||
/**
|
||||
* Maundy Thursday, 3 days before Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday MAUNDY_THURSDAY = new EasterHoliday( -3, "Maundy Thursday");
|
||||
|
||||
/**
|
||||
* Good Friday, 2 days before Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday GOOD_FRIDAY = new EasterHoliday( -2, "Good Friday");
|
||||
|
||||
/**
|
||||
* Easter Sunday
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday EASTER_SUNDAY = new EasterHoliday( 0, "Easter Sunday");
|
||||
|
||||
/**
|
||||
* Easter Monday, 1 day after Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday EASTER_MONDAY = new EasterHoliday( 1, "Easter Monday");
|
||||
|
||||
/**
|
||||
* Ascension, 39 days after Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday ASCENSION = new EasterHoliday( 39, "Ascension");
|
||||
|
||||
/**
|
||||
* Pentecost (aka Whit Sunday), 49 days after Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday PENTECOST = new EasterHoliday( 49, "Pentecost");
|
||||
|
||||
/**
|
||||
* Whit Sunday (aka Pentecost), 49 days after Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday WHIT_SUNDAY = new EasterHoliday( 49, "Whit Sunday");
|
||||
|
||||
/**
|
||||
* Whit Monday, 50 days after Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday WHIT_MONDAY = new EasterHoliday( 50, "Whit Monday");
|
||||
|
||||
/**
|
||||
* Corpus Christi, 60 days after Easter
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
static public final EasterHoliday CORPUS_CHRISTI = new EasterHoliday( 60, "Corpus Christi");
|
||||
}
|
||||
@ -280,10 +280,10 @@ class EasterRule implements DateRule {
|
||||
}
|
||||
}
|
||||
|
||||
static GregorianCalendar gregorian = new GregorianCalendar(new SimpleTimeZone(0, "UTC"));
|
||||
static GregorianCalendar orthodox = new GregorianCalendar(new SimpleTimeZone(0, "UTC"));
|
||||
private static GregorianCalendar gregorian = new GregorianCalendar(/* new SimpleTimeZone(0, "UTC") */);
|
||||
private static GregorianCalendar orthodox = new GregorianCalendar(/* new SimpleTimeZone(0, "UTC") */);
|
||||
|
||||
int daysAfterEaster;
|
||||
Date startDate = null;
|
||||
GregorianCalendar calendar = gregorian;
|
||||
private int daysAfterEaster;
|
||||
private Date startDate = null;
|
||||
private GregorianCalendar calendar = gregorian;
|
||||
}
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
*******************************************************************************
|
||||
*
|
||||
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/HebrewHoliday.java,v $
|
||||
* $Date: 2002/12/04 01:03:39 $
|
||||
* $Revision: 1.5 $
|
||||
* $Date: 2003/12/01 21:18:55 $
|
||||
* $Revision: 1.6 $
|
||||
*
|
||||
*****************************************************************************************
|
||||
*/
|
||||
@ -14,7 +14,7 @@
|
||||
package com.ibm.icu.util;
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public class HebrewHoliday extends Holiday
|
||||
{
|
||||
@ -24,7 +24,7 @@ public class HebrewHoliday extends Holiday
|
||||
* Construct a holiday defined in reference to the Hebrew calendar.
|
||||
*
|
||||
* @param name The name of the holiday
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public HebrewHoliday(int month, int date, String name)
|
||||
{
|
||||
@ -32,135 +32,130 @@ public class HebrewHoliday extends Holiday
|
||||
}
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public HebrewHoliday(int month, int date, int length, String name)
|
||||
{
|
||||
super(name, null);
|
||||
|
||||
SimpleDateRule rule = new SimpleDateRule(month, date);
|
||||
rule.setCalendar(gCalendar);
|
||||
|
||||
setRule(rule);
|
||||
super(name, new SimpleDateRule(month, date, gCalendar));
|
||||
}
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday ROSH_HASHANAH = new HebrewHoliday(HebrewCalendar.TISHRI, 1, 2, "Rosh Hashanah");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday GEDALIAH = new HebrewHoliday(HebrewCalendar.TISHRI, 3, "Fast of Gedaliah");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday YOM_KIPPUR = new HebrewHoliday(HebrewCalendar.TISHRI, 10, "Yom Kippur");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday SUKKOT = new HebrewHoliday(HebrewCalendar.TISHRI, 15, 6, "Sukkot");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday HOSHANAH_RABBAH = new HebrewHoliday(HebrewCalendar.TISHRI, 21, "Hoshanah Rabbah");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday SHEMINI_ATZERET = new HebrewHoliday(HebrewCalendar.TISHRI, 22, "Shemini Atzeret");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday SIMCHAT_TORAH = new HebrewHoliday(HebrewCalendar.TISHRI, 23, "Simchat Torah");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday HANUKKAH = new HebrewHoliday(HebrewCalendar.KISLEV, 25, "Hanukkah");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday TEVET_10 = new HebrewHoliday(HebrewCalendar.TEVET, 10, "Fast of Tevet 10");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday TU_BSHEVAT = new HebrewHoliday(HebrewCalendar.SHEVAT, 15, "Tu B'Shevat");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday ESTHER = new HebrewHoliday(HebrewCalendar.ADAR, 13, "Fast of Esther");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday PURIM = new HebrewHoliday(HebrewCalendar.ADAR, 14, "Purim");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday SHUSHAN_PURIM = new HebrewHoliday(HebrewCalendar.ADAR, 15, "Shushan Purim");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday PASSOVER = new HebrewHoliday(HebrewCalendar.NISAN, 15, 8, "Passover");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday YOM_HASHOAH = new HebrewHoliday(HebrewCalendar.NISAN, 27, "Yom Hashoah");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday YOM_HAZIKARON = new HebrewHoliday(HebrewCalendar.IYAR, 4, "Yom Hazikaron");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday YOM_HAATZMAUT = new HebrewHoliday(HebrewCalendar.IYAR, 5, "Yom Ha'Atzmaut");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday PESACH_SHEINI = new HebrewHoliday(HebrewCalendar.IYAR, 14, "Pesach Sheini");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday LAG_BOMER = new HebrewHoliday(HebrewCalendar.IYAR, 18, "Lab B'Omer");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday YOM_YERUSHALAYIM = new HebrewHoliday(HebrewCalendar.IYAR, 28, "Yom Yerushalayim");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday SHAVUOT = new HebrewHoliday(HebrewCalendar.SIVAN, 6, 2, "Shavuot");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday TAMMUZ_17 = new HebrewHoliday(HebrewCalendar.TAMUZ, 17, "Fast of Tammuz 17");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday TISHA_BAV = new HebrewHoliday(HebrewCalendar.AV, 9, "Fast of Tisha B'Av");
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static HebrewHoliday SELIHOT = new HebrewHoliday(HebrewCalendar.ELUL, 21, "Selihot");
|
||||
}
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
*******************************************************************************
|
||||
*
|
||||
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/LocaleData.java,v $
|
||||
* $Date: 2003/11/21 22:45:06 $
|
||||
* $Revision: 1.3 $
|
||||
* $Date: 2003/12/01 21:20:24 $
|
||||
* $Revision: 1.4 $
|
||||
*
|
||||
*******************************************************************************
|
||||
*/
|
||||
@ -21,6 +21,7 @@ import com.ibm.icu.text.UnicodeSet;
|
||||
/**
|
||||
* A class for accessing miscelleneous data in the locale bundles
|
||||
* @author ram
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public final class LocaleData {
|
||||
|
||||
@ -71,7 +72,6 @@ public final class LocaleData {
|
||||
return systemID == id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the measurement system used in the locale specified by the locale.
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
*******************************************************************************
|
||||
*
|
||||
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/SimpleHoliday.java,v $
|
||||
* $Date: 2002/12/04 01:03:39 $
|
||||
* $Revision: 1.6 $
|
||||
* $Date: 2003/12/01 21:22:19 $
|
||||
* $Revision: 1.7 $
|
||||
*
|
||||
*****************************************************************************************
|
||||
*/
|
||||
@ -18,10 +18,10 @@ import com.ibm.icu.util.Calendar;
|
||||
import com.ibm.icu.util.GregorianCalendar;
|
||||
|
||||
/**
|
||||
* A holiday whose date can be represented by a SimpleDateRule object
|
||||
* A holiday whose date can be represented by a month, day, and optionally day of week
|
||||
* in the Gregorian calendar.
|
||||
*
|
||||
* @see SimpleDateRule
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public class SimpleHoliday extends Holiday {
|
||||
/**
|
||||
@ -35,9 +35,8 @@ public class SimpleHoliday extends Holiday {
|
||||
* If the name is not found in the resource bundle,
|
||||
* getDisplayName will return this string instead.
|
||||
*
|
||||
* @see SimpleDateRule
|
||||
* @see Holiday#getDisplayName(java.util.Locale)
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public SimpleHoliday(int month, int dayOfMonth, String name)
|
||||
{
|
||||
@ -55,17 +54,14 @@ public class SimpleHoliday extends Holiday {
|
||||
* If the name is not found in the resource bundle,
|
||||
* getDisplayName will return this string instead.
|
||||
*
|
||||
* @see SimpleDateRule
|
||||
* @see Holiday#getDisplayName(java.util.Locale)
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*
|
||||
*/
|
||||
public SimpleHoliday(int month, int dayOfMonth, String name,
|
||||
int startYear)
|
||||
{
|
||||
super(name, null);
|
||||
|
||||
setRange(startYear, 0, new SimpleDateRule(month, dayOfMonth) );
|
||||
super(name, rangeRule(startYear, 0, new SimpleDateRule(month, dayOfMonth)));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -79,17 +75,13 @@ public class SimpleHoliday extends Holiday {
|
||||
* If the name is not found in the resource bundle,
|
||||
* getDisplayName will return this string instead.
|
||||
*
|
||||
* @see SimpleDateRule
|
||||
* @see Holiday#getDisplayName(java.util.Locale)
|
||||
* @draft ICU 2.2
|
||||
*
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public SimpleHoliday(int month, int dayOfMonth, String name,
|
||||
int startYear, int endYear)
|
||||
{
|
||||
super(name, null);
|
||||
|
||||
setRange(startYear, endYear, new SimpleDateRule(month, dayOfMonth) );
|
||||
super(name, rangeRule(startYear, endYear, new SimpleDateRule(month, dayOfMonth)));
|
||||
}
|
||||
|
||||
/** // TODO: remove
|
||||
@ -113,47 +105,48 @@ public class SimpleHoliday extends Holiday {
|
||||
* If the name is not found in the resource bundle,
|
||||
* getDisplayName will return this string instead.
|
||||
*
|
||||
* @see SimpleDateRule
|
||||
* @see Holiday#getDisplayName(java.util.Locale)
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*
|
||||
*/
|
||||
public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name)
|
||||
{
|
||||
super(name, new SimpleDateRule(month, dayOfMonth,
|
||||
dayOfWeek > 0 ? dayOfWeek : - dayOfWeek,
|
||||
dayOfWeek > 0) );
|
||||
dayOfWeek > 0));
|
||||
}
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name,
|
||||
int startYear)
|
||||
{
|
||||
super(name, null);
|
||||
|
||||
setRange(startYear, 0, new SimpleDateRule(month, dayOfMonth,
|
||||
dayOfWeek > 0 ? dayOfWeek : - dayOfWeek,
|
||||
dayOfWeek > 0) );
|
||||
super(name, rangeRule(startYear, 0,
|
||||
new SimpleDateRule(month, dayOfMonth,
|
||||
dayOfWeek > 0 ? dayOfWeek : - dayOfWeek,
|
||||
dayOfWeek > 0)));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public SimpleHoliday(int month, int dayOfMonth, int dayOfWeek, String name,
|
||||
int startYear, int endYear)
|
||||
{
|
||||
super(name, null);
|
||||
|
||||
setRange(startYear, endYear, new SimpleDateRule(month, dayOfMonth,
|
||||
dayOfWeek > 0 ? dayOfWeek : - dayOfWeek,
|
||||
dayOfWeek > 0) );
|
||||
super(name, rangeRule(startYear, endYear,
|
||||
new SimpleDateRule(month, dayOfMonth,
|
||||
dayOfWeek > 0 ? dayOfWeek : - dayOfWeek,
|
||||
dayOfWeek > 0)));
|
||||
}
|
||||
|
||||
private void setRange(int startYear, int endYear, DateRule rule)
|
||||
private static DateRule rangeRule(int startYear, int endYear, DateRule rule)
|
||||
{
|
||||
if (startYear == 0 && endYear == 0) {
|
||||
return rule;
|
||||
}
|
||||
|
||||
RangeDateRule rangeRule = new RangeDateRule();
|
||||
|
||||
if (startYear != 0) {
|
||||
@ -167,7 +160,7 @@ public class SimpleHoliday extends Holiday {
|
||||
rangeRule.add(end, null);
|
||||
}
|
||||
|
||||
setRule(rangeRule);
|
||||
return rangeRule;
|
||||
}
|
||||
|
||||
/* Constants for holidays that are common throughout the Western
|
||||
@ -175,84 +168,84 @@ public class SimpleHoliday extends Holiday {
|
||||
|
||||
/**
|
||||
* New Year's Day - January 1st
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday NEW_YEARS_DAY =
|
||||
new SimpleHoliday(Calendar.JANUARY, 1, "New Year's Day");
|
||||
|
||||
/**
|
||||
* Epiphany, January 6th
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday EPIPHANY =
|
||||
new SimpleHoliday(Calendar.JANUARY, 6, "Epiphany");
|
||||
|
||||
/**
|
||||
* May Day, May 1st
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday MAY_DAY =
|
||||
new SimpleHoliday(Calendar.MAY, 1, "May Day");
|
||||
|
||||
/**
|
||||
* Assumption, August 15th
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday ASSUMPTION =
|
||||
new SimpleHoliday(Calendar.AUGUST, 15, "Assumption");
|
||||
|
||||
/**
|
||||
* All Saints' Day, November 1st
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday ALL_SAINTS_DAY =
|
||||
new SimpleHoliday(Calendar.NOVEMBER, 1, "All Saints' Day");
|
||||
|
||||
/**
|
||||
* All Souls' Day, November 1st
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday ALL_SOULS_DAY =
|
||||
new SimpleHoliday(Calendar.NOVEMBER, 2, "All Souls' Day");
|
||||
|
||||
/**
|
||||
* Immaculate Conception, December 8th
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday IMMACULATE_CONCEPTION =
|
||||
new SimpleHoliday(Calendar.DECEMBER, 8, "Immaculate Conception");
|
||||
|
||||
/**
|
||||
* Christmas Eve, December 24th
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday CHRISTMAS_EVE =
|
||||
new SimpleHoliday(Calendar.DECEMBER, 24, "Christmas Eve");
|
||||
|
||||
/**
|
||||
* Christmas, December 25th
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday CHRISTMAS =
|
||||
new SimpleHoliday(Calendar.DECEMBER, 25, "Christmas");
|
||||
|
||||
/**
|
||||
* Boxing Day, December 26th
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday BOXING_DAY =
|
||||
new SimpleHoliday(Calendar.DECEMBER, 26, "Boxing Day");
|
||||
|
||||
/**
|
||||
* Saint Stephen's Day, December 26th
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday ST_STEPHENS_DAY =
|
||||
new SimpleHoliday(Calendar.DECEMBER, 26, "St. Stephen's Day");
|
||||
|
||||
/**
|
||||
* New Year's Eve, December 31st
|
||||
* @draft ICU 2.2
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final SimpleHoliday NEW_YEARS_EVE =
|
||||
new SimpleHoliday(Calendar.DECEMBER, 31, "New Year's Eve");
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/ULocale.java,v $
|
||||
* $Date: 2003/11/24 22:24:28 $
|
||||
* $Revision: 1.6 $
|
||||
* $Date: 2003/12/01 21:23:07 $
|
||||
* $Revision: 1.7 $
|
||||
*
|
||||
******************************************************************************
|
||||
*/
|
||||
@ -78,7 +78,7 @@ public final class ULocale implements Serializable {
|
||||
}
|
||||
|
||||
/**
|
||||
* Consturct a ULocale object from a string representing the locale
|
||||
* Construct a ULocale object from a string representing the locale
|
||||
* @param locName String representation of the locale, e.g: en_US, sy-Cyrl-YU
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
@ -87,14 +87,22 @@ public final class ULocale implements Serializable {
|
||||
this.locale = new Locale(locName, "");
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the current default ULocale.
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static ULocale getDefault() {
|
||||
return new ULocale(Locale.getDefault());
|
||||
return new ULocale(Locale.getDefault());
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the root ULocale.
|
||||
* @draft ICU 2.8
|
||||
*/
|
||||
public static final ULocale ROOT = new ULocale("");
|
||||
|
||||
private void writeObject(java.io.ObjectOutputStream out) throws IOException {
|
||||
out.writeObject(locName);
|
||||
out.writeObject(locName);
|
||||
}
|
||||
|
||||
private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user