* java/util/InvalidPropertiesFormatException.java

	(serialVersionUID): New field.
	(readObject, writeObject): New methods.
	* java/util/Arrays.java (toString): Javadoc fixes.
	* java/net/URLConnection.java: Cleaned up imports.
	* java/lang/reflect/ParameterizedType.java: Javadoc fix.
	* java/lang/reflect/MalformedParameterizedTypeException.java
	(serialVersionUID): New field.
	* java/lang/reflect/GenericSignatureFormatError.java
	(serialVersionUID): New field.
	* java/lang/Class.java (Class): Javado fixes.
	(getComponentType): Likewise.
	(getGenericInterfaces): Likewise.
	(getTypeParameters): Likewise.
	* java/io/CharArrayWriter.java (append): Javadoc fixes.
	* java/lang/annotation/AnnotationFormatError.java (serialVersionUID):
	New field.
	* java/lang/TypeNotPresentException.java (serialVersionUID): New
	field.
	* java/lang/EnumConstantNotPresentException.java (serialVersionUID):
	New field.

12 files changed, 64 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ffa5dcf0..0ce94d520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2006-04-07  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/InvalidPropertiesFormatException.java
+	(serialVersionUID): New field.
+	(readObject, writeObject): New methods.
+	* java/util/Arrays.java (toString): Javadoc fixes.
+	* java/net/URLConnection.java: Cleaned up imports.
+	* java/lang/reflect/ParameterizedType.java: Javadoc fix.
+	* java/lang/reflect/MalformedParameterizedTypeException.java
+	(serialVersionUID): New field.
+	* java/lang/reflect/GenericSignatureFormatError.java
+	(serialVersionUID): New field.
+	* java/lang/Class.java (Class): Javado fixes.
+	(getComponentType): Likewise.
+	(getGenericInterfaces): Likewise.
+	(getTypeParameters): Likewise.
+	* java/io/CharArrayWriter.java (append): Javadoc fixes.
+	* java/lang/annotation/AnnotationFormatError.java (serialVersionUID):
+	New field.
+	* java/lang/TypeNotPresentException.java (serialVersionUID): New
+	field.
+	* java/lang/EnumConstantNotPresentException.java (serialVersionUID):
+	New field.
+
 2006-04-07  Wolfgang Baer  <WBaer@gmx.de>
 
 	* java/awt/Dialog.java 
diff --git a/java/io/CharArrayWriter.java b/java/io/CharArrayWriter.java
index 0eead3ad3..8cbc8aeac 100644
--- a/java/io/CharArrayWriter.java
+++ b/java/io/CharArrayWriter.java
@@ -267,7 +267,7 @@ public class CharArrayWriter extends Writer
    * sequence is wrapped around an input buffer, the results will
    * depend on the current position and length of that buffer.
    *
-   * @param seq the character sequence to append.  If seq is null,
+   * @param cs the character sequence to append.  If seq is null,
    *        then the string "null" (the string representation of null)
    *        is appended.
    * @return a reference to this object.
@@ -294,7 +294,7 @@ public class CharArrayWriter extends Writer
    * <code>append(seq.subSequence(start,end))</code> when the sequence
    * is not null.
    *
-   * @param seq the character sequence to append.  If seq is null,
+   * @param cs the character sequence to append.  If seq is null,
    *        then the string "null" (the string representation of null)
    *        is appended.
    * @param start the index of the first Unicode character to use from
diff --git a/java/lang/Class.java b/java/lang/Class.java
index 7bc8e4899..1f59befd4 100644
--- a/java/lang/Class.java
+++ b/java/lang/Class.java
@@ -42,11 +42,15 @@ import gnu.classpath.VMStackWalker;
 import gnu.java.lang.reflect.ClassSignatureParser;
 
 import java.io.InputStream;
+import java.io.ObjectStreamClass;
 import java.io.Serializable;
+import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericDeclaration;
+import java.lang.reflect.GenericSignatureFormatError;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.MalformedParameterizedTypeException;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
diff --git a/java/lang/EnumConstantNotPresentException.java b/java/lang/EnumConstantNotPresentException.java
index dbec9d658..12b30fda5 100644
--- a/java/lang/EnumConstantNotPresentException.java
+++ b/java/lang/EnumConstantNotPresentException.java
@@ -48,6 +48,8 @@ package java.lang;
  */
 public class EnumConstantNotPresentException extends RuntimeException
 {
+  private static final long serialVersionUID = -6046998521960521108L;
+
   /**
    * The enum's type.  Note that the name is fixed by the
    * serialization spec.
diff --git a/java/lang/TypeNotPresentException.java b/java/lang/TypeNotPresentException.java
index 3010c968b..65d98457e 100644
--- a/java/lang/TypeNotPresentException.java
+++ b/java/lang/TypeNotPresentException.java
@@ -58,7 +58,8 @@ package java.lang;
 public class TypeNotPresentException
   extends RuntimeException
 {
-  
+  private static final long serialVersionUID = -5101214195716534496L;
+
   /**
    * Constructs a <code>TypeNotPresentException</code> for
    * the supplied type.  The specified cause <code>Throwable</code>
diff --git a/java/lang/annotation/AnnotationFormatError.java b/java/lang/annotation/AnnotationFormatError.java
index 40ce3ca10..36f600632 100644
--- a/java/lang/annotation/AnnotationFormatError.java
+++ b/java/lang/annotation/AnnotationFormatError.java
@@ -49,6 +49,7 @@ package java.lang.annotation;
  */
 public class AnnotationFormatError extends Error
 {
+  private static final long serialVersionUID = -4256701562333669892L;
 
   /**
    * Constructs a new <code>AnnotationFormatError</code>
diff --git a/java/lang/reflect/GenericSignatureFormatError.java b/java/lang/reflect/GenericSignatureFormatError.java
index ab6928de6..0f09522bc 100644
--- a/java/lang/reflect/GenericSignatureFormatError.java
+++ b/java/lang/reflect/GenericSignatureFormatError.java
@@ -51,6 +51,7 @@ package java.lang.reflect;
 public class GenericSignatureFormatError
   extends ClassFormatError
 {
+  private static final long serialVersionUID = 6709919147137911034L;
 
   /**
    * Constructs a new <code>GenericSignatureFormatError</code>.
diff --git a/java/lang/reflect/MalformedParameterizedTypeException.java b/java/lang/reflect/MalformedParameterizedTypeException.java
index f33c77820..50ae23000 100644
--- a/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -52,6 +52,8 @@ package java.lang.reflect;
 public class MalformedParameterizedTypeException 
   extends RuntimeException
 {
+  private static final long serialVersionUID = -5696557788586220964L;
+
   public MalformedParameterizedTypeException()
   {
   }
diff --git a/java/lang/reflect/ParameterizedType.java b/java/lang/reflect/ParameterizedType.java
index 61081c962..7a8a7b4e7 100644
--- a/java/lang/reflect/ParameterizedType.java
+++ b/java/lang/reflect/ParameterizedType.java
@@ -63,7 +63,7 @@ package java.lang.reflect;
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @see GenericTypeDeclaration
+ * @see GenericDeclaration
  * @see TypeVariable
  * @since 1.5
  */
diff --git a/java/net/URLConnection.java b/java/net/URLConnection.java
index 7b5c636bd..1f78dd8e8 100644
--- a/java/net/URLConnection.java
+++ b/java/net/URLConnection.java
@@ -50,7 +50,6 @@ import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Map;
 import java.util.StringTokenizer;
diff --git a/java/util/Arrays.java b/java/util/Arrays.java
index b934591fd..29134467b 100644
--- a/java/util/Arrays.java
+++ b/java/util/Arrays.java
@@ -2654,7 +2654,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2676,7 +2676,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2698,7 +2698,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2720,7 +2720,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2742,7 +2742,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2764,7 +2764,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2786,7 +2786,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2808,7 +2808,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
@@ -2830,7 +2830,7 @@ public class Arrays
   /**
    * Returns a String representation of the argument array.  Returns "null"
    * if <code>a</code> is null.
-   * @param a the array to represent
+   * @param v the array to represent
    * @return a String representing this array
    * @since 1.5
    */
diff --git a/java/util/InvalidPropertiesFormatException.java b/java/util/InvalidPropertiesFormatException.java
index 6540c2313..aaa6c4eb4 100644
--- a/java/util/InvalidPropertiesFormatException.java
+++ b/java/util/InvalidPropertiesFormatException.java
@@ -39,11 +39,16 @@ exception statement from your version. */
 package java.util;
 
 import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
-// FIXME: serialization methods should throw NotSerializableException
 /** @since 1.5 */
 public class InvalidPropertiesFormatException extends IOException
 {
+  // This class won't serialize, but we have a UID to placate the compiler.
+  private static final long serialVersionUID = 7763056076009360219L;
+
   public InvalidPropertiesFormatException(String message)
   {
     super(message);
@@ -54,4 +59,14 @@ public class InvalidPropertiesFormatException extends IOException
     super();
     initCause(cause);
   }
+
+  private void writeObject(ObjectOutputStream out) throws IOException
+  {
+    throw new NotSerializableException("objects of this type are not serializable");
+  }
+
+  private void readObject(ObjectInputStream in) throws IOException
+  {
+    throw new NotSerializableException("objects of this type are not serializable");
+  }
 }