diff options
author | Michael Koch <konqueror@gmx.de> | 2003-11-26 20:47:05 +0000 |
---|---|---|
committer | Michael Koch <konqueror@gmx.de> | 2003-11-26 20:47:05 +0000 |
commit | cdaaaefa05a0418c59278fc3d727458cab28a6a4 (patch) | |
tree | caa0f8785d0850d4732f3a796e22c2dabfffd521 /gnu/java/nio | |
parent | cc750f2fdb0ecad81831d1ee0ceaa93621af42de (diff) | |
download | classpath-cdaaaefa05a0418c59278fc3d727458cab28a6a4.tar.gz |
2003-11-26 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().
Diffstat (limited to 'gnu/java/nio')
-rw-r--r-- | gnu/java/nio/DatagramChannelImpl.java | 2 | ||||
-rw-r--r-- | gnu/java/nio/NIODatagramSocket.java | 2 | ||||
-rw-r--r-- | gnu/java/nio/NIOSocket.java | 4 | ||||
-rw-r--r-- | gnu/java/nio/SocketChannelImpl.java | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/gnu/java/nio/DatagramChannelImpl.java b/gnu/java/nio/DatagramChannelImpl.java index b2dcd3242..a77355d0f 100644 --- a/gnu/java/nio/DatagramChannelImpl.java +++ b/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/gnu/java/nio/NIODatagramSocket.java b/gnu/java/nio/NIODatagramSocket.java index 6c44c9dcb..ff71c80b7 100644 --- a/gnu/java/nio/NIODatagramSocket.java +++ b/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/gnu/java/nio/NIOSocket.java b/gnu/java/nio/NIOSocket.java index ba9807396..7f955c3ac 100644 --- a/gnu/java/nio/NIOSocket.java +++ b/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/gnu/java/nio/SocketChannelImpl.java b/gnu/java/nio/SocketChannelImpl.java index 0478e32ea..ae7af3c59 100644 --- a/gnu/java/nio/SocketChannelImpl.java +++ b/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 |