AbstractSelectableChannel.java: New file.

2002-09-25  Michael Koch  <konqueror@gmx.de>

	* java/nio/channels/spi/AbstractSelectableChannel.java: New file.
	* java/nio/channels/DatagramChannel.java:
	extends AbstractSelectableChannel
	* java/nio/channels/ServerSocketChannel.java:
	extends AbstractSelectableChannel
	* java/nio/channels/SocketChannel.java:
	extends AbstractSelectableChannel
	* Makefile.am (ordinary_java_source_files):
	java/nio/channels/spi/AbstractSelectableChannel.java added.
	* Makefile.in: Regenerated.

	This commit fixes the CVS build problems, Sorry for the trouble.

From-SVN: r57497

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 50e8dd8bec81f90666dad67efc3587e326e934ee..c6507521501b3e87aa87da1c18e8ced342cec82a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2002-09-25  Michael Koch  <konqueror@gmx.de>
+
+       * java/nio/channels/spi/AbstractSelectableChannel.java: New file.
+       * java/nio/channels/DatagramChannel.java:
+       extends AbstractSelectableChannel
+       * java/nio/channels/ServerSocketChannel.java:
+       extends AbstractSelectableChannel
+       * java/nio/channels/SocketChannel.java:
+       extends AbstractSelectableChannel
+       * Makefile.am (ordinary_java_source_files):
+       java/nio/channels/spi/AbstractSelectableChannel.java added.
+       * Makefile.in: Regenerated.
+
 2002-09-25  Michael Koch  <konqueror@gmx.de>
 
        * java/net/DatagramSocket.java

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 4fd11df771e50c6f6baff5bd08a127f3574a5a42..7e55a78f73162f43037cfb52a2a40ac69badda3a 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -1927,6 +1927,7 @@ java/nio/channels/DatagramChannel.java \
 java/nio/channels/IllegalBlockingModeException.java \
 java/nio/channels/ServerSocketChannel.java \
 java/nio/channels/SocketChannel.java \
+java/nio/channels/spi/AbstractSelectableChannel.java \
 java/security/AccessControlContext.java \
 java/security/AccessControlException.java \
 java/security/AccessController.java \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index c0bde3fb9a49dfba30296e9599a81fa4817eac04..239aa371548659cefac75bdffe2dce42ba12b325 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1689,6 +1689,7 @@ java/nio/channels/DatagramChannel.java \
 java/nio/channels/IllegalBlockingModeException.java \
 java/nio/channels/ServerSocketChannel.java \
 java/nio/channels/SocketChannel.java \
+java/nio/channels/spi/AbstractSelectableChannel.java \
 java/security/AccessControlContext.java \
 java/security/AccessControlException.java \
 java/security/AccessController.java \
@@ -2906,6 +2907,7 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/nio/channels/IllegalBlockingModeException.P \
 .deps/java/nio/channels/ServerSocketChannel.P \
 .deps/java/nio/channels/SocketChannel.P \
+.deps/java/nio/channels/spi/AbstractSelectableChannel.P \
 .deps/java/rmi/AccessException.P .deps/java/rmi/AlreadyBoundException.P \
 .deps/java/rmi/ConnectException.P .deps/java/rmi/ConnectIOException.P \
 .deps/java/rmi/MarshalException.P .deps/java/rmi/MarshalledObject.P \

diff --git a/libjava/java/nio/channels/DatagramChannel.java b/libjava/java/nio/channels/DatagramChannel.java
index e1a0b1f85e5213237b5b1e43099fa543ca270d29..74a26c64ec5c05fcc28d535329ef0176dc6271aa 100644 (file)
--- a/libjava/java/nio/channels/DatagramChannel.java
+++ b/libjava/java/nio/channels/DatagramChannel.java
@@ -37,7 +37,10 @@ exception statement from your version. */
 
 package java.nio.channels;
 
+import java.nio.channels.spi.AbstractSelectableChannel;
+
 public class DatagramChannel
+  extends AbstractSelectableChannel
 {
 }
 

diff --git a/libjava/java/nio/channels/ServerSocketChannel.java b/libjava/java/nio/channels/ServerSocketChannel.java
index d033384066f0ce39f2ed0e011e7400e4df4209b0..e5d95c1bfbb0ef8ed56c443af30e3480fd0eff82 100644 (file)
--- a/libjava/java/nio/channels/ServerSocketChannel.java
+++ b/libjava/java/nio/channels/ServerSocketChannel.java
@@ -37,6 +37,9 @@ exception statement from your version. */
 
 package java.nio.channels;
 
+import java.nio.channels.spi.AbstractSelectableChannel;
+
 public class ServerSocketChannel
+  extends AbstractSelectableChannel
 {
 }

diff --git a/libjava/java/nio/channels/SocketChannel.java b/libjava/java/nio/channels/SocketChannel.java
index 857c39485372838960b6a7b1a25a158c5b4f698d..05fc8a55f63f1b9ec8adfe9c51a7b79c84f98733 100644 (file)
--- a/libjava/java/nio/channels/SocketChannel.java
+++ b/libjava/java/nio/channels/SocketChannel.java
@@ -37,6 +37,9 @@ exception statement from your version. */
 
 package java.nio.channels;
 
+import java.nio.channels.spi.AbstractSelectableChannel;
+
 public class SocketChannel
+  extends AbstractSelectableChannel
 {
 }

diff --git a/libjava/java/nio/channels/spi/AbstractSelectableChannel.java b/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
new file mode 100644 (file)
index 0000000..99f7233
--- /dev/null
+++ b/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
@@ -0,0 +1,10 @@
+package java.nio.channels.spi;
+
+public abstract class AbstractSelectableChannel
+{
+  public final boolean isBlocking()
+  {
+    return true;
+  }
+}
+