[multiple changes]

2004-06-01  Tom Tromey  <tromey@redhat.com>

	* java/io/ObjectStreamField.java: Cleaned up imports.

2004-06-01  Michael Koch  <konqueror@gmx.de>

	* java/io/ObjectStreamField.java: Style and javadoc cleanup.

2004-06-01  Mark Wielaard  <mark@klomp.org>

	* java/io/Writer.java (Writer(Object)): Fixed API doc.

From-SVN: r82545

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d775572f2290616445f732e9e692518d5441b161..b7f6887b18fc6d03243e4666b86aab0b3d34a141 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-01  Tom Tromey  <tromey@redhat.com>
+
+       * java/io/ObjectStreamField.java: Cleaned up imports.
+
+2004-06-01  Michael Koch  <konqueror@gmx.de>
+
+       * java/io/ObjectStreamField.java: Style and javadoc cleanup.
+      
+2004-06-01  Mark Wielaard  <mark@klomp.org>
+
+       * java/io/Writer.java (Writer(Object)): Fixed API doc.
+
 2004-06-01  Michael Koch  <konqueror@gmx.de>
 
        * java/security/Security.java

diff --git a/libjava/java/io/ObjectStreamField.java b/libjava/java/io/ObjectStreamField.java
index f4a866ed06753867b6e87a9b4998181aeff37fc0..830a349344a00adbc1844efee94b920bb5e9a8d5 100644 (file)
--- a/libjava/java/io/ObjectStreamField.java
+++ b/libjava/java/io/ObjectStreamField.java
@@ -1,5 +1,5 @@
 /* ObjectStreamField.java -- Class used to store name and class of fields
-   Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,9 +38,10 @@ exception statement from your version. */
 
 package java.io;
 
+import gnu.java.lang.reflect.TypeSignature;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import gnu.java.lang.reflect.TypeSignature;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
@@ -87,6 +88,7 @@ public class ObjectStreamField implements Comparable
    *
    * @param name Name of the field to export.
    * @param type Type of the field in the concerned class.
+   * @param unshared true if field will be unshared, false otherwise.
    */
   public ObjectStreamField (String name, Class type, boolean unshared)
   {
@@ -238,9 +240,16 @@ public class ObjectStreamField implements Comparable
     return typename.length() == 1;
   }
 
-  public int compareTo (Object o)
+  /**
+   * Compares this object to the given object.
+   *
+   * @param obj the object to compare to.
+   *
+   * @return -1, 0 or 1.
+   */
+  public int compareTo (Object obj)
   {
-    ObjectStreamField f = (ObjectStreamField)o;
+    ObjectStreamField f = (ObjectStreamField) obj;
     boolean this_is_primitive = isPrimitive ();
     boolean f_is_primitive = f.isPrimitive ();
 
@@ -348,6 +357,11 @@ public class ObjectStreamField implements Comparable
         " in class " + field.getDeclaringClass());
   }
 
+  /**
+   * Returns a string representing this object.
+   *
+   * @return the string.
+   */
   public String toString ()
   {
     return "ObjectStreamField< " + type + " " + name + " >";
@@ -364,7 +378,7 @@ public class ObjectStreamField implements Comparable
        throw new InternalError(x.getMessage());
       }
   }
-  
+
   final void setByteField(Object obj, byte val)
   {
     try
@@ -400,7 +414,7 @@ public class ObjectStreamField implements Comparable
        throw new InternalError(x.getMessage());
       }
   }
-  
+
   final void setIntField(Object obj, int val)
   {
     try

diff --git a/libjava/java/io/Writer.java b/libjava/java/io/Writer.java
index 8248c5556d4b12f51e41ba8f4925e9f6ef3eaf46..49b6315231e5d2590bd208ff23049180493ccd7e 100644 (file)
--- a/libjava/java/io/Writer.java
+++ b/libjava/java/io/Writer.java
@@ -76,7 +76,7 @@ public abstract class Writer
    * on the specified <code>Object</code>.
    *
    * @param lock The <code>Object</code> to use for synchronizing critical
-   *             sections. Must be not be null.
+   *             sections. Must not be null.
    */
   protected Writer(Object lock)
   {