diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-25 13:04:58 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-09-25 13:04:58 +0000 |
| commit | aacbf61240f9b3abd13dbe031f296f87239acd89 (patch) | |
| tree | 4ce7006cedd97db2967f4a0be023311969c2d27e | |
| parent | d336327daf4a8ec3551dfdeaf81474a3ae05dbe6 (diff) | |
| download | ppe42-gcc-aacbf61240f9b3abd13dbe031f296f87239acd89.tar.gz ppe42-gcc-aacbf61240f9b3abd13dbe031f296f87239acd89.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57497 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 13 | ||||
| -rw-r--r-- | libjava/Makefile.am | 1 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/java/nio/channels/DatagramChannel.java | 3 | ||||
| -rw-r--r-- | libjava/java/nio/channels/ServerSocketChannel.java | 3 | ||||
| -rw-r--r-- | libjava/java/nio/channels/SocketChannel.java | 3 | ||||
| -rw-r--r-- | libjava/java/nio/channels/spi/AbstractSelectableChannel.java | 10 |
7 files changed, 35 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 50e8dd8bec8..c6507521501 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,18 @@ 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 (DatagramSocket): Exception documentation added. (bind): Exception documentation added, addded SecurityManager check, diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 4fd11df771e..7e55a78f731 100644 --- 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 c0bde3fb9a4..239aa371548 100644 --- 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 e1a0b1f85e5..74a26c64ec5 100644 --- 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 d033384066f..e5d95c1bfbb 100644 --- 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 857c3948537..05fc8a55f63 100644 --- 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 index 00000000000..99f7233f00b --- /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; + } +} + |
