2004-04-20 Michael Koch <konqueror@gmx.de>

	* java/nio/ByteBufferImpl.java,
	java/nio/CharBufferImpl.java,
	java/nio/DirectByteBufferImpl.java,
	java/nio/DoubleBufferImpl.java,
	java/nio/DoubleViewBufferImpl.java,
	java/nio/FloatBufferImpl.java,
	java/nio/FloatViewBufferImpl.java,
	java/nio/IntBufferImpl.java,
	java/nio/IntViewBufferImpl.java,
	java/nio/LongBufferImpl.java,
	java/nio/LongViewBufferImpl.java,
	java/nio/MappedByteBufferImpl.java,
	java/nio/ShortBufferImpl.java,
	java/nio/ShortViewBufferImpl.java:
	Made sure all classes are final and removed final keyword from all
	methods.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@80907 138bc75d-0d04-0410-961f-82ee72b054a4

15 files changed, 133 insertions, 115 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e53db66f8ba..b57c3fbbd79 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,24 @@
 2004-04-20  Michael Koch  <konqueror@gmx.de>
 
+	* java/nio/ByteBufferImpl.java,
+	java/nio/CharBufferImpl.java,
+	java/nio/DirectByteBufferImpl.java,
+	java/nio/DoubleBufferImpl.java,
+	java/nio/DoubleViewBufferImpl.java,
+	java/nio/FloatBufferImpl.java,
+	java/nio/FloatViewBufferImpl.java,
+	java/nio/IntBufferImpl.java,
+	java/nio/IntViewBufferImpl.java,
+	java/nio/LongBufferImpl.java,
+	java/nio/LongViewBufferImpl.java,
+	java/nio/MappedByteBufferImpl.java,
+	java/nio/ShortBufferImpl.java,
+	java/nio/ShortViewBufferImpl.java:
+	Made sure all classes are final and removed final keyword from all
+	methods.
+
+2004-04-20  Michael Koch  <konqueror@gmx.de>
+
 	* java/rmi/MarshalledObject.java,
 	java/rmi/Naming.java,
 	java/rmi/RemoteException.java,
diff --git a/libjava/java/nio/ByteBufferImpl.java b/libjava/java/nio/ByteBufferImpl.java
index 5d3c3d31a86..f79ae630acb 100644
--- a/libjava/java/nio/ByteBufferImpl.java
+++ b/libjava/java/nio/ByteBufferImpl.java
@@ -131,7 +131,7 @@ final class ByteBufferImpl extends ByteBuffer
   /**
    * 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 @@ final class ByteBufferImpl extends ByteBuffer
    * 
    * @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 @@ final class ByteBufferImpl extends ByteBuffer
    * @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 @@ final class ByteBufferImpl extends ByteBuffer
    * 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 @@ final class ByteBufferImpl extends ByteBuffer
     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;
diff --git a/libjava/java/nio/CharBufferImpl.java b/libjava/java/nio/CharBufferImpl.java
index aacc2cb2658..1a8dff1d07c 100644
--- a/libjava/java/nio/CharBufferImpl.java
+++ b/libjava/java/nio/CharBufferImpl.java
@@ -104,7 +104,7 @@ final class CharBufferImpl extends CharBuffer
     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 @@ final class CharBufferImpl extends CharBuffer
   /**
    * 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 @@ final class CharBufferImpl extends CharBuffer
    * 
    * @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 @@ final class CharBufferImpl extends CharBuffer
    * @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 @@ final class CharBufferImpl extends CharBuffer
    * 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 @@ final class CharBufferImpl extends CharBuffer
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
diff --git a/libjava/java/nio/DirectByteBufferImpl.java b/libjava/java/nio/DirectByteBufferImpl.java
index ef88d34a701..7c2b783d7d8 100644
--- a/libjava/java/nio/DirectByteBufferImpl.java
+++ b/libjava/java/nio/DirectByteBufferImpl.java
@@ -41,7 +41,7 @@ package java.nio;
 import gnu.classpath.Configuration;
 import gnu.gcj.RawData;
 
-class DirectByteBufferImpl extends ByteBuffer
+final class DirectByteBufferImpl extends ByteBuffer
 {
   static
   {
@@ -229,133 +229,133 @@ class DirectByteBufferImpl extends ByteBuffer
     return new DoubleViewBufferImpl (this, remaining() >> 3);
   }
 
-  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;
diff --git a/libjava/java/nio/DoubleBufferImpl.java b/libjava/java/nio/DoubleBufferImpl.java
index 2c425dceb30..81fde6db6e6 100644
--- a/libjava/java/nio/DoubleBufferImpl.java
+++ b/libjava/java/nio/DoubleBufferImpl.java
@@ -100,7 +100,7 @@ final class DoubleBufferImpl extends DoubleBuffer
   /**
    * 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 @@ final class DoubleBufferImpl extends DoubleBuffer
    * 
    * @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 @@ final class DoubleBufferImpl extends DoubleBuffer
    * @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 @@ final class DoubleBufferImpl extends DoubleBuffer
    * 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 @@ final class DoubleBufferImpl extends DoubleBuffer
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
diff --git a/libjava/java/nio/DoubleViewBufferImpl.java b/libjava/java/nio/DoubleViewBufferImpl.java
index 7df2f509b58..7b04e4ca108 100644
--- a/libjava/java/nio/DoubleViewBufferImpl.java
+++ b/libjava/java/nio/DoubleViewBufferImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 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;
diff --git a/libjava/java/nio/FloatBufferImpl.java b/libjava/java/nio/FloatBufferImpl.java
index 06584132499..47479845da6 100644
--- a/libjava/java/nio/FloatBufferImpl.java
+++ b/libjava/java/nio/FloatBufferImpl.java
@@ -100,7 +100,7 @@ final class FloatBufferImpl extends FloatBuffer
   /**
    * 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 @@ final class FloatBufferImpl extends FloatBuffer
    * 
    * @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 @@ final class FloatBufferImpl extends FloatBuffer
    * @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 @@ final class FloatBufferImpl extends FloatBuffer
    * 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 @@ final class FloatBufferImpl extends FloatBuffer
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
diff --git a/libjava/java/nio/FloatViewBufferImpl.java b/libjava/java/nio/FloatViewBufferImpl.java
index c4caf9bf322..08c59097d37 100644
--- a/libjava/java/nio/FloatViewBufferImpl.java
+++ b/libjava/java/nio/FloatViewBufferImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 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;
diff --git a/libjava/java/nio/IntBufferImpl.java b/libjava/java/nio/IntBufferImpl.java
index f142827104a..a491c1105c4 100644
--- a/libjava/java/nio/IntBufferImpl.java
+++ b/libjava/java/nio/IntBufferImpl.java
@@ -100,7 +100,7 @@ final class IntBufferImpl extends IntBuffer
   /**
    * 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 @@ final class IntBufferImpl extends IntBuffer
    * 
    * @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 @@ final class IntBufferImpl extends IntBuffer
    * @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 @@ final class IntBufferImpl extends IntBuffer
    * 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 @@ final class IntBufferImpl extends IntBuffer
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
diff --git a/libjava/java/nio/IntViewBufferImpl.java b/libjava/java/nio/IntViewBufferImpl.java
index 3c8e8e61ca2..074953793be 100644
--- a/libjava/java/nio/IntViewBufferImpl.java
+++ b/libjava/java/nio/IntViewBufferImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 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;
diff --git a/libjava/java/nio/LongBufferImpl.java b/libjava/java/nio/LongBufferImpl.java
index 7f99f336686..88a9d8c5415 100644
--- a/libjava/java/nio/LongBufferImpl.java
+++ b/libjava/java/nio/LongBufferImpl.java
@@ -100,7 +100,7 @@ final class LongBufferImpl extends LongBuffer
   /**
    * 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 @@ final class LongBufferImpl extends LongBuffer
    * 
    * @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 @@ final class LongBufferImpl extends LongBuffer
    * @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 @@ final class LongBufferImpl extends LongBuffer
    * 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 @@ final class LongBufferImpl extends LongBuffer
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
diff --git a/libjava/java/nio/LongViewBufferImpl.java b/libjava/java/nio/LongViewBufferImpl.java
index 9765de9cd0f..d1dd060d311 100644
--- a/libjava/java/nio/LongViewBufferImpl.java
+++ b/libjava/java/nio/LongViewBufferImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 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;
diff --git a/libjava/java/nio/MappedByteBufferImpl.java b/libjava/java/nio/MappedByteBufferImpl.java
index 52996c23df4..ccd987edfbd 100644
--- a/libjava/java/nio/MappedByteBufferImpl.java
+++ b/libjava/java/nio/MappedByteBufferImpl.java
@@ -39,10 +39,9 @@ exception statement from your version. */
 package java.nio;
 
 import java.io.IOException;
-import gnu.java.nio.channels.FileChannelImpl;
 import gnu.gcj.RawData;
 
-class MappedByteBufferImpl extends MappedByteBuffer
+final class MappedByteBufferImpl extends MappedByteBuffer
 {
   boolean readOnly;
   RawData address;
@@ -201,133 +200,133 @@ class MappedByteBufferImpl extends MappedByteBuffer
     return new DoubleViewBufferImpl (this, remaining() >> 3);
   }
 
-  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;
diff --git a/libjava/java/nio/ShortBufferImpl.java b/libjava/java/nio/ShortBufferImpl.java
index 938d5ce89d3..6871f096e9d 100644
--- a/libjava/java/nio/ShortBufferImpl.java
+++ b/libjava/java/nio/ShortBufferImpl.java
@@ -100,7 +100,7 @@ final class ShortBufferImpl extends ShortBuffer
   /**
    * 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 @@ final class ShortBufferImpl extends ShortBuffer
    * 
    * @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 @@ final class ShortBufferImpl extends ShortBuffer
    * @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 @@ final class ShortBufferImpl extends ShortBuffer
    * 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 @@ final class ShortBufferImpl extends ShortBuffer
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
diff --git a/libjava/java/nio/ShortViewBufferImpl.java b/libjava/java/nio/ShortViewBufferImpl.java
index 04d778578b0..26aabad519c 100644
--- a/libjava/java/nio/ShortViewBufferImpl.java
+++ b/libjava/java/nio/ShortViewBufferImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 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;