Patch: java.io merge

[Michael Koch <konqueror at gmx dot de>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I just commited the attached patch to merge more stuff of java.io from 
GNU classpath to libgcj.


Michael


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.
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAvHweWSOgCCdjSDsRAj3RAJ40CA1WMwWcRh1iG5DpMuKHEn/AeQCeLnAv
QnE2E9eb2G/LHiD5cFMr1+Q=
=I4Ne
-----END PGP SIGNATURE-----

Index: java/io/ObjectStreamField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/ObjectStreamField.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 ObjectStreamField.java
--- java/io/ObjectStreamField.java	28 Feb 2004 21:28:53 -0000	1.9
+++ java/io/ObjectStreamField.java	1 Jun 2004 12:46:40 -0000
@@ -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 @@
 
 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 @@
    *
    * @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 @@
     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 @@
 	 " in class " + field.getDeclaringClass());
   }
 
+  /**
+   * Returns a string representing this object.
+   *
+   * @return the string.
+   */
   public String toString ()
   {
     return "ObjectStreamField< " + type + " " + name + " >";
Index: java/io/Writer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/Writer.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 Writer.java
--- java/io/Writer.java	16 May 2004 18:35:37 -0000	1.9
+++ java/io/Writer.java	1 Jun 2004 12:46:40 -0000
@@ -76,7 +76,7 @@
    * 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)
   {