This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: gnu.java.nio
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sat, 22 Nov 2003 17:28:58 +0100
- Subject: FYI: Patch: gnu.java.nio
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to rename some methods to circumvent
problems with java.net.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
iD8DBQE/v47NWSOgCCdjSDsRAi9gAJ9srAFnZl27Zp0qtx6qYUB7DBNeGwCdFRkk
rZ1NEeieMDo0Uoppejk/Vkw=
=pKcn
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2350
diff -u -b -B -r1.2350 ChangeLog
--- ChangeLog 22 Nov 2003 00:03:35 -0000 1.2350
+++ ChangeLog 22 Nov 2003 15:12:16 -0000
@@ -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.
Index: gnu/java/nio/DatagramChannelImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/DatagramChannelImpl.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DatagramChannelImpl.java
--- gnu/java/nio/DatagramChannelImpl.java 25 Sep 2003 21:14:43 -0000 1.5
+++ gnu/java/nio/DatagramChannelImpl.java 22 Nov 2003 15:12:16 -0000
@@ -67,7 +67,7 @@
public int getNativeFD()
{
- return socket.getImpl().getNativeFD();
+ return socket.getPlainDatagramSocketImpl().getNativeFD();
}
public DatagramSocket socket ()
Index: gnu/java/nio/NIODatagramSocket.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/NIODatagramSocket.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 NIODatagramSocket.java
--- gnu/java/nio/NIODatagramSocket.java 19 Sep 2003 21:12:58 -0000 1.1
+++ gnu/java/nio/NIODatagramSocket.java 22 Nov 2003 15:12:16 -0000
@@ -59,7 +59,7 @@
this.channel = channel;
}
- public final PlainDatagramSocketImpl getImpl()
+ public final PlainDatagramSocketImpl getPlainDatagramSocketImpl()
{
return impl;
}
Index: gnu/java/nio/NIOSocket.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/NIOSocket.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 NIOSocket.java
--- gnu/java/nio/NIOSocket.java 11 Oct 2003 18:01:35 -0000 1.2
+++ gnu/java/nio/NIOSocket.java 22 Nov 2003 15:12:16 -0000
@@ -59,14 +59,14 @@
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;
}
Index: gnu/java/nio/SocketChannelImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/SocketChannelImpl.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 SocketChannelImpl.java
--- gnu/java/nio/SocketChannelImpl.java 11 Oct 2003 18:01:35 -0000 1.11
+++ gnu/java/nio/SocketChannelImpl.java 22 Nov 2003 15:12:16 -0000
@@ -81,7 +81,7 @@
throws IOException
{
super (provider);
- this.impl = socket.getImpl();
+ this.impl = socket.getPlainSocketImpl();
this.socket = socket;
}
@@ -99,14 +99,14 @@
}
}
- PlainSocketImpl getImpl()
+ PlainSocketImpl getPlainSocketImpl()
{
return impl;
}
int getNativeFD()
{
- return socket.getImpl().getNativeFD();
+ return socket.getPlainSocketImpl().getNativeFD();
}
protected void implCloseSelectableChannel () throws IOException