organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

Calendar reorg: merge IBMCalendar into com.ibm.util.Calendar

Browse source 
X-SVN-Rev: 2714
This commit is contained in:
Alan Liu 2000-10-17 18:26:45 +00:00
parent e58944fe84
commit 27cec81867
13 changed files with 3041 additions and 1801 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4j/src/com/ibm/icu/util/BuddhistCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/BuddhistCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.4 $
* $Date: 2000/10/17 18:26:44 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -221,10 +221,10 @@ public class BuddhistCalendar extends GregorianCalendar {
}
}
public void roll(int field, boolean up) {
public void roll(int field, int amount) {
toGregorian();
try {
super.roll(field, up);
super.roll(field, amount);
}
finally {
fromGregorian();

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

File diff suppressed because it is too large Load diff

88
icu4j/src/com/ibm/icu/util/GregorianCalendar.java
View file

@ -661,17 +661,17 @@ public class GregorianCalendar extends Calendar {
}
/**
* Overrides Calendar
* Time Field Rolling function.
* Rolls (up/down) a single unit of time on the given time field.
* @param field the time field.
* @param up Indicates if rolling up or rolling down the field value.
* @exception IllegalArgumentException if an unknown field value is given.
*/
public void roll(int field, boolean up) {
roll(field, up ? +1 : -1);
}
//| /**
//| * Overrides Calendar
//| * Time Field Rolling function.
//| * Rolls (up/down) a single unit of time on the given time field.
//| * @param field the time field.
//| * @param up Indicates if rolling up or rolling down the field value.
//| * @exception IllegalArgumentException if an unknown field value is given.
//| */
//| public void roll(int field, boolean up) {
//| roll(field, up ? +1 : -1);
//| }
/**
* Roll a field by a signed amount.
@ -1859,39 +1859,39 @@ public class GregorianCalendar extends Calendar {
Math.max(stamp_a, stamp_b) : UNSET;
}
/**
* Return the week number of a day, within a period. This may be the week number in
* a year, or the week number in a month. Usually this will be a value >= 1, but if
* some initial days of the period are excluded from week 1, because
* minimalDaysInFirstWeek is > 1, then the week number will be zero for those
* initial days. Requires the day of week for the given date in order to determine
* the day of week of the first day of the period.
*
* @param dayOfPeriod Day-of-year or day-of-month. Should be 1 for first day of period.
* @param day Day-of-week for given dayOfPeriod. 1-based with 1=Sunday.
* @return Week number, one-based, or zero if the day falls in part of the
* month before the first week, when there are days before the first
* week because the minimum days in the first week is more than one.
*/
private final int weekNumber(int dayOfPeriod, int dayOfWeek) {
// Determine the day of the week of the first day of the period
// in question (either a year or a month). Zero represents the
// first day of the week on this calendar.
int periodStartDayOfWeek = (dayOfWeek - getFirstDayOfWeek() - dayOfPeriod + 1) % 7;
if (periodStartDayOfWeek < 0) periodStartDayOfWeek += 7;
// Compute the week number. Initially, ignore the first week, which
// may be fractional (or may not be). We add periodStartDayOfWeek in
// order to fill out the first week, if it is fractional.
int weekNo = (dayOfPeriod + periodStartDayOfWeek - 1)/7;
// If the first week is long enough, then count it. If
// the minimal days in the first week is one, or if the period start
// is zero, we always increment weekNo.
if ((7 - periodStartDayOfWeek) >= getMinimalDaysInFirstWeek()) ++weekNo;
return weekNo;
}
//| /**
//| * Return the week number of a day, within a period. This may be the week number in
//| * a year, or the week number in a month. Usually this will be a value >= 1, but if
//| * some initial days of the period are excluded from week 1, because
//| * minimalDaysInFirstWeek is > 1, then the week number will be zero for those
//| * initial days. Requires the day of week for the given date in order to determine
//| * the day of week of the first day of the period.
//| *
//| * @param dayOfPeriod Day-of-year or day-of-month. Should be 1 for first day of period.
//| * @param day Day-of-week for given dayOfPeriod. 1-based with 1=Sunday.
//| * @return Week number, one-based, or zero if the day falls in part of the
//| * month before the first week, when there are days before the first
//| * week because the minimum days in the first week is more than one.
//| */
//| private final int weekNumber(int dayOfPeriod, int dayOfWeek) {
//| // Determine the day of the week of the first day of the period
//| // in question (either a year or a month). Zero represents the
//| // first day of the week on this calendar.
//| int periodStartDayOfWeek = (dayOfWeek - getFirstDayOfWeek() - dayOfPeriod + 1) % 7;
//| if (periodStartDayOfWeek < 0) periodStartDayOfWeek += 7;
//|
//| // Compute the week number. Initially, ignore the first week, which
//| // may be fractional (or may not be). We add periodStartDayOfWeek in
//| // order to fill out the first week, if it is fractional.
//| int weekNo = (dayOfPeriod + periodStartDayOfWeek - 1)/7;
//|
//| // If the first week is long enough, then count it. If
//| // the minimal days in the first week is one, or if the period start
//| // is zero, we always increment weekNo.
//| if ((7 - periodStartDayOfWeek) >= getMinimalDaysInFirstWeek()) ++weekNo;
//|
//| return weekNo;
//| }
private final int monthLength(int month, int year) {
return isLeapYear(year) ? LEAP_MONTH_LENGTH[month] : MONTH_LENGTH[month];

6
icu4j/src/com/ibm/icu/util/HebrewCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/HebrewCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.3 $
* $Date: 2000/10/17 18:26:44 $
* $Revision: 1.4 $
*
*****************************************************************************************
*/
@ -65,7 +65,7 @@ import java.util.Locale;
*
* @author Laura Werner
*/
public class HebrewCalendar extends IBMCalendar {
public class HebrewCalendar extends Calendar {
private static String copyright = "Copyright \u00a9 1997-1998 IBM Corp. All Rights Reserved.";

6
icu4j/src/com/ibm/icu/util/IslamicCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/IslamicCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.5 $
* $Date: 2000/10/17 18:26:45 $
* $Revision: 1.6 $
*
*****************************************************************************************
*/
@ -73,7 +73,7 @@ import com.ibm.util.CalendarAstronomer;
* @author Laura Werner
* @version 1.0
*/
public class IslamicCalendar extends IBMCalendar {
public class IslamicCalendar extends Calendar {
private static String copyright = "Copyright \u00a9 1997-1998 IBM Corp. All Rights Reserved.";

8
icu4j/src/com/ibm/icu/util/JapaneseCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/util/JapaneseCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.4 $
* $Date: 2000/10/17 18:26:45 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -244,10 +244,10 @@ public class JapaneseCalendar extends GregorianCalendar {
}
}
public void roll(int field, boolean up) {
public void roll(int field, int amount) {
toGregorian();
try {
super.roll(field, up);
super.roll(field, amount);
}
finally {
fromGregorian();

8
icu4j/src/com/ibm/util/BuddhistCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/util/Attic/BuddhistCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.4 $
* $Date: 2000/10/17 18:26:44 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -221,10 +221,10 @@ public class BuddhistCalendar extends GregorianCalendar {
}
}
public void roll(int field, boolean up) {
public void roll(int field, int amount) {
toGregorian();
try {
super.roll(field, up);
super.roll(field, amount);
}
finally {
fromGregorian();

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

File diff suppressed because it is too large Load diff

88
icu4j/src/com/ibm/util/GregorianCalendar.java
View file

@ -661,17 +661,17 @@ public class GregorianCalendar extends Calendar {
}
/**
* Overrides Calendar
* Time Field Rolling function.
* Rolls (up/down) a single unit of time on the given time field.
* @param field the time field.
* @param up Indicates if rolling up or rolling down the field value.
* @exception IllegalArgumentException if an unknown field value is given.
*/
public void roll(int field, boolean up) {
roll(field, up ? +1 : -1);
}
//| /**
//| * Overrides Calendar
//| * Time Field Rolling function.
//| * Rolls (up/down) a single unit of time on the given time field.
//| * @param field the time field.
//| * @param up Indicates if rolling up or rolling down the field value.
//| * @exception IllegalArgumentException if an unknown field value is given.
//| */
//| public void roll(int field, boolean up) {
//| roll(field, up ? +1 : -1);
//| }
/**
* Roll a field by a signed amount.
@ -1859,39 +1859,39 @@ public class GregorianCalendar extends Calendar {
Math.max(stamp_a, stamp_b) : UNSET;
}
/**
* Return the week number of a day, within a period. This may be the week number in
* a year, or the week number in a month. Usually this will be a value >= 1, but if
* some initial days of the period are excluded from week 1, because
* minimalDaysInFirstWeek is > 1, then the week number will be zero for those
* initial days. Requires the day of week for the given date in order to determine
* the day of week of the first day of the period.
*
* @param dayOfPeriod Day-of-year or day-of-month. Should be 1 for first day of period.
* @param day Day-of-week for given dayOfPeriod. 1-based with 1=Sunday.
* @return Week number, one-based, or zero if the day falls in part of the
* month before the first week, when there are days before the first
* week because the minimum days in the first week is more than one.
*/
private final int weekNumber(int dayOfPeriod, int dayOfWeek) {
// Determine the day of the week of the first day of the period
// in question (either a year or a month). Zero represents the
// first day of the week on this calendar.
int periodStartDayOfWeek = (dayOfWeek - getFirstDayOfWeek() - dayOfPeriod + 1) % 7;
if (periodStartDayOfWeek < 0) periodStartDayOfWeek += 7;
// Compute the week number. Initially, ignore the first week, which
// may be fractional (or may not be). We add periodStartDayOfWeek in
// order to fill out the first week, if it is fractional.
int weekNo = (dayOfPeriod + periodStartDayOfWeek - 1)/7;
// If the first week is long enough, then count it. If
// the minimal days in the first week is one, or if the period start
// is zero, we always increment weekNo.
if ((7 - periodStartDayOfWeek) >= getMinimalDaysInFirstWeek()) ++weekNo;
return weekNo;
}
//| /**
//| * Return the week number of a day, within a period. This may be the week number in
//| * a year, or the week number in a month. Usually this will be a value >= 1, but if
//| * some initial days of the period are excluded from week 1, because
//| * minimalDaysInFirstWeek is > 1, then the week number will be zero for those
//| * initial days. Requires the day of week for the given date in order to determine
//| * the day of week of the first day of the period.
//| *
//| * @param dayOfPeriod Day-of-year or day-of-month. Should be 1 for first day of period.
//| * @param day Day-of-week for given dayOfPeriod. 1-based with 1=Sunday.
//| * @return Week number, one-based, or zero if the day falls in part of the
//| * month before the first week, when there are days before the first
//| * week because the minimum days in the first week is more than one.
//| */
//| private final int weekNumber(int dayOfPeriod, int dayOfWeek) {
//| // Determine the day of the week of the first day of the period
//| // in question (either a year or a month). Zero represents the
//| // first day of the week on this calendar.
//| int periodStartDayOfWeek = (dayOfWeek - getFirstDayOfWeek() - dayOfPeriod + 1) % 7;
//| if (periodStartDayOfWeek < 0) periodStartDayOfWeek += 7;
//|
//| // Compute the week number. Initially, ignore the first week, which
//| // may be fractional (or may not be). We add periodStartDayOfWeek in
//| // order to fill out the first week, if it is fractional.
//| int weekNo = (dayOfPeriod + periodStartDayOfWeek - 1)/7;
//|
//| // If the first week is long enough, then count it. If
//| // the minimal days in the first week is one, or if the period start
//| // is zero, we always increment weekNo.
//| if ((7 - periodStartDayOfWeek) >= getMinimalDaysInFirstWeek()) ++weekNo;
//|
//| return weekNo;
//| }
private final int monthLength(int month, int year) {
return isLeapYear(year) ? LEAP_MONTH_LENGTH[month] : MONTH_LENGTH[month];

6
icu4j/src/com/ibm/util/HebrewCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/util/Attic/HebrewCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.3 $
* $Date: 2000/10/17 18:26:44 $
* $Revision: 1.4 $
*
*****************************************************************************************
*/
@ -65,7 +65,7 @@ import java.util.Locale;
*
* @author Laura Werner
*/
public class HebrewCalendar extends IBMCalendar {
public class HebrewCalendar extends Calendar {
private static String copyright = "Copyright \u00a9 1997-1998 IBM Corp. All Rights Reserved.";

1372
icu4j/src/com/ibm/util/IBMCalendar.java
View file

File diff suppressed because it is too large Load diff

6
icu4j/src/com/ibm/util/IslamicCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/util/Attic/IslamicCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.5 $
* $Date: 2000/10/17 18:26:45 $
* $Revision: 1.6 $
*
*****************************************************************************************
*/
@ -73,7 +73,7 @@ import com.ibm.util.CalendarAstronomer;
* @author Laura Werner
* @version 1.0
*/
public class IslamicCalendar extends IBMCalendar {
public class IslamicCalendar extends Calendar {
private static String copyright = "Copyright \u00a9 1997-1998 IBM Corp. All Rights Reserved.";

8
icu4j/src/com/ibm/util/JapaneseCalendar.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/util/Attic/JapaneseCalendar.java,v $
* $Date: 2000/05/12 23:20:10 $
* $Revision: 1.4 $
* $Date: 2000/10/17 18:26:45 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -244,10 +244,10 @@ public class JapaneseCalendar extends GregorianCalendar {
}
}
public void roll(int field, boolean up) {
public void roll(int field, int amount) {
toGregorian();
try {
super.roll(field, up);
super.roll(field, amount);
}
finally {
fromGregorian();