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

	* gnu/java/nio/DatagramChannelImpl.java
	(getNativeFD): Use getPlainDatagramSocketImpl().
	* gnu/java/nio/NIODatagramSocket.java
	(getPlainDatagramSocketImpl): Renamed from getImpl().
	* gnu/java/nio/NIOSocket.java
	(getPlainSocketImpl): Renamed from getImpl().
	(setChannel): Use getPlainSocketImpl().
	* gnu/java/nio/SocketChannelImpl.java
	(SocketChannelImpl): Use getPlainSocketImpl().
	(getPlainSocketImpl): Renamed from getImpl().
	(getNativeFD): Use getPlainSocketImpl().

From-SVN: r73840

libjava/ChangeLog

+2003-11-22  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/nio/DatagramChannelImpl.java
+	(getNativeFD): Use getPlainDatagramSocketImpl().
+	* gnu/java/nio/NIODatagramSocket.java
+	(getPlainDatagramSocketImpl): Renamed from getImpl().
+	* gnu/java/nio/NIOSocket.java
+	(getPlainSocketImpl): Renamed from getImpl().
+	(setChannel): Use getPlainSocketImpl().
+	* gnu/java/nio/SocketChannelImpl.java
+	(SocketChannelImpl): Use getPlainSocketImpl().
+	(getPlainSocketImpl): Renamed from getImpl().
+	(getNativeFD): Use getPlainSocketImpl().
+
 2003-11-18  Graydon Hoare  <graydon@redhat.com>
 
 	* javax/swing/JLayeredPane.java: Implement.

libjava/gnu/java/nio/DatagramChannelImpl.java

@@ -67,7 +67,7 @@ public final class DatagramChannelImpl extends DatagramChannel
 
   public int getNativeFD()
   {
-    return socket.getImpl().getNativeFD();
+    return socket.getPlainDatagramSocketImpl().getNativeFD();
   }
     
   public DatagramSocket socket ()

libjava/gnu/java/nio/NIODatagramSocket.java

@@ -59,7 +59,7 @@ public final class NIODatagramSocket extends DatagramSocket
     this.channel = channel;
   }
 
-  public final PlainDatagramSocketImpl getImpl()
+  public final PlainDatagramSocketImpl getPlainDatagramSocketImpl()
   {
     return impl;
   }

libjava/gnu/java/nio/NIOSocket.java

@@ -59,14 +59,14 @@ public final class NIOSocket extends Socket
     this.channel = channel;
   }
 
-  public final PlainSocketImpl getImpl()
+  public final PlainSocketImpl getPlainSocketImpl()
   {
     return impl;
   }
 
   final void setChannel (SocketChannelImpl channel)
   {
-    this.impl = channel.getImpl();
+    this.impl = channel.getPlainSocketImpl();
     this.channel = channel;
   }
   

libjava/gnu/java/nio/SocketChannelImpl.java

@@ -81,7 +81,7 @@ public final class SocketChannelImpl extends SocketChannel
     throws IOException
   {
     super (provider);
-    this.impl = socket.getImpl();
+    this.impl = socket.getPlainSocketImpl();
     this.socket = socket;
   }
 
@@ -99,14 +99,14 @@ public final class SocketChannelImpl extends SocketChannel
       }
   }
 
-  PlainSocketImpl getImpl()
+  PlainSocketImpl getPlainSocketImpl()
   {
     return impl;
   }
 
   int getNativeFD()
   {
-    return socket.getImpl().getNativeFD();
+    return socket.getPlainSocketImpl().getNativeFD();
   }
 
   protected void implCloseSelectableChannel () throws IOException