Index: java/nio/Buffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/Buffer.java,v
retrieving revision 1.9
diff -u -r1.9 Buffer.java
--- java/nio/Buffer.java	12 Oct 2003 17:51:53 -0000	1.9
+++ java/nio/Buffer.java	8 Apr 2004 20:44:28 -0000
@@ -45,10 +45,11 @@
   int pos = 0;
   int mark = -1;
 
-  // Creates a new Buffer.
-  //
-  // Should be package private.
-  //
+  /**
+   * Creates a new Buffer.
+   *
+   * Should be package private.
+   */
   Buffer (int capacity, int limit, int position, int mark)
   {
     if (capacity < 0)
@@ -69,6 +70,8 @@
   
   /**
    * Retrieves the capacity of the buffer.
+   *
+   * @return the capacity of the buffer
    */
   public final int capacity ()
   {
@@ -77,6 +80,8 @@
 
   /**
    * Clears the buffer.
+   *
+   * @return this buffer
    */
   public final Buffer clear ()
   {
@@ -88,6 +93,8 @@
     
   /**
    * Flips the buffer.
+   *
+   * @return this buffer
    */
   public final Buffer flip ()
   {
@@ -99,6 +106,9 @@
     
   /**
    * Tells whether the buffer has remaining data to read or not.
+   *
+   * @return true if the buffer contains remaining data to read,
+   * false otherwise
    */
   public final boolean hasRemaining ()
   {
@@ -107,11 +117,15 @@
 
   /**
    * Tells whether this buffer is read only or not.
+   *
+   * @return true if the buffer is read only, false otherwise
    */
   public abstract boolean isReadOnly ();
 
   /**
    * Retrieves the current limit of the buffer.
+   *
+   * @return the limit of the buffer
    */
   public final int limit ()
   {
@@ -124,6 +138,8 @@
    * @param newLimit The new limit value; must be non-negative and no larger
    * than this buffer's capacity.
    *
+   * @return this buffer
+   *
    * @exception IllegalArgumentException If the preconditions on newLimit
    * do not hold.
    */
@@ -144,6 +160,8 @@
 
   /**
    * Sets this buffer's mark at its position.
+   *
+   * @return this buffer
    */
   public final Buffer mark ()
   {
@@ -153,6 +171,8 @@
 
   /**
    * Retrieves the current position of this buffer.
+   *
+   * @return the current position of this buffer
    */
   public final int position ()
   {
@@ -165,7 +185,9 @@
    * 
    * @param newPosition The new position value; must be non-negative and no
    * larger than the current limit.
-   * 
+   *
+   * @return this buffer
+   *
    * @exception IllegalArgumentException If the preconditions on newPosition
    * do not hold
    */
@@ -183,6 +205,8 @@
 
   /**
    * Returns the number of elements between the current position and the limit.
+   *
+   * @return the number of remaining elements
    */
   public final int remaining()
   {
@@ -191,7 +215,9 @@
 
   /**
    * Resets this buffer's position to the previously-marked position.
-   * 
+   *
+   * @return this buffer
+   *
    * @exception InvalidMarkException If the mark has not been set.
    */
   public final Buffer reset()
@@ -206,6 +232,8 @@
   /**
    * Rewinds this buffer. The position is set to zero and the mark
    * is discarded.
+   *
+   * @this buffer
    */
   public final Buffer rewind()
   {
Index: java/nio/ByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteBufferImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ByteBufferImpl.java
--- java/nio/ByteBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.5
+++ java/nio/ByteBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -131,7 +131,7 @@
   /**
    * Relative get method. Reads the next <code>byte</code> from the buffer.
    */
-  final public byte get ()
+  public byte get ()
   {
     byte result = backing_buffer [position () + array_offset];
     position (position () + 1);
@@ -144,7 +144,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ByteBuffer put (byte value)
+  public ByteBuffer put (byte value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -162,7 +162,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public byte get (int index)
+  public byte get (int index)
   {
     return backing_buffer [index + array_offset];
   }
@@ -175,7 +175,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ByteBuffer put (int index, byte value)
+  public ByteBuffer put (int index, byte value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -184,133 +184,133 @@
     return this;
   }
   
-  final public char getChar ()
+  public char getChar ()
   {
     return ByteBufferHelper.getChar(this, order());
   }
   
-  final public ByteBuffer putChar (char value)
+  public ByteBuffer putChar (char value)
   {
     ByteBufferHelper.putChar(this, value, order());
     return this;
   }
   
-  final public char getChar (int index)
+  public char getChar (int index)
   {
     return ByteBufferHelper.getChar(this, index, order());
   }
   
-  final public ByteBuffer putChar (int index, char value)
+  public ByteBuffer putChar (int index, char value)
   {
     ByteBufferHelper.putChar(this, index, value, order());
     return this;
   }
 
-  final public short getShort ()
+  public short getShort ()
   {
     return ByteBufferHelper.getShort(this, order());
   }
   
-  final public ByteBuffer putShort (short value)
+  public ByteBuffer putShort (short value)
   {
     ByteBufferHelper.putShort(this, value, order());
     return this;
   }
   
-  final public short getShort (int index)
+  public short getShort (int index)
   {
     return ByteBufferHelper.getShort(this, index, order());
   }
   
-  final public ByteBuffer putShort (int index, short value)
+  public ByteBuffer putShort (int index, short value)
   {
     ByteBufferHelper.putShort(this, index, value, order());
     return this;
   }
 
-  final public int getInt ()
+  public int getInt ()
   {
     return ByteBufferHelper.getInt(this, order());
   }
   
-  final public ByteBuffer putInt (int value)
+  public ByteBuffer putInt (int value)
   {
     ByteBufferHelper.putInt(this, value, order());
     return this;
   }
   
-  final public int getInt (int index)
+  public int getInt (int index)
   {
     return ByteBufferHelper.getInt(this, index, order());
   }
   
-  final public ByteBuffer putInt (int index, int value)
+  public ByteBuffer putInt (int index, int value)
   {
     ByteBufferHelper.putInt(this, index, value, order());
     return this;
   }
 
-  final public long getLong ()
+  public long getLong ()
   {
     return ByteBufferHelper.getLong(this, order());
   }
   
-  final public ByteBuffer putLong (long value)
+  public ByteBuffer putLong (long value)
   {
     ByteBufferHelper.putLong (this, value, order());
     return this;
   }
   
-  final public long getLong (int index)
+  public long getLong (int index)
   {
     return ByteBufferHelper.getLong (this, index, order());
   }
   
-  final public ByteBuffer putLong (int index, long value)
+  public ByteBuffer putLong (int index, long value)
   {
     ByteBufferHelper.putLong (this, index, value, order());
     return this;
   }
 
-  final public float getFloat ()
+  public float getFloat ()
   {
     return ByteBufferHelper.getFloat (this, order());
   }
   
-  final public ByteBuffer putFloat (float value)
+  public ByteBuffer putFloat (float value)
   {
     ByteBufferHelper.putFloat (this, value, order());
     return this;
   }
   
-  public final float getFloat (int index)
+  public float getFloat (int index)
   {
     return ByteBufferHelper.getFloat (this, index, order());
   }
 
-  final public ByteBuffer putFloat (int index, float value)
+  public ByteBuffer putFloat (int index, float value)
   {
     ByteBufferHelper.putFloat (this, index, value, order());
     return this;
   }
 
-  final public double getDouble ()
+  public double getDouble ()
   {
     return ByteBufferHelper.getDouble (this, order());
   }
 
-  final public ByteBuffer putDouble (double value)
+  public ByteBuffer putDouble (double value)
   {
     ByteBufferHelper.putDouble (this, value, order());
     return this;
   }
   
-  final public double getDouble (int index)
+  public double getDouble (int index)
   {
     return ByteBufferHelper.getDouble (this, index, order());
   }
   
-  final public ByteBuffer putDouble (int index, double value)
+  public ByteBuffer putDouble (int index, double value)
   {
     ByteBufferHelper.putDouble (this, index, value, order());
     return this;
Index: java/nio/CharBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/CharBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 CharBufferImpl.java
--- java/nio/CharBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/CharBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -104,7 +104,7 @@
     return false;
   }
 
-  final public CharSequence subSequence (int start, int end)
+  public CharSequence subSequence (int start, int end)
   {
     if (start < 0
         || start > length ()
@@ -118,7 +118,7 @@
   /**
    * Relative get method. Reads the next <code>char</code> from the buffer.
    */
-  final public char get ()
+  public char get ()
   {
     char result = backing_buffer [position ()];
     position (position () + 1);
@@ -131,7 +131,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public CharBuffer put (char value)
+  public CharBuffer put (char value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -148,7 +148,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public char get (int index)
+  public char get (int index)
   {
     if (index < 0
         || index >= limit ())
@@ -165,7 +165,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public CharBuffer put (int index, char value)
+  public CharBuffer put (int index, char value)
   {
     if (index < 0
         || index >= limit ())
@@ -178,7 +178,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/DoubleBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 DoubleBufferImpl.java
--- java/nio/DoubleBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/DoubleBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>double</code> from the buffer.
    */
-  final public double get ()
+  public double get ()
   {
     double result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public DoubleBuffer put (double value)
+  public DoubleBuffer put (double value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public double get (int index)
+  public double get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public DoubleBuffer put (int index, double value)
+  public DoubleBuffer put (int index, double value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/DoubleViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 DoubleViewBufferImpl.java
--- java/nio/DoubleViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/DoubleViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class DoubleViewBufferImpl extends DoubleBuffer
+final class DoubleViewBufferImpl extends DoubleBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/FloatBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 FloatBufferImpl.java
--- java/nio/FloatBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/FloatBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>float</code> from the buffer.
    */
-  final public float get ()
+  public float get ()
   {
     float result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public FloatBuffer put (float value)
+  public FloatBuffer put (float value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public float get (int index)
+  public float get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public FloatBuffer put (int index, float value)
+  public FloatBuffer put (int index, float value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/FloatViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 FloatViewBufferImpl.java
--- java/nio/FloatViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/FloatViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class FloatViewBufferImpl extends FloatBuffer
+final class FloatViewBufferImpl extends FloatBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/IntBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 IntBufferImpl.java
--- java/nio/IntBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/IntBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>int</code> from the buffer.
    */
-  final public int get ()
+  public int get ()
   {
     int result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public IntBuffer put (int value)
+  public IntBuffer put (int value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public int get (int index)
+  public int get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public IntBuffer put (int index, int value)
+  public IntBuffer put (int index, int value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/IntViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 IntViewBufferImpl.java
--- java/nio/IntViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/IntViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class IntViewBufferImpl extends IntBuffer
+final class IntViewBufferImpl extends IntBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/LongBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 LongBufferImpl.java
--- java/nio/LongBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/LongBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>long</code> from the buffer.
    */
-  final public long get ()
+  public long get ()
   {
     long result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public LongBuffer put (long value)
+  public LongBuffer put (long value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public long get (int index)
+  public long get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public LongBuffer put (int index, long value)
+  public LongBuffer put (int index, long value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/LongViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 LongViewBufferImpl.java
--- java/nio/LongViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/LongViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class LongViewBufferImpl extends LongBuffer
+final class LongViewBufferImpl extends LongBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/ShortBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ShortBufferImpl.java
--- java/nio/ShortBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/ShortBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>short</code> from the buffer.
    */
-  final public short get ()
+  public short get ()
   {
     short result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ShortBuffer put (short value)
+  public ShortBuffer put (short value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public short get (int index)
+  public short get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ShortBuffer put (int index, short value)
+  public ShortBuffer put (int index, short value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/ShortViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ShortViewBufferImpl.java
--- java/nio/ShortViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/ShortViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class ShortViewBufferImpl extends ShortBuffer
+final class ShortViewBufferImpl extends ShortBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/channels/AlreadyConnectedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/AlreadyConnectedException.java,v
retrieving revision 1.5
diff -u -r1.5 AlreadyConnectedException.java
--- java/nio/channels/AlreadyConnectedException.java	11 Nov 2002 14:25:46 -0000	1.5
+++ java/nio/channels/AlreadyConnectedException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* AlreadyConnectedException.java -- 
+/* AlreadyConnectedException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
Index: java/nio/channels/AsynchronousCloseException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/AsynchronousCloseException.java,v
retrieving revision 1.1
diff -u -r1.1 AsynchronousCloseException.java
--- java/nio/channels/AsynchronousCloseException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/AsynchronousCloseException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* AsynchronousCloseException.java -- 
+/* AsynchronousCloseException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ByteChannel.java,v
retrieving revision 1.3
diff -u -r1.3 ByteChannel.java
--- java/nio/channels/ByteChannel.java	11 Nov 2002 14:25:46 -0000	1.3
+++ java/nio/channels/ByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ByteChannel.java -- 
+/* ByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@
 
 package java.nio.channels;
 
-public interface ByteChannel
-  extends ReadableByteChannel, WritableByteChannel
+public interface ByteChannel extends ReadableByteChannel,
+                                     WritableByteChannel
 {
 }
Index: java/nio/channels/CancelledKeyException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/CancelledKeyException.java,v
retrieving revision 1.1
diff -u -r1.1 CancelledKeyException.java
--- java/nio/channels/CancelledKeyException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/CancelledKeyException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* CancelledKeyException.java -- 
+/* CancelledKeyException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/Channel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/Channel.java,v
retrieving revision 1.5
diff -u -r1.5 Channel.java
--- java/nio/channels/Channel.java	12 Oct 2003 15:51:25 -0000	1.5
+++ java/nio/channels/Channel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* Channel.java -- 
+/* Channel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 public interface Channel
 {
Index: java/nio/channels/ClosedByInterruptException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ClosedByInterruptException.java,v
retrieving revision 1.1
diff -u -r1.1 ClosedByInterruptException.java
--- java/nio/channels/ClosedByInterruptException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/ClosedByInterruptException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ClosedByInterruptException.java -- 
+/* ClosedByInterruptException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ClosedChannelException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ClosedChannelException.java,v
retrieving revision 1.5
diff -u -r1.5 ClosedChannelException.java
--- java/nio/channels/ClosedChannelException.java	18 Nov 2002 11:26:03 -0000	1.5
+++ java/nio/channels/ClosedChannelException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ClosedChannelException.java -- 
+/* ClosedChannelException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ClosedSelectorException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ClosedSelectorException.java,v
retrieving revision 1.1
diff -u -r1.1 ClosedSelectorException.java
--- java/nio/channels/ClosedSelectorException.java	18 Nov 2002 11:26:03 -0000	1.1
+++ java/nio/channels/ClosedSelectorException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ClosedSelectorException.java -- 
+/* ClosedSelectorException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ConnectionPendingException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ConnectionPendingException.java,v
retrieving revision 1.1
diff -u -r1.1 ConnectionPendingException.java
--- java/nio/channels/ConnectionPendingException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/ConnectionPendingException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ConnectionPendingException.java -- 
+/* ConnectionPendingException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/FileLockInterruptionException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/FileLockInterruptionException.java,v
retrieving revision 1.1
diff -u -r1.1 FileLockInterruptionException.java
--- java/nio/channels/FileLockInterruptionException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/FileLockInterruptionException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* FileLockInterruptionException.java -- 
+/* FileLockInterruptionException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/GatheringByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/GatheringByteChannel.java,v
retrieving revision 1.5
diff -u -r1.5 GatheringByteChannel.java
--- java/nio/channels/GatheringByteChannel.java	12 Oct 2003 15:51:25 -0000	1.5
+++ java/nio/channels/GatheringByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* GatheringByteChannel.java -- 
+/* GatheringByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,11 +37,11 @@
 
 package java.nio.channels;
 
-import java.nio.ByteBuffer;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
-public interface GatheringByteChannel
-  extends WritableByteChannel
+
+public interface GatheringByteChannel extends WritableByteChannel
 {
   /**
    * Writes a sequence of bytes to this channel from a subsequence of
@@ -59,9 +59,9 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing
    */
-  long write (ByteBuffer[] srcs, int offset, int length)
+  long write(ByteBuffer[] srcs, int offset, int length)
     throws IOException;
-  
+
   /**
    * Writes a sequence of bytes to this channel from the given buffers
    *
@@ -75,5 +75,5 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing
    */
-  long write (ByteBuffer[] srcs) throws IOException;
+  long write(ByteBuffer[] srcs) throws IOException;
 }
Index: java/nio/channels/IllegalBlockingModeException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/IllegalBlockingModeException.java,v
retrieving revision 1.1
diff -u -r1.1 IllegalBlockingModeException.java
--- java/nio/channels/IllegalBlockingModeException.java	7 Nov 2002 11:20:39 -0000	1.1
+++ java/nio/channels/IllegalBlockingModeException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* IllegalBlockingModeException.java -- 
+/* IllegalBlockingModeException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch <address@hidden>
Index: java/nio/channels/IllegalSelectorException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/IllegalSelectorException.java,v
retrieving revision 1.1
diff -u -r1.1 IllegalSelectorException.java
--- java/nio/channels/IllegalSelectorException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/IllegalSelectorException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* IllegalSelectorException.java -- 
+/* IllegalSelectorException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/InterruptibleChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/InterruptibleChannel.java,v
retrieving revision 1.4
diff -u -r1.4 InterruptibleChannel.java
--- java/nio/channels/InterruptibleChannel.java	11 Nov 2002 14:25:46 -0000	1.4
+++ java/nio/channels/InterruptibleChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* InterruptibleChannel.java -- 
+/* InterruptibleChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 public interface InterruptibleChannel extends Channel
 {
Index: java/nio/channels/NoConnectionPendingException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NoConnectionPendingException.java,v
retrieving revision 1.1
diff -u -r1.1 NoConnectionPendingException.java
--- java/nio/channels/NoConnectionPendingException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NoConnectionPendingException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NoConnectionPendingException.java -- 
+/* NoConnectionPendingException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NonReadableChannelException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NonReadableChannelException.java,v
retrieving revision 1.1
diff -u -r1.1 NonReadableChannelException.java
--- java/nio/channels/NonReadableChannelException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NonReadableChannelException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NonReadableChannelException.java -- 
+/* NonReadableChannelException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NonWritableChannelException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NonWritableChannelException.java,v
retrieving revision 1.1
diff -u -r1.1 NonWritableChannelException.java
--- java/nio/channels/NonWritableChannelException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NonWritableChannelException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NonWritableChannelException.java -- 
+/* NonWritableChannelException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NotYetBoundException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NotYetBoundException.java,v
retrieving revision 1.1
diff -u -r1.1 NotYetBoundException.java
--- java/nio/channels/NotYetBoundException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NotYetBoundException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NotYetBoundException.java -- 
+/* NotYetBoundException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NotYetConnectedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NotYetConnectedException.java,v
retrieving revision 1.1
diff -u -r1.1 NotYetConnectedException.java
--- java/nio/channels/NotYetConnectedException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NotYetConnectedException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NotYetConnectedException.java -- 
+/* NotYetConnectedException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/OverlappingFileLockException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/OverlappingFileLockException.java,v
retrieving revision 1.1
diff -u -r1.1 OverlappingFileLockException.java
--- java/nio/channels/OverlappingFileLockException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/OverlappingFileLockException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* OverlappingFileLockException.java -- 
+/* OverlappingFileLockException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ReadableByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ReadableByteChannel.java,v
retrieving revision 1.4
diff -u -r1.4 ReadableByteChannel.java
--- java/nio/channels/ReadableByteChannel.java	12 Oct 2003 15:51:25 -0000	1.4
+++ java/nio/channels/ReadableByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,5 +1,5 @@
-/* ReadableByteChannel.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* ReadableByteChannel.java --
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,11 +40,16 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
+
 public interface ReadableByteChannel extends Channel
 {
   /**
    * Reads a sequence of bytes from this channel into the given buffer
    *
+   * @param dst the buffer to put the read data into
+   *
+   * @return the numer of bytes read
+   *
    * @exception AsynchronousCloseException If another thread closes this
    * channel while the read operation is in progress
    * @exception ClosedByInterruptException If another thread interrupts the
@@ -55,5 +60,5 @@
    * @exception NonReadableChannelException If this channel was not opened for
    * reading
    */
-  int read (ByteBuffer dst) throws IOException;
+  int read(ByteBuffer dst) throws IOException;
 }
Index: java/nio/channels/ScatteringByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ScatteringByteChannel.java,v
retrieving revision 1.5
diff -u -r1.5 ScatteringByteChannel.java
--- java/nio/channels/ScatteringByteChannel.java	12 Oct 2003 15:51:25 -0000	1.5
+++ java/nio/channels/ScatteringByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ScatteringByteChannel.java -- 
+/* ScatteringByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,11 +37,11 @@
 
 package java.nio.channels;
 
-import java.nio.ByteBuffer;
 import java.io.IOException;
+import java.nio.ByteBuffer;
+
 
-public interface ScatteringByteChannel
-  extends ReadableByteChannel
+public interface ScatteringByteChannel extends ReadableByteChannel
 {
   /**
    * Reads a sequence of bytes from this channel into a subsequence of the
@@ -59,7 +59,7 @@
    * @exception NonReadableChannelException If this channel was not opened for
    * reading
    */
-  long read (ByteBuffer[] srcs, int offset, int length)
+  long read(ByteBuffer[] srcs, int offset, int length)
     throws IOException;
 
   /**
@@ -75,5 +75,5 @@
    * @exception NonReadableChannelException If this channel was not opened for
    * reading
    */
-  long read (ByteBuffer[] srcs) throws IOException;
+  long read(ByteBuffer[] srcs) throws IOException;
 }
Index: java/nio/channels/SelectableChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/SelectableChannel.java,v
retrieving revision 1.6
diff -u -r1.6 SelectableChannel.java
--- java/nio/channels/SelectableChannel.java	21 Dec 2002 11:42:37 -0000	1.6
+++ java/nio/channels/SelectableChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* SelectableChannel.java -- 
+/* SelectableChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,62 +41,62 @@
 import java.nio.channels.spi.AbstractInterruptibleChannel;
 import java.nio.channels.spi.SelectorProvider;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
  */
-public abstract class SelectableChannel
-  extends AbstractInterruptibleChannel
+public abstract class SelectableChannel extends AbstractInterruptibleChannel
 {
   /**
    * Initializes the channel.
    */
-  protected SelectableChannel ()
+  protected SelectableChannel()
   {
   }
- 
+
   /**
    * Returns the lock of this channel.
    */
-  public abstract Object blockingLock ();
+  public abstract Object blockingLock();
 
   /**
    * Adjusts this channel's blocking mode.
-   * 
+   *
    * @exception ClosedChannelException If this channel is closed.
    * @exception IllegalBlockingModeException If block is true and this channel
    * is registered with one or more selectors.
    * @exception IOException If an error occurs.
    */
-  public abstract SelectableChannel configureBlocking (boolean block)
+  public abstract SelectableChannel configureBlocking(boolean block)
     throws IOException;
-  
+
   /**
    * Tells whether this channel is blocking or not.
    */
-  public abstract boolean isBlocking ();
-  
+  public abstract boolean isBlocking();
+
   /**
    * Tells whether or not this channel is currently registered with
    * any selectors.
    */
-  public abstract boolean isRegistered ();
-  
+  public abstract boolean isRegistered();
+
   /**
    * Retrieves the key representing the channel's registration with
    * the given selector.
    */
-  public abstract SelectionKey keyFor (Selector sel);
-  
+  public abstract SelectionKey keyFor(Selector sel);
+
   /**
    * Returns the provider that created this channel.
    */
-  public abstract SelectorProvider provider ();
-  
+  public abstract SelectorProvider provider();
+
   /**
    * Registers this channel with the given selector,
    * returning a selection key.
-   * 
+   *
    * @exception CancelledKeyException If this channel is currently registered
    * with the given selector but the corresponding key has already been cancelled
    * @exception ClosedChannelException If this channel is closed.
@@ -108,12 +108,12 @@
    * @exception IllegalSelectorException If this channel was not created by
    * the same provider as the given selector.
    */
-  public final SelectionKey register (Selector sel, int ops)
+  public final SelectionKey register(Selector sel, int ops)
     throws ClosedChannelException
   {
-    return register (sel, ops, null);
+    return register(sel, ops, null);
   }
-  
+
   /**
    * Registers this channel with the given selector,
    * returning a selection key.
@@ -130,9 +130,9 @@
    * @exception IllegalSelectorException If this channel was not created by
    * the same provider as the given selector.
    */
-  public abstract SelectionKey register (Selector sel, int ops, Object att)
+  public abstract SelectionKey register(Selector sel, int ops, Object att)
     throws ClosedChannelException;
-  
+
   /**
    * Returns a set of valid operations on this channel.
    */
Index: java/nio/channels/SelectionKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/SelectionKey.java,v
retrieving revision 1.6
diff -u -r1.6 SelectionKey.java
--- java/nio/channels/SelectionKey.java	21 Dec 2002 11:42:37 -0000	1.6
+++ java/nio/channels/SelectionKey.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* SelectionKey.java -- 
+/* SelectionKey.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,128 +37,128 @@
 
 package java.nio.channels;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
  */
 public abstract class SelectionKey
 {
-  public static final int OP_ACCEPT  = 16;
+  public static final int OP_ACCEPT = 16;
   public static final int OP_CONNECT = 8;
-  public static final int OP_READ    = 1;
-  public static final int OP_WRITE   = 4;
-    
+  public static final int OP_READ = 1;
+  public static final int OP_WRITE = 4;
   Object attached;
-   
+
   /**
    * Initializes the selection key.
    */
-  protected SelectionKey ()
+  protected SelectionKey()
   {
   }
 
   /**
    * Attaches obj to the key and returns the old attached object.
    */
-  public final Object attach (Object obj)
+  public final Object attach(Object obj)
   {
     Object old = attached;
     attached = obj;
     return old;
   }
-   
+
   /**
    * Returns the object attached to the key.
    */
-  public final Object attachment ()
+  public final Object attachment()
   {
     return attached;
-  }    
+  }
 
   /**
    * Tests if the channel attached to this key is ready to accept
    * a new socket connection.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isAcceptable ()
-  { 
-    return (readyOps () & OP_ACCEPT) != 0;
+  public final boolean isAcceptable()
+  {
+    return (readyOps() & OP_ACCEPT) != 0;
   }
 
   /**
    * Tests whether this key's channel has either finished,
    * or failed to finish, its socket-connection operation.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isConnectable ()
+  public final boolean isConnectable()
   {
-    return (readyOps () & OP_CONNECT) != 0;  
-  }        
-  
+    return (readyOps() & OP_CONNECT) != 0;
+  }
+
   /**
    * Tests if the channel attached to the key is readable.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isReadable ()
+  public final boolean isReadable()
   {
-    return (readyOps () & OP_READ) != 0; 
+    return (readyOps() & OP_READ) != 0;
   }
-  
+
   /**
    * Tests if the channel attached to the key is writable.
    *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isWritable ()
+  public final boolean isWritable()
   {
-    return (readyOps () & OP_WRITE) != 0;
+    return (readyOps() & OP_WRITE) != 0;
   }
 
   /**
    * Requests that the registration of this key's channel with
    * its selector be cancelled.
    */
-  public abstract void cancel (); 
- 
+  public abstract void cancel();
+
   /**
    * return the channel attached to the key.
    */
-  public abstract SelectableChannel channel ();
-  
+  public abstract SelectableChannel channel();
+
   /**
    * Returns the key's interest set.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public abstract int interestOps ();
-  
+  public abstract int interestOps();
+
   /**
    * Sets this key's interest set to the given value.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    * @exception IllegalArgumentException If a bit in the set does not
    * correspond to an operation that is supported by this key's channel,
    * that is, if set &amp; ~(channel().validOps()) != 0
    */
-  public abstract SelectionKey interestOps (int ops);
- 
+  public abstract SelectionKey interestOps(int ops);
+
   /**
    * Tells whether or not this key is valid.
    */
-  public abstract boolean isValid ();
- 
+  public abstract boolean isValid();
+
   /**
    * Retrieves this key's ready-operation set.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public abstract int readyOps ();
-  
+  public abstract int readyOps();
+
   /**
    * Returns the selector for which this key was created.
    */
-  public abstract Selector selector ();
+  public abstract Selector selector();
 }
Index: java/nio/channels/Selector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/Selector.java,v
retrieving revision 1.6
diff -u -r1.6 Selector.java
--- java/nio/channels/Selector.java	16 Nov 2002 15:22:16 -0000	1.6
+++ java/nio/channels/Selector.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* Selector.java -- 
+/* Selector.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,6 +41,7 @@
 import java.nio.channels.spi.SelectorProvider;
 import java.util.Set;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
@@ -53,81 +54,81 @@
   protected Selector()
   {
   }
- 
+
   /**
    * Opens a selector.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  public static Selector open () throws IOException
+  public static Selector open() throws IOException
   {
-    return SelectorProvider.provider ().openSelector ();
+    return SelectorProvider.provider().openSelector();
   }
 
   /**
    * Closes the selector.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  public abstract void close () throws IOException;
-  
+  public abstract void close() throws IOException;
+
   /**
    * Tells whether the selector is open or not.
    */
-  public abstract boolean isOpen ();
-  
+  public abstract boolean isOpen();
+
   /**
    * Returns this selector's key set.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    */
-  public abstract Set keys ();
- 
+  public abstract Set keys();
+
   /**
    * Returns the SelectorProvider that created the selector.
    */
-  public abstract SelectorProvider provider ();
-  
+  public abstract SelectorProvider provider();
+
   /**
    * Selects a set of keys whose corresponding channels are ready
    * for I/O operations.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    * @exception IOException If an error occurs
    */
-  public abstract int select () throws IOException;
-  
+  public abstract int select() throws IOException;
+
   /**
    * Selects a set of keys whose corresponding channels are ready
    * for I/O operations.
    *
    * @param timeout The timeout to use.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    * @exception IllegalArgumentException If the timeout value is negative.
    * @exception IOException If an error occurs
    */
-  public abstract int select (long timeout) throws IOException;
-  
+  public abstract int select(long timeout) throws IOException;
+
   /**
    * Returns this selector's selected-key set.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    */
-  public abstract Set selectedKeys ();
-  
+  public abstract Set selectedKeys();
+
   /**
    * Selects a set of keys whose corresponding channels are ready
    * for I/O operations.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    * @exception IOException If an error occurs
    */
-  public abstract int selectNow () throws IOException;
-  
+  public abstract int selectNow() throws IOException;
+
   /**
    * Causes the first selection operation that has not yet returned to
    * return immediately.
    */
-  public abstract Selector wakeup ();
+  public abstract Selector wakeup();
 }
Index: java/nio/channels/UnresolvedAddressException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/UnresolvedAddressException.java,v
retrieving revision 1.1
diff -u -r1.1 UnresolvedAddressException.java
--- java/nio/channels/UnresolvedAddressException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/UnresolvedAddressException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* UnresolvedAddressException.java -- 
+/* UnresolvedAddressException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/UnsupportedAddressTypeException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/UnsupportedAddressTypeException.java,v
retrieving revision 1.1
diff -u -r1.1 UnsupportedAddressTypeException.java
--- java/nio/channels/UnsupportedAddressTypeException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/UnsupportedAddressTypeException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* UnsupportedAddressTypeException.java -- 
+/* UnsupportedAddressTypeException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/WritableByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/WritableByteChannel.java,v
retrieving revision 1.6
diff -u -r1.6 WritableByteChannel.java
--- java/nio/channels/WritableByteChannel.java	12 Oct 2003 15:51:25 -0000	1.6
+++ java/nio/channels/WritableByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* WritableByteChannel.java -- 
+/* WritableByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,8 +40,8 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-public interface WritableByteChannel
-  extends Channel
+
+public interface WritableByteChannel extends Channel
 {
   /**
    * Writes a sequence of bytes to this channel from the given buffer
@@ -56,5 +56,5 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing
    */
-  int write (ByteBuffer src) throws IOException;
+  int write(ByteBuffer src) throws IOException;
 }
Index: java/nio/charset/spi/CharsetProvider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/charset/spi/CharsetProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CharsetProvider.java
--- java/nio/charset/spi/CharsetProvider.java	8 May 2002 07:53:54 -0000	1.1
+++ java/nio/charset/spi/CharsetProvider.java	8 Apr 2004 20:44:28 -0000
@@ -40,6 +40,7 @@
 import java.nio.charset.Charset;
 import java.util.Iterator;
 
+
 /**
  * This class allows an implementor to provide additional character sets. The
  * subclass must have a nullary constructor, and be attached to charset
@@ -81,6 +82,8 @@
 
   /**
    * Returns the named charset, by canonical name or alias.
+   *
+   * @param name the name of the character
    *
    * @return the charset, or null if not supported
    */