OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Michael Koch 2003-11-22 15:13:01 +00:00 committed by Michael Koch
parent 249083758d
commit d3f010ec28
5 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libjava/ChangeLog
View File

@ -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.

2
libjava/gnu/java/nio/DatagramChannelImpl.java
View File

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

2
libjava/gnu/java/nio/NIODatagramSocket.java
View File

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

4
libjava/gnu/java/nio/NIOSocket.java
View File

@ -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;
}

6
libjava/gnu/java/nio/SocketChannelImpl.java
View File

@ -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