Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.1740 diff -u -b -B -r1.1740 ChangeLog --- ChangeLog 30 Dec 2003 15:57:05 -0000 1.1740 +++ ChangeLog 30 Dec 2003 21:28:45 -0000 @@ -1,5 +1,17 @@ 2003-12-30 Michael Koch + * java/nio/channels/Channels.java + (newInputStream): Implemented. + (newOuputStream): Implemented. + (newChannel): Implemented. + * gnu/java/nio/ChannelInputStream.java, + gnu/java/nio/ChannelOutputStream.java, + gnu//java/nio/InputStreamChannel.java, + gnu/java/nio/OutputStreamChannel.java: New files. + * gnu/java/nio/Makefile.am (EXTRA_DIST): Added new files. + +2003-12-30 Michael Koch + * java/io/ObjectStreamClass.java (getSerialPersistentFields): Little reformating. Index: java/nio/channels/Channels.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/nio/channels/Channels.java,v retrieving revision 1.5 diff -u -b -B -r1.5 Channels.java --- java/nio/channels/Channels.java 11 Jun 2003 15:15:08 -0000 1.5 +++ java/nio/channels/Channels.java 30 Dec 2003 21:28:45 -0000 @@ -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,10 @@ package java.nio.channels; +import gnu.java.nio.ChannelInputStream; +import gnu.java.nio.ChannelOutputStream; +import gnu.java.nio.InputStreamChannel; +import gnu.java.nio.OutputStreamChannel; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -53,33 +57,33 @@ /** * Constructs a stream that reads bytes from the given channel. */ - public static InputStream newInputStream (ReadableByteChannel ch) + public static InputStream newInputStream(ReadableByteChannel ch) { - throw new Error ("not implemented"); + return new ChannelInputStream(ch); } /** * Constructs a stream that writes bytes to the given channel. */ - public static OutputStream newOutputStream (WritableByteChannel ch) + public static OutputStream newOutputStream(WritableByteChannel ch) { - throw new Error ("not implemented"); + return new ChannelOutputStream(ch); } /** * 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); } /** * 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); } /** Index: gnu/java/nio/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/nio/Makefile.am,v retrieving revision 1.11 diff -u -b -B -r1.11 Makefile.am --- gnu/java/nio/Makefile.am 15 Oct 2003 13:11:47 -0000 1.11 +++ gnu/java/nio/Makefile.am 30 Dec 2003 21:28:45 -0000 @@ -1,9 +1,13 @@ SUBDIRS = charset EXTRA_DIST= \ +ChannelInputStream.java \ +ChannelOutputStream.java \ DatagramChannelImpl.java \ DatagramChannelSelectionKey.java \ FileLockImpl.java \ +InputStreamChannel.java \ +OutputStreamChannel.java \ PipeImpl.java \ NIOConstants.java \ NIODatagramSocket.java \ Index: gnu/java/nio/ChannelInputStream.java =================================================================== RCS file: gnu/java/nio/ChannelInputStream.java diff -N gnu/java/nio/ChannelInputStream.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/nio/ChannelInputStream.java 30 Dec 2003 21:28:45 -0000 @@ -0,0 +1,79 @@ +/* ChannelInputStream.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.IllegalBlockingModeException; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.SelectableChannel; + +/** + * @author Michael Koch + */ +public final class ChannelInputStream extends InputStream +{ + private ReadableByteChannel ch; + + public ChannelInputStream (ReadableByteChannel ch) + { + super(); + + this.ch = ch; + } + + public int read() throws IOException + { + if (ch instanceof SelectableChannel + && (! ((SelectableChannel) ch).isBlocking())) + throw new IllegalBlockingModeException(); + + ByteBuffer buffer = ByteBuffer.allocate(1); + int result = ch.read(buffer); + + if (result == -1) + return -1; + + if (result == 0) + throw new IOException("Could not read from channel"); + + return buffer.get(0); + } +} Index: gnu/java/nio/ChannelOutputStream.java =================================================================== RCS file: gnu/java/nio/ChannelOutputStream.java diff -N gnu/java/nio/ChannelOutputStream.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/nio/ChannelOutputStream.java 30 Dec 2003 21:28:45 -0000 @@ -0,0 +1,67 @@ +/* ChannelOutputStream.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.WritableByteChannel; + +/** + * @author Michael Koch + */ +public final class ChannelOutputStream extends OutputStream +{ + private WritableByteChannel ch; + + public ChannelOutputStream (WritableByteChannel ch) + { + super(); + + this.ch = ch; + } + + public void write (int value) throws IOException + { + ByteBuffer buffer = ByteBuffer.allocate (1); + buffer.put ((byte) (value & 0xff)); + buffer.flip(); + ch.write (buffer); + } +} Index: gnu/java/nio/OutputStreamChannel.java =================================================================== RCS file: gnu/java/nio/OutputStreamChannel.java diff -N gnu/java/nio/OutputStreamChannel.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/nio/OutputStreamChannel.java 30 Dec 2003 21:28:45 -0000 @@ -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; + } +} Index: gnu//java/nio/InputStreamChannel.java =================================================================== RCS file: gnu//java/nio/InputStreamChannel.java diff -N gnu//java/nio/InputStreamChannel.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu//java/nio/InputStreamChannel.java 30 Dec 2003 21:28:45 -0000 @@ -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; + } +}