diff options
| author | Jeroen Frijters <jeroen@frijters.net> | 2005-01-29 00:43:50 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2005-01-29 00:43:50 +0000 |
| commit | 8f43f502deef1c38af5e1e7ea7e09ce211be2448 (patch) | |
| tree | 837a43377c4ba33f9ac101f3ef67bcc2fd49d11e /libjava/java | |
| parent | 73095ebc078bed76027cbd1fa586238f45089eb7 (diff) | |
| download | gcc-8f43f502deef1c38af5e1e7ea7e09ce211be2448.zip gcc-8f43f502deef1c38af5e1e7ea7e09ce211be2448.tar.gz gcc-8f43f502deef1c38af5e1e7ea7e09ce211be2448.tar.bz2 | |
re PR libgcj/19649 (java.util.Date.getTimezoneOffset returns negated output)
2004-01-28 Jeroen Frijters <jeroen@frijters.net>
PR libgcj/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.
From-SVN: r94401
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/util/Date.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libjava/java/util/Date.java b/libjava/java/util/Date.java index f2700e4..4a96ff0 100644 --- a/libjava/java/util/Date.java +++ b/libjava/java/util/Date.java @@ -159,7 +159,7 @@ public class Date */ 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 class Date */ 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 class Date */ 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 @@ public class Date { 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); } |