FYI: Re-sync java.util.Date / Fix PR libgcj/19649
Bryce McKinlay
mckinlay@redhat.com
Sat Jan 29 00:54:00 GMT 2005
2004-01-28 Jeroen Frijters <jeroen@frijters.net <mailto:jeroen@frijters.net>>
PR libgcj/19649 <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19649>
* java/util/Date.java
(Date(int,int,int), Date(int,int,int,int,int)): Delegate to other
constructor.
(Date(int,int,int,int,int,int)): Fixed to handle out-of-range
arguments.
(getTimezoneOffset): Inverted sign.
--- gcc/libjava/java/util/Date.java 2004/11/07 11:17:46 1.14
+++ gcc/libjava/java/util/Date.java 2005/01/29 00:43:50 1.15
@@ -159,7 +159,7 @@
*/
public Date(int year, int month, int day)
{
- time = new GregorianCalendar(year + 1900, month, day).getTimeInMillis();
+ this(year, month, day, 0, 0, 0);
}
/**
@@ -176,9 +176,7 @@
*/
public Date(int year, int month, int day, int hour, int min)
{
- time =
- new GregorianCalendar(year + 1900, month, day, hour,
- min).getTimeInMillis();
+ this(year, month, day, hour, min, 0);
}
/**
@@ -197,9 +195,9 @@
*/
public Date(int year, int month, int day, int hour, int min, int sec)
{
- time =
- new GregorianCalendar(year + 1900, month, day, hour, min,
- sec).getTimeInMillis();
+ GregorianCalendar cal =
+ new GregorianCalendar(year + 1900, month, day, hour, min, sec);
+ time = cal.getTimeInMillis();
}
/**
@@ -288,7 +286,7 @@
{
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(time);
- return (cal.get(Calendar.ZONE_OFFSET)
+ return - (cal.get(Calendar.ZONE_OFFSET)
+ cal.get(Calendar.DST_OFFSET)) / (60 * 1000);
}
More information about the Java-patches
mailing list