From b8362a2315c3ac45d0fc13844900c44669cab385 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 19 Dec 2003 15:22:33 +0000 Subject: [PATCH] InputStreamChannel.java: New file. 2003-12-19 Michael Koch * gnu/java/nio/InputStreamChannel.java: New file. * java/nio/channels/Channels.java (newChannel): Implemented. From-SVN: r74838 --- libjava/ChangeLog | 5 ++ libjava/gnu/java/nio/InputStreamChannel.java | 88 ++++++++++++++++++++ libjava/java/nio/channels/Channels.java | 7 +- 3 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 libjava/gnu/java/nio/InputStreamChannel.java diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 13db38aa970..65a3e0318bc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-12-19 Michael Koch + + * gnu/java/nio/InputStreamChannel.java: New file. + * java/nio/channels/Channels.java (newChannel): Implemented. + 2003-12-19 Michael Koch * java/util/SimpleTimeZone.java diff --git a/libjava/gnu/java/nio/InputStreamChannel.java b/libjava/gnu/java/nio/InputStreamChannel.java new file mode 100644 index 00000000000..49e8b3c7e73 --- /dev/null +++ b/libjava/gnu/java/nio/InputStreamChannel.java @@ -0,0 +1,88 @@ +/* InputStreamChannel.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.InputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.ReadableByteChannel; + +/** + * @author Michael Koch + */ +public final class InputStreamChannel implements ReadableByteChannel +{ + private boolean closed = false; + private InputStream in; + + public InputStreamChannel (InputStream in) + { + super(); + this.in = in; + } + + public void close() throws IOException + { + if (!closed) + { + in.close(); + closed = true; + } + } + + public boolean isOpen() + { + return !closed; + } + + public int read (ByteBuffer dst) throws IOException + { + if (!isOpen()) + throw new ClosedChannelException(); + + byte[] buffer = new byte [dst.remaining()]; + int readBytes = in.read (buffer); + + if (readBytes > 0) + dst.put (buffer, 0, readBytes); + + return readBytes; + } +} diff --git a/libjava/java/nio/channels/Channels.java b/libjava/java/nio/channels/Channels.java index 98fc2b6f8a5..caad49c90fe 100644 --- a/libjava/java/nio/channels/Channels.java +++ b/libjava/java/nio/channels/Channels.java @@ -1,5 +1,5 @@ /* Channels.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,6 +37,7 @@ exception statement from your version. */ package java.nio.channels; +import gnu.java.nio.InputStreamChannel; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -69,9 +70,9 @@ public final class Channels /** * Constructs a channel that reads bytes from the given stream. */ - public static ReadableByteChannel newChannel (InputStream in) + public static ReadableByteChannel newChannel(InputStream in) { - throw new Error ("not implemented"); + return new InputStreamChannel(in); } /** -- 2.30.2