2004-10-15 Michael Koch <konqueror@gmx.de>

	* java/lang/Object.java (equals): Rename 'o' to 'obj'.
	* java/lang/Runtime.java, java/lang/Thread.java,
	java/lang/ThreadLocal.java, java/lang/Void.java:
	Improved javadocs to be valid XHTML.

5 files changed, 33 insertions, 24 deletions

diff --git a/java/lang/Object.java b/java/lang/Object.java
index 92b349046..c86da08c2 100644
--- a/java/lang/Object.java
+++ b/java/lang/Object.java
@@ -125,13 +125,13 @@ public class Object
    *
    * <p>The default implementation returns <code>this == o</code>.
    *
-   * @param o the Object to compare to
+   * @param obj the Object to compare to
    * @return whether this Object is semantically equal to another
    * @see #hashCode()
    */
-  public boolean equals(Object o)
+  public boolean equals(Object obj)
   {
-    return this == o;
+    return this == obj;
   }
 
   /**
diff --git a/java/lang/Runtime.java b/java/lang/Runtime.java
index 319513cba..53ab0d489 100644
--- a/java/lang/Runtime.java
+++ b/java/lang/Runtime.java
@@ -80,27 +80,27 @@ public class Runtime
    * treated as read-only.
    *
    * No matter what class you start initialization with, it defers to the
-   * superclass, therefore Object.<clinit> will be the first Java code
+   * superclass, therefore Object.&lt;clinit&gt; will be the first Java code
    * executed. From there, the bootstrap sequence, up to the point that
    * native libraries are loaded (as of March 24, when I traced this
    * manually) is as follows:
    *
-   * Object.<clinit> uses a String literal, possibly triggering initialization
-   *  String.<clinit> calls WeakHashMap.<init>, triggering initialization
+   * Object.&lt;clinit&gt; uses a String literal, possibly triggering initialization
+   *  String.&lt;clinit&gt; calls WeakHashMap.&lt;init&gt;, triggering initialization
    *   AbstractMap, WeakHashMap, WeakHashMap$1 have no dependencies
-   *  String.<clinit> calls CaseInsensitiveComparator.<init>, triggering
+   *  String.&lt;clinit&gt; calls CaseInsensitiveComparator.&lt;init&gt;, triggering
    *      initialization
    *   CaseInsensitiveComparator has no dependencies
-   * Object.<clinit> calls System.loadLibrary, triggering initialization
-   *  System.<clinit> calls System.loadLibrary
+   * Object.&lt;clinit&gt; calls System.loadLibrary, triggering initialization
+   *  System.&lt;clinit&gt; calls System.loadLibrary
    *  System.loadLibrary calls Runtime.getRuntime, triggering initialization
-   *   Runtime.<clinit> calls Properties.<init>, triggering initialization
+   *   Runtime.&lt;clinit&gt; calls Properties.&lt;init&gt;, triggering initialization
    *    Dictionary, Hashtable, and Properties have no dependencies
-   *   Runtime.<clinit> calls VMRuntime.insertSystemProperties, triggering
+   *   Runtime.&lt;clinit&gt; calls VMRuntime.insertSystemProperties, triggering
    *      initialization of VMRuntime; the VM must make sure that there are
    *      not any harmful dependencies
-   *   Runtime.<clinit> calls Runtime.<init>
-   *    Runtime.<init> calls StringTokenizer.<init>, triggering initialization
+   *   Runtime.&lt;clinit&gt; calls Runtime.&lt;init&gt;
+   *    Runtime.&lt;init&gt; calls StringTokenizer.&lt;init&gt;, triggering initialization
    *     StringTokenizer has no dependencies
    *  System.loadLibrary calls Runtime.loadLibrary
    *   Runtime.loadLibrary should be able to load the library, although it
diff --git a/java/lang/Thread.java b/java/lang/Thread.java
index abfa4e983..61f793f2c 100644
--- a/java/lang/Thread.java
+++ b/java/lang/Thread.java
@@ -38,10 +38,11 @@ exception statement from your version. */
 
 package java.lang;
 
+
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
- * Status:  Believed complete to version 1.4, with caveats. We do not 
+ * Status:  Believed complete to version 1.4, with caveats. We do not
  *          implement the deprecated (and dangerous) stop, suspend, and resume
  *          methods. Security implementation is not complete.
  */
@@ -76,7 +77,7 @@ package java.lang;
  *
  * @author Tom Tromey
  * @author John Keiser
- * @author Eric Blake <ebb9@email.byu.edu>
+ * @author Eric Blake (ebb9@email.byu.edu)
  * @see Runnable
  * @see Runtime#exit(int)
  * @see #run()
@@ -858,7 +859,7 @@ public class Thread implements Runnable
    * If you stop a Thread that has not yet started, the stop is ignored
    * (contrary to what the JDK documentation says).
    * <b>WARNING</b>This bypasses Java security, and can throw a checked
-   * exception which the call stack is unprepared to handle. Do not abuse 
+   * exception which the call stack is unprepared to handle. Do not abuse
    * this power.
    *
    * <p>This is inherently unsafe, as it can interrupt synchronized blocks and
diff --git a/java/lang/ThreadLocal.java b/java/lang/ThreadLocal.java
index 972565949..d9967c6a2 100644
--- a/java/lang/ThreadLocal.java
+++ b/java/lang/ThreadLocal.java
@@ -41,6 +41,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
 
+
 /**
  * ThreadLocal objects have a different state associated with every
  * Thread that accesses them. Every access to the ThreadLocal object
@@ -51,8 +52,11 @@ import java.util.WeakHashMap;
  * <p>The first time a ThreadLocal object is accessed on a particular
  * Thread, the state for that Thread's copy of the local variable is set by
  * executing the method <code>initialValue()</code>.
+ * </p>
  *
  * <p>An example how you can use this:
+ * </p>
+ *
  * <pre>
  * class Connection
  * {
@@ -65,20 +69,22 @@ import java.util.WeakHashMap;
  *     };
  * ...
  * }
- * </pre></br>
+ * </pre>
  *
- * Now all instances of connection can see who the owner of the currently
+ * <p>Now all instances of connection can see who the owner of the currently
  * executing Thread is by calling <code>owner.get()</code>. By default any
  * Thread would be associated with 'nobody'. But the Connection object could
  * offer a method that changes the owner associated with the Thread on
  * which the method was called by calling <code>owner.put("somebody")</code>.
  * (Such an owner changing method should then be guarded by security checks.)
+ * </p>
  *
  * <p>When a Thread is garbage collected all references to values of
  * the ThreadLocal objects associated with that Thread are removed.
+ * </p>
  *
- * @author Mark Wielaard <mark@klomp.org>
- * @author Eric Blake <ebb9@email.byu.edu>
+ * @author Mark Wielaard (mark@klomp.org)
+ * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.2
  * @status updated to 1.4
  */
diff --git a/java/lang/Void.java b/java/lang/Void.java
index b2d64dd5b..39094d722 100644
--- a/java/lang/Void.java
+++ b/java/lang/Void.java
@@ -35,19 +35,19 @@ 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.lang;
 
+
 /**
  * Void is a placeholder class so that the variable <code>Void.TYPE</code>
  * (also available as <code>void.class</code>) can be supported for
  * reflection return types.
  *
- * <p>This class could be Serializable, but that is up to Sun.
+ * <p>This class could be Serializable, but that is up to Sun.</p>
  *
  * @author Paul Fisher
  * @author John Keiser
- * @author Eric Blake <ebb9@email.byu.edu>
+ * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.1
  * @status updated to 1.4
  */
@@ -62,5 +62,7 @@ public final class Void
   /**
    * Void is non-instantiable.
    */
-  private Void() { }
+  private Void()
+  {
+  }
 }