1 files changed, 57 insertions, 15 deletions

diff --git a/libjava/java/io/StringReader.java b/libjava/java/io/StringReader.java
index 60a9129..66d3732 100644
--- a/libjava/java/io/StringReader.java
+++ b/libjava/java/io/StringReader.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -8,16 +8,26 @@ details.  */
  
 package java.io;
 
-/**
- * @author Warren Levy <warrenl@cygnus.com>
- * @date October 19, 1998.  
- */
 /* 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 and correct
  */
- 
+
+/**
+ * This class permits a <code>String</code> to be read as a character 
+ * input stream.
+ * <p>
+ * The mark/reset functionality in this class behaves differently than
+ * normal.  If no mark has been set, then calling the <code>reset()</code>
+ * method rewinds the read pointer to the beginning of the <code>String</code>.
+ *
+ * @version 0.0
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date October 19, 1998.  
+ */
 public class StringReader extends Reader
 {
   /* A String provided by the creator of the stream. */
@@ -32,6 +42,13 @@ public class StringReader extends Reader
   /* The index in buf one greater than the last valid character. */
   private int count;
 
+  /**
+   * Create a new <code>StringReader</code> that will read chars from the 
+   * passed in <code>String</code>.  This stream will read from the beginning to the 
+   * end of the <code>String</code>.
+   *
+   * @param s The <code>String</code> this stream will read from.
+   */
   public StringReader(String buffer)
   {
     super();
@@ -54,7 +71,7 @@ public class StringReader extends Reader
     synchronized (lock)
     {
       if (buf == null)
-        throw new IOException();
+        throw new IOException("Stream closed");
 
       // readAheadLimit is ignored per Java Class Lib. book, p. 1692.
       markedPos = pos;
@@ -71,7 +88,7 @@ public class StringReader extends Reader
     synchronized (lock)
     {
       if (buf == null)
-        throw new IOException();
+        throw new IOException("Stream closed");
 
       if (pos < count)
         return ((int) buf.charAt(pos++)) & 0xFFFF;
@@ -84,7 +101,7 @@ public class StringReader extends Reader
     synchronized (lock)
     {
       if (buf == null)
-        throw new IOException();
+        throw new IOException("Stream closed");
 
       /* Don't need to check pos value, arraycopy will check it. */
       if (off < 0 || len < 0 || off + len > b.length)
@@ -101,31 +118,56 @@ public class StringReader extends Reader
     }
   }
 
-  public boolean ready() // TODO12: throws IOException
+  /**
+   * This method determines if the stream is ready to be read.  This class
+   * is always ready to read and so always returns <code>true</code>, unless
+   * close() has previously been called in which case an IOException is
+   * thrown.
+   *
+   * @return <code>true</code> to indicate that this object is ready to be read.
+   * @exception IOException If the stream is closed.
+   */
+  public boolean ready() throws IOException
   {
-    // TODO12: The JCL specifically says this returns true even if the
-    // reader has been closed, whereas the online 1.2 doc specifically
-    // says to throw an IOException if closed.
+    if (buf == null)
+      throw new IOException("Stream closed");
+
     return true;
   }
 
+  /**
+   * Sets the read position in the stream to the previously
+   * marked position or to 0 (i.e., the beginning of the stream) if the mark
+   * has not already been set.
+   */
   public void reset() throws IOException
   {
     synchronized (lock)
     {
       if (buf == null)
-        throw new IOException();
+        throw new IOException("Stream closed");
 
       pos = markedPos;
     }
   }
 
+  /**
+    * This method attempts to skip the requested number of chars in the
+    * input stream.  It does this by advancing the <code>pos</code> value by 
+    * the specified number of chars.  It this would exceed the length of the
+    * buffer, then only enough chars are skipped to position the stream at
+    * the end of the buffer.  The actual number of chars skipped is returned.
+    *
+    * @param num_chars The requested number of chars to skip
+    *
+    * @return The actual number of chars skipped.
+    */
   public long skip(long n) throws IOException
   {
     synchronized (lock)
     {
       if (buf == null)
-        throw new IOException();
+        throw new IOException("Stream closed");
 
       // Even though the var numChars is a long, in reality it can never
       // be larger than an int since the result of subtracting 2 positive