[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath

[Kaffe CVS]

PatchSet 4182 
Date: 2003/12/03 20:09:32
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath

Members: 
	ChangeLog:1.1773->1.1774 
	libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.4->1.5 
	libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.1->1.2 
	libraries/javalib/gnu/java/nio/NIOSocket.java:1.2->1.3 
	libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1773 kaffe/ChangeLog:1.1774
--- kaffe/ChangeLog:1.1773	Wed Dec  3 19:57:13 2003
+++ kaffe/ChangeLog	Wed Dec  3 20:09:32 2003
@@ -1,5 +1,27 @@
 2003-12-03  Dalibor Topic <robilad at kaffe.org>
 
+	* libraries/javalib/gnu/java/nio/DatagramChannelImpl.java,
+	libraries/javalib/gnu/java/nio/NIODatagramSocket.java,
+	libraries/javalib/gnu/java/nio/NIOSocket.java,
+	libraries/javalib/gnu/java/nio/SocketChannelImpl.java:
+	Resynced with GNU Classpath.
+
+	2003-11-26  Michael Koch  <konqueror at 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-12-03  Dalibor Topic <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/lang/reflect/TypeSignature.java:
 	Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.4 kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.5
--- kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java:1.4	Sun Sep 28 19:54:09 2003
+++ kaffe/libraries/javalib/gnu/java/nio/DatagramChannelImpl.java	Wed Dec  3 20:09:33 2003
@@ -67,7 +67,7 @@
 
   public int getNativeFD()
   {
-    return socket.getImpl().getNativeFD();
+    return socket.getPlainDatagramSocketImpl().getNativeFD();
   }
     
   public DatagramSocket socket ()
Index: kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java
diff -u kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.1 kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java:1.1	Sun Sep 28 19:54:10 2003
+++ kaffe/libraries/javalib/gnu/java/nio/NIODatagramSocket.java	Wed Dec  3 20:09:33 2003
@@ -59,7 +59,7 @@
     this.channel = channel;
   }
 
-  public final PlainDatagramSocketImpl getImpl()
+  public final PlainDatagramSocketImpl getPlainDatagramSocketImpl()
   {
     return impl;
   }
Index: kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java
diff -u kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java:1.2 kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java:1.3
--- kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java:1.2	Wed Oct 22 10:34:47 2003
+++ kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java	Wed Dec  3 20:09:34 2003
@@ -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: kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.8 kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.9
--- kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.8	Sat Oct 25 18:30:22 2003
+++ kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java	Wed Dec  3 20:09:34 2003
@@ -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