From: mkoch Date: Fri, 19 Dec 2003 16:31:59 +0000 (+0000) Subject: 2003-12-19 Michael Koch X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=a032d46b86cb7e0bac9d83c4d7a1432cdbfdbbc7 2003-12-19 Michael Koch * gnu/java/nio/OutputStreamChannel.java: New file. * java/nio/channels/Channels.java (newChannel): Implemented. * Makefile.am (ordinary_java_source_files): Added gnu/java/nio/OutputStreamChannel.java. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74840 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 08c60929950..c2d017bf0d5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,13 @@ 2003-12-19 Michael Koch + * gnu/java/nio/OutputStreamChannel.java: New file. + * java/nio/channels/Channels.java (newChannel): Implemented. + * Makefile.am (ordinary_java_source_files): + Added gnu/java/nio/OutputStreamChannel.java. + * Makefile.in: Regenerated. + +2003-12-19 Michael Koch + * Makefile.am (ordinary_java_source_files): Added gnu.java.nio.InputStreamChannel. * Makefile.in: Regenerated. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 1316268b534..9156010e107 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2225,6 +2225,7 @@ gnu/java/nio/NIODatagramSocket.java \ gnu/java/nio/NIOServerSocket.java \ gnu/java/nio/NIOSocket.java \ gnu/java/nio/InputStreamChannel.java \ +gnu/java/nio/OutputStreamChannel.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectorImpl.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 326262e5642..4f9b040a105 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1932,6 +1932,7 @@ gnu/java/nio/NIODatagramSocket.java \ gnu/java/nio/NIOServerSocket.java \ gnu/java/nio/NIOSocket.java \ gnu/java/nio/InputStreamChannel.java \ +gnu/java/nio/OutputStreamChannel.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectorImpl.java \ @@ -3070,8 +3071,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/nio/NIOConstants.P \ .deps/gnu/java/nio/NIODatagramSocket.P \ .deps/gnu/java/nio/NIOServerSocket.P .deps/gnu/java/nio/NIOSocket.P \ -.deps/gnu/java/nio/PipeImpl.P .deps/gnu/java/nio/SelectionKeyImpl.P \ -.deps/gnu/java/nio/SelectorImpl.P \ +.deps/gnu/java/nio/OutputStreamChannel.P .deps/gnu/java/nio/PipeImpl.P \ +.deps/gnu/java/nio/SelectionKeyImpl.P .deps/gnu/java/nio/SelectorImpl.P \ .deps/gnu/java/nio/SelectorProviderImpl.P \ .deps/gnu/java/nio/ServerSocketChannelImpl.P \ .deps/gnu/java/nio/ServerSocketChannelSelectionKey.P \ diff --git a/libjava/gnu/java/nio/OutputStreamChannel.java b/libjava/gnu/java/nio/OutputStreamChannel.java new file mode 100644 index 00000000000..37ded3b1169 --- /dev/null +++ b/libjava/gnu/java/nio/OutputStreamChannel.java @@ -0,0 +1,87 @@ +/* OutputStreamChannel.java -- + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package gnu.java.nio; + +import java.io.OutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.WritableByteChannel; + +/** + * @author Michael Koch + */ +public final class OutputStreamChannel implements WritableByteChannel +{ + private boolean closed = false; + private OutputStream out; + + public OutputStreamChannel (OutputStream out) + { + super(); + + this.out = out; + } + + public void close() throws IOException + { + if (!closed) + { + out.close(); + closed = true; + } + } + + public boolean isOpen() + { + return !closed; + } + + public int write (ByteBuffer src) throws IOException + { + if (!isOpen()) + throw new ClosedChannelException(); + + int len = src.remaining(); + byte[] buffer = new byte [len]; + src.get (buffer); + out.write (buffer); + return len; + } +} diff --git a/libjava/java/nio/channels/Channels.java b/libjava/java/nio/channels/Channels.java index caad49c90fe..f8358ae9c04 100644 --- a/libjava/java/nio/channels/Channels.java +++ b/libjava/java/nio/channels/Channels.java @@ -38,6 +38,7 @@ exception statement from your version. */ package java.nio.channels; import gnu.java.nio.InputStreamChannel; +import gnu.java.nio.OutputStreamChannel; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -78,9 +79,9 @@ public final class Channels /** * Constructs a channel that writes bytes to the given stream. */ - public static WritableByteChannel newChannel (OutputStream out) + public static WritableByteChannel newChannel(OutputStream out) { - throw new Error ("not implemented"); + return new OutputStreamChannel (out); } /**