2003-06-11 Michael Koch <konqueror@gmx.de>

	* java/nio/ByteBuffer.java,
	java/nio/CharBuffer.java,
	java/nio/DoubleBuffer.java,
	java/nio/FloatBuffer.java,
	java/nio/IntBuffer.java,
	java/nio/LongBuffer.java,
	java/nio/MappedByteBuffer.java,
	java/nio/ShortBuffer.java,
	java/nio/channels/Channels.java,
	java/nio/channels/ServerSocketChannel.java,
	java/nio/channels/spi/AbstractSelector.java:
	New versions from libgcj.

11 files changed, 10 insertions, 12 deletions

diff --git a/java/nio/ByteBuffer.java b/java/nio/ByteBuffer.java
index 6c3546984..1727b4100 100644
--- a/java/nio/ByteBuffer.java
+++ b/java/nio/ByteBuffer.java
@@ -49,7 +49,7 @@ public abstract class ByteBuffer extends Buffer
   int array_offset;
   byte[] backing_buffer;
 
-  protected ByteBuffer (int capacity, int limit, int position, int mark)
+  ByteBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
     array_offset = 0;
diff --git a/java/nio/CharBuffer.java b/java/nio/CharBuffer.java
index d1ffa2192..15a535709 100644
--- a/java/nio/CharBuffer.java
+++ b/java/nio/CharBuffer.java
@@ -47,7 +47,7 @@ public abstract class CharBuffer extends Buffer
   int array_offset;
   char[] backing_buffer;
 
-  protected CharBuffer (int capacity, int limit, int position, int mark)
+  CharBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
     array_offset = 0;
diff --git a/java/nio/DoubleBuffer.java b/java/nio/DoubleBuffer.java
index 66e60e5b9..644f33ba6 100644
--- a/java/nio/DoubleBuffer.java
+++ b/java/nio/DoubleBuffer.java
@@ -47,7 +47,7 @@ public abstract class DoubleBuffer extends Buffer
   int array_offset;
   double[] backing_buffer;
 
-  protected DoubleBuffer (int capacity, int limit, int position, int mark)
+  DoubleBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
     array_offset = 0;
diff --git a/java/nio/FloatBuffer.java b/java/nio/FloatBuffer.java
index 7eb765b00..5fcfc8e6e 100644
--- a/java/nio/FloatBuffer.java
+++ b/java/nio/FloatBuffer.java
@@ -47,7 +47,7 @@ public abstract class FloatBuffer extends Buffer
   int array_offset;
   float[] backing_buffer;
 
-  protected FloatBuffer (int capacity, int limit, int position, int mark)
+  FloatBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
     array_offset = 0;
diff --git a/java/nio/IntBuffer.java b/java/nio/IntBuffer.java
index f6c3252ba..791678595 100644
--- a/java/nio/IntBuffer.java
+++ b/java/nio/IntBuffer.java
@@ -47,7 +47,7 @@ public abstract class IntBuffer extends Buffer
   int array_offset;
   int[] backing_buffer;
 
-  protected IntBuffer (int capacity, int limit, int position, int mark)
+  IntBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
     array_offset = 0;
diff --git a/java/nio/LongBuffer.java b/java/nio/LongBuffer.java
index 67f390688..a39a83d94 100644
--- a/java/nio/LongBuffer.java
+++ b/java/nio/LongBuffer.java
@@ -47,7 +47,7 @@ public abstract class LongBuffer extends Buffer
   int array_offset;
   long[] backing_buffer;
 
-  protected LongBuffer (int capacity, int limit, int position, int mark)
+  LongBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
     array_offset = 0;
diff --git a/java/nio/MappedByteBuffer.java b/java/nio/MappedByteBuffer.java
index 6dba50854..87500e766 100644
--- a/java/nio/MappedByteBuffer.java
+++ b/java/nio/MappedByteBuffer.java
@@ -44,7 +44,7 @@ package java.nio;
  */
 public abstract class MappedByteBuffer extends ByteBuffer
 {
-  protected MappedByteBuffer (int capacity, int limit, int position, int mark)
+  MappedByteBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
   }
diff --git a/java/nio/ShortBuffer.java b/java/nio/ShortBuffer.java
index 25a1f220c..6bd3de9c7 100644
--- a/java/nio/ShortBuffer.java
+++ b/java/nio/ShortBuffer.java
@@ -47,7 +47,7 @@ public abstract class ShortBuffer extends Buffer
   int array_offset;
   short[] backing_buffer;
 
-  protected ShortBuffer (int capacity, int limit, int position, int mark)
+  ShortBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
     array_offset = 0;
diff --git a/java/nio/channels/Channels.java b/java/nio/channels/Channels.java
index d911b41d0..98fc2b6f8 100644
--- a/java/nio/channels/Channels.java
+++ b/java/nio/channels/Channels.java
@@ -41,7 +41,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
-import java.nio.channels.WritableByteChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
diff --git a/java/nio/channels/ServerSocketChannel.java b/java/nio/channels/ServerSocketChannel.java
index e41af2126..278700776 100644
--- a/java/nio/channels/ServerSocketChannel.java
+++ b/java/nio/channels/ServerSocketChannel.java
@@ -35,12 +35,11 @@ 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.nio.channels;
 
 import java.nio.channels.spi.AbstractSelectableChannel;
 import java.nio.channels.spi.SelectorProvider;
-import java.nio.ByteOrder;
-import java.nio.ByteBuffer;
 import java.io.IOException;
 import java.net.ServerSocket;
 
diff --git a/java/nio/channels/spi/AbstractSelector.java b/java/nio/channels/spi/AbstractSelector.java
index fc0aeca32..160cdc003 100644
--- a/java/nio/channels/spi/AbstractSelector.java
+++ b/java/nio/channels/spi/AbstractSelector.java
@@ -35,12 +35,12 @@ 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.nio.channels.spi;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
-import java.util.List;
 import java.util.Set;
 
 public abstract class AbstractSelector extends Selector