diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/Calendar.java | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c64f9ea..3e31ea2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-08-30 Jesse Rosenstock <jmr@ugcs.caltech.edu> + + * java/util/Calendar.java (getTimeInMillis, getTimeInMillis): Now + public, per 1.4 spec. Fixes PR libgcj/7785. + 2002-08-30 Jeff Sturm <jsturm@one-point.com> * Makefile.in: Rebuilt. diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index 999f105..09e9f26 100644 --- a/libjava/java/util/Calendar.java +++ b/libjava/java/util/Calendar.java @@ -1,5 +1,5 @@ /* java.util.Calendar - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -504,8 +504,9 @@ public abstract class Calendar implements Serializable, Cloneable /** * Returns the time represented by this Calendar. * @return the time in milliseconds since the epoch. + * @specnote This was made public in 1.4. */ - protected long getTimeInMillis() + public long getTimeInMillis() { if (!isTimeSet) computeTime(); @@ -516,8 +517,9 @@ public abstract class Calendar implements Serializable, Cloneable * Sets this Calendar's time to the given Time. All time fields * are invalidated by this method. * @param time the time in milliseconds since the epoch + * @specnote This was made public in 1.4. */ - protected void setTimeInMillis(long time) + public void setTimeInMillis(long time) { this.time = time; isTimeSet = true; |