This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[PATCH] java.nio.channels.Channels
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 12 Feb 2003 11:10:08 +0100
- Subject: [PATCH] java.nio.channels.Channels
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
this patch adds a new file to java.nio.channels. This should be added
to 3.3 too.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+Sh2AWSOgCCdjSDsRApXoAJ9+7+DFscIZB333Auh2NqsLUQ5u3QCfcJIA
8zlKNCraig69EhaEt6OKVDo=
=Cs5G
-----END PGP SIGNATURE-----
--- /home/mkoch/src/gcc-cvs/libjava/ChangeLog 2003-02-12 09:01:10.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/ChangeLog 2003-02-12 10:46:12.000000000 +0100
@@ -1,5 +1,12 @@
2003-02-12 Michael Koch <konqueror@gmx.de>
+ * java/nio/channels/Channels.java: New file.
+ * Makefile.am
+ (ordinary_java_source_files): Added java/nio/channels/Channels.java.
+ * Makefile.in: Regenerated.
+
+2003-02-12 Michael Koch <konqueror@gmx.de>
+
* java/nio/ByteBuffer.java
(allocate): Implemented.
(wrap): Implemented.
--- /home/mkoch/src/gcc-cvs/libjava/java/nio/channels/Channels.java 1970-01-01 01:00:00.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/nio/channels/Channels.java 2003-02-12 08:03:09.000000000 +0100
@@ -0,0 +1,130 @@
+/* Channels.java --
+ Copyright (C) 2002 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 java.nio.channels;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.channels.WritableByteChannel;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+
+/**
+ * @since 1.4
+ */
+public final class Channels
+{
+ /**
+ * Constructs a stream that reads bytes from the given channel.
+ */
+ public static InputStream newInputStream (ReadableByteChannel ch)
+ {
+ throw new Error ("not implemented");
+ }
+
+ /**
+ * Constructs a stream that writes bytes to the given channel.
+ */
+ public static OutputStream newOutputStream (WritableByteChannel ch)
+ {
+ throw new Error ("not implemented");
+ }
+
+ /**
+ * Constructs a channel that reads bytes from the given stream.
+ */
+ public static ReadableByteChannel newChannel (InputStream in)
+ {
+ throw new Error ("not implemented");
+ }
+
+ /**
+ * Constructs a channel that writes bytes to the given stream.
+ */
+ public static WritableByteChannel newChannel (OutputStream out)
+ {
+ throw new Error ("not implemented");
+ }
+
+ /**
+ * Constructs a reader that decodes bytes from the given channel using the
+ * given decoder.
+ */
+ public static Reader newReader (ReadableByteChannel ch, CharsetDecoder dec,
+ int minBufferCap)
+ {
+ throw new Error ("not implemented");
+ }
+
+ /**
+ * Constructs a reader that decodes bytes from the given channel according to
+ * the named charset.
+ *
+ * @exception UnsupportedCharsetException If no support for the named charset
+ * is available in this instance of the Java virtual machine.
+ */
+ public static Reader newReader (ReadableByteChannel ch, String csName)
+ {
+ return newReader (ch, Charset.forName (csName).newDecoder (), -1);
+ }
+
+ /**
+ * Constructs a writer that encodes characters using the given encoder and
+ * writes the resulting bytes to the given channel.
+ */
+ public static Writer newWriter (WritableByteChannel ch, CharsetEncoder enc,
+ int minBufferCap)
+ {
+ throw new Error ("not implemented");
+ }
+
+ /**
+ * Constructs a writer that encodes characters according to the named charset
+ * and writes the resulting bytes to the given channel.
+ *
+ * @exception UnsupportedCharsetException If no support for the named charset
+ * is available in this instance of the Java virtual machine.
+ */
+ public static Writer newWriter (WritableByteChannel ch,
+ String csName)
+ {
+ return newWriter (ch, Charset.forName (csName).newEncoder (), -1);
+ }
+}
--- /home/mkoch/src/gcc-cvs/libjava/Makefile.am 2003-02-11 12:16:41.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/Makefile.am 2003-02-12 09:11:17.000000000 +0100
@@ -2159,6 +2159,7 @@
java/nio/channels/ByteChannel.java \
java/nio/channels/CancelledKeyException.java \
java/nio/channels/Channel.java \
+java/nio/channels/Channels.java \
java/nio/channels/ClosedByInterruptException.java \
java/nio/channels/ClosedChannelException.java \
java/nio/channels/ClosedSelectorException.java \
--- /home/mkoch/src/gcc-cvs/libjava/Makefile.in 2003-02-12 08:00:33.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/Makefile.in 2003-02-12 09:12:17.000000000 +0100
@@ -1919,6 +1919,7 @@
java/nio/channels/ByteChannel.java \
java/nio/channels/CancelledKeyException.java \
java/nio/channels/Channel.java \
+java/nio/channels/Channels.java \
java/nio/channels/ClosedByInterruptException.java \
java/nio/channels/ClosedChannelException.java \
java/nio/channels/ClosedSelectorException.java \
@@ -3343,7 +3344,7 @@
.deps/java/nio/channels/AsynchronousCloseException.P \
.deps/java/nio/channels/ByteChannel.P \
.deps/java/nio/channels/CancelledKeyException.P \
-.deps/java/nio/channels/Channel.P \
+.deps/java/nio/channels/Channel.P .deps/java/nio/channels/Channels.P \
.deps/java/nio/channels/ClosedByInterruptException.P \
.deps/java/nio/channels/ClosedChannelException.P \
.deps/java/nio/channels/ClosedSelectorException.P \