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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 79a891105fb744f0441a6dfe5dc5dd9ef608c05b..ee613000a85b26de232f1a4be925a63a355328e4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,17 @@
+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.

diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.java b/libjava/gnu/java/nio/DatagramChannelImpl.java
index b2dcd3242dd436575cdbe91c3dc243f006a27cf9..a77355d0ff8bd22076ae8ffe68a1dad67eadb07d 100644 (file)
--- a/libjava/gnu/java/nio/DatagramChannelImpl.java
+++ b/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 ()

diff --git a/libjava/gnu/java/nio/NIODatagramSocket.java b/libjava/gnu/java/nio/NIODatagramSocket.java
index 6c44c9dcb82ad5342de5b3b06a864001b3450270..ff71c80b71bb3093efef35c88f356bdbceec6c6e 100644 (file)
--- a/libjava/gnu/java/nio/NIODatagramSocket.java
+++ b/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;
   }

diff --git a/libjava/gnu/java/nio/NIOSocket.java b/libjava/gnu/java/nio/NIOSocket.java
index ba9807396be1e0d3c32d4b2a968b724b8ca13e27..7f955c3acee3ae08d81ede6b57d1dfbf3371c591 100644 (file)
--- a/libjava/gnu/java/nio/NIOSocket.java
+++ b/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;
   }
   

diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java
index 0478e32ea99e4ca54c247a0c515f1c08fda43ab2..ae7af3c5908e7e44d8bebad0dd4147dbca57f4fb 100644 (file)
--- a/libjava/gnu/java/nio/SocketChannelImpl.java
+++ b/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