* java/lang/Process.java: Added import for javadoc.

	* java/lang/Object.java (notify): Javadoc fix.
	(notifyAll): Likewise.
	* java/io/PipedInputStream.java (connect): Javadoc fix.
	* java/io/OutputStreamWriter.java: Organized imports.
	* java/io/ObjectStreamField.java (setOffset): Javadoc fix.
	* java/io/ObjectInputStream.java (readFields): Javadoc fix.
	* java/io/DataOutputStream.java (writeChars): Javadoc fix.
	(writeFloat): Likewise.
	(writeDouble): Likewise.
	* java/util/Locale.java (readObject): Javadoc fix.
	(writeObject): Likewise.
	* java/io/LineNumberReader.java (read): Javadoc fix.
	(setLineNumber): Likewise.
	(mark): Likewise.
	* java/io/InputStreamReader.java: Updated imports.
	* java/lang/Integer.java (parseInt): Javadoc fix.
	* java/io/FilterReader.java (skip): Javadoc fix.
	* java/util/HashMap.java (containsValue): Javadoc fix.
	* java/lang/ClassLoader.java (findLibrary): Javadoc fix.
	(setPackageAssertionStatus): Likewise.
	(setClassAssertionStatus): Likewise.
	* java/lang/Class.java: Added imports for javadoc.
	(matchMethod): Javadoc fix.
	* java/util/ArrayList.java (readObject): Javadoc fix.
	(writeObject): Likewise.
	* java/lang/String.java (CaseInsensitiveComparator): Javadoc fix.
	* java/util/zip/PendingBuffer.java (toByteArray): Javadoc fix.
	* javax/swing/plaf/metal/OceanTheme.java: Mark as 1.5.
	* java/util/logging/SimpleFormatter.java (format): Javadoc fix.
	* java/util/zip/ZipFile.java (getEntries): Javadoc fix.

6 files changed, 13 insertions, 10 deletions

diff --git a/java/lang/Class.java b/java/lang/Class.java
index 22f148e91..e99c35193 100644
--- a/java/lang/Class.java
+++ b/java/lang/Class.java
@@ -41,7 +41,9 @@ package java.lang;
 import gnu.classpath.VMStackWalker;
 
 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.InvocationTargetException;
@@ -721,7 +723,7 @@ public final class Class implements Serializable
    * @param list List of methods to search
    * @param name Name of method
    * @param args Method parameter types
-   * @see #getMethod()
+   * @see #getMethod(String, Class[])
    */
   private static Method matchMethod(Method[] list, String name, Class[] args)
   {
@@ -829,7 +831,7 @@ public final class Class implements Serializable
    * public and final, but not an interface.
    *
    * @return the modifiers of this class
-   * @see Modifer
+   * @see Modifier
    * @since 1.1
    */
   public int getModifiers()
diff --git a/java/lang/ClassLoader.java b/java/lang/ClassLoader.java
index 0d50a6e00..031a8ed66 100644
--- a/java/lang/ClassLoader.java
+++ b/java/lang/ClassLoader.java
@@ -883,7 +883,7 @@ public abstract class ClassLoader
    *
    * @param name the (system specific) name of the requested library
    * @return the full pathname to the requested library, or null
-   * @see Runtime#loadLibrary()
+   * @see Runtime#loadLibrary(String)
    * @since 1.2
    */
   protected String findLibrary(String name)
@@ -913,7 +913,7 @@ public abstract class ClassLoader
    *
    * @param name the package (and subpackages) to affect
    * @param enabled true to set the default to enabled
-   * @see #setDefaultAssertionStatus(String, boolean)
+   * @see #setDefaultAssertionStatus(boolean)
    * @see #setClassAssertionStatus(String, boolean)
    * @see #clearAssertionStatus()
    * @since 1.4
@@ -934,7 +934,7 @@ public abstract class ClassLoader
    * @param name the class to affect
    * @param enabled true to set the default to enabled
    * @throws NullPointerException if name is null
-   * @see #setDefaultAssertionStatus(String, boolean)
+   * @see #setDefaultAssertionStatus(boolean)
    * @see #setPackageAssertionStatus(String, boolean)
    * @see #clearAssertionStatus()
    * @since 1.4
diff --git a/java/lang/Integer.java b/java/lang/Integer.java
index 53de9ab96..f3fe85f50 100644
--- a/java/lang/Integer.java
+++ b/java/lang/Integer.java
@@ -707,8 +707,8 @@ public final class Integer extends Number implements Comparable
    * @throws NullPointerException if decode is true and str if null
    * @see #parseInt(String, int)
    * @see #decode(String)
-   * @see Byte#parseInt(String, int)
-   * @see Short#parseInt(String, int)
+   * @see Byte#parseByte(String, int)
+   * @see Short#parseShort(String, int)
    */
   static int parseInt(String str, int radix, boolean decode)
   {
diff --git a/java/lang/Object.java b/java/lang/Object.java
index f8c389a57..6212d7dfe 100644
--- a/java/lang/Object.java
+++ b/java/lang/Object.java
@@ -343,7 +343,7 @@ public class Object
    *
    * <p>This thread still holds a lock on the object, so it is
    * typical to release the lock by exiting the synchronized
-   * code, calling wait(), or calling {@link Thread#sleep()}, so
+   * code, calling wait(), or calling {@link Thread#sleep(long)}, so
    * that the newly awakened thread can actually resume.  The
    * awakened thread will most likely be awakened with an
    * {@link InterruptedException}, but that is not guaranteed.
@@ -372,7 +372,7 @@ public class Object
    *
    * <p>This thread still holds a lock on the object, so it is
    * typical to release the lock by exiting the synchronized
-   * code, calling wait(), or calling {@link Thread#sleep()}, so
+   * code, calling wait(), or calling {@link Thread#sleep(long)}, so
    * that one of the newly awakened threads can actually resume.
    * The resuming thread will most likely be awakened with an
    * {@link InterruptedException}, but that is not guaranteed.
diff --git a/java/lang/Process.java b/java/lang/Process.java
index b6e18ca4d..ccaa3f153 100644
--- a/java/lang/Process.java
+++ b/java/lang/Process.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 
 package java.lang;
 
+import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 
diff --git a/java/lang/String.java b/java/lang/String.java
index b4db85050..7d5b66f29 100644
--- a/java/lang/String.java
+++ b/java/lang/String.java
@@ -139,7 +139,7 @@ public final class String implements Serializable, Comparable, CharSequence
   final int offset;
 
   /**
-   * An implementation for {@link CASE_INSENSITIVE_ORDER}.
+   * An implementation for {@link #CASE_INSENSITIVE_ORDER}.
    * This must be {@link Serializable}. The class name is dictated by
    * compatibility with Sun's JDK.
    */