diff options
| -rw-r--r-- | libjava/ChangeLog | 14 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/DatagramChannelImpl.java | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/NIODatagramSocket.java | 2 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/NIOSocket.java | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/SocketChannelImpl.java | 6 |
5 files changed, 21 insertions, 7 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 79a8911..ee61300 100644 --- 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 b2dcd32..a77355d 100644 --- 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 6c44c9d..ff71c80 100644 --- 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 ba98073..7f955c3 100644 --- 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 0478e32..ae7af3c 100644 --- 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 |