2002-08-30 Jesse Rosenstock <jmr@ugcs.caltech.edu>

[pf3gnuchains/gcc-fork.git] / libjava / java / util / Calendar.java

diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index a807a36..09e9f26 100644 (file)
--- 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.
 
@@ -18,11 +18,22 @@ along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 02111-1307 USA.
 
-As a special exception, if you link this library with other files to
-produce an executable, this library does not by itself cause the
-resulting executable to be covered by the GNU General Public License.
-This exception does not however invalidate any other reasons why the
-executable file might be covered by the GNU General Public License. */
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 
 package java.util;
@@ -62,13 +73,12 @@ import java.io.*;
  * and for the first line all fields are set, that line is used to
  * compute the day. <br>
  *
- * <pre>
- * month + day_of_month
- * month + week_of_month + day_of_week
- * month + day_of_week_of_month + day_of_week
- * day_of_year
- * day_of_week + week_of_year
- * </pre>
+ * 
+<pre>month + day_of_month
+month + week_of_month + day_of_week
+month + day_of_week_of_month + day_of_week
+day_of_year
+day_of_week + week_of_year</pre>
  * 
  * The hour_of_day-field takes precedence over the ampm and
  * hour_of_ampm fields. <br>
@@ -494,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();
@@ -506,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;