Commit 8f43f502 by Jeroen Frijters Committed by Bryce McKinlay

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
parent 73095ebc
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.
2005-01-26 Ranjit Mathew <rmathew@hotmail.com> 2005-01-26 Ranjit Mathew <rmathew@hotmail.com>
* testsuite/libjava.jacks/jacks.xfail: Update for PR java/19070, * testsuite/libjava.jacks/jacks.xfail: Update for PR java/19070,
......
...@@ -159,7 +159,7 @@ public class Date ...@@ -159,7 +159,7 @@ public class Date
*/ */
public Date(int year, int month, int day) 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 ...@@ -176,9 +176,7 @@ public class Date
*/ */
public Date(int year, int month, int day, int hour, int min) public Date(int year, int month, int day, int hour, int min)
{ {
time = this(year, month, day, hour, min, 0);
new GregorianCalendar(year + 1900, month, day, hour,
min).getTimeInMillis();
} }
/** /**
...@@ -197,9 +195,9 @@ public class Date ...@@ -197,9 +195,9 @@ public class Date
*/ */
public Date(int year, int month, int day, int hour, int min, int sec) public Date(int year, int month, int day, int hour, int min, int sec)
{ {
time = GregorianCalendar cal =
new GregorianCalendar(year + 1900, month, day, hour, min, new GregorianCalendar(year + 1900, month, day, hour, min, sec);
sec).getTimeInMillis(); time = cal.getTimeInMillis();
} }
/** /**
...@@ -288,7 +286,7 @@ public class Date ...@@ -288,7 +286,7 @@ public class Date
{ {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(time); cal.setTimeInMillis(time);
return (cal.get(Calendar.ZONE_OFFSET) return - (cal.get(Calendar.ZONE_OFFSET)
+ cal.get(Calendar.DST_OFFSET)) / (60 * 1000); + cal.get(Calendar.DST_OFFSET)) / (60 * 1000);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment