From 466faef4dc1e0940aa25ca5919821e14df27b6ac Mon Sep 17 00:00:00 2001 From: mkoch Date: Sat, 22 Nov 2003 15:13:01 +0000 Subject: 2003-11-22 Michael Koch * 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(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73840 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/nio/DatagramChannelImpl.java | 2 +- libjava/gnu/java/nio/NIODatagramSocket.java | 2 +- libjava/gnu/java/nio/NIOSocket.java | 4 ++-- libjava/gnu/java/nio/SocketChannelImpl.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/nio/DatagramChannelImpl.java b/libjava/gnu/java/nio/DatagramChannelImpl.java index b2dcd3242dd..a77355d0ff8 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 6c44c9dcb82..ff71c80b71b 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 ba9807396be..7f955c3acee 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 0478e32ea99..ae7af3c5908 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 -- cgit v1.2.3