aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-12-19 20:42:00 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-12-19 20:42:00 +0000
commit01da266767ed121543f3a167fd5dc8b4fec4f6cf (patch)
tree913ee2e445f2bb041f84440f1de8e9903ace3c1d
parent60cd3e8bab61b02cee0d0c57e7e3eeb9e9672354 (diff)
downloadgcc-01da266767ed121543f3a167fd5dc8b4fec4f6cf.zip
gcc-01da266767ed121543f3a167fd5dc8b4fec4f6cf.tar.gz
gcc-01da266767ed121543f3a167fd5dc8b4fec4f6cf.tar.bz2
ChannelOutputStream.java: New file.
2003-12-19 Michael Koch <konqueror@gmx.de> * gnu/java/nio/ChannelOutputStream.java: New file. * java/nio/channels/Channels.java (newOutputStream): Implemented. * Makefile.am (ordinary_java_source_files) Added gnu/java/nio/ChannelOutputStream.java. * Makefile.in: Regenerated. From-SVN: r74847
-rw-r--r--libjava/ChangeLog9
-rw-r--r--libjava/Makefile.am1
-rw-r--r--libjava/Makefile.in2
-rw-r--r--libjava/gnu/java/nio/ChannelOutputStream.java67
-rw-r--r--libjava/java/nio/channels/Channels.java5
5 files changed, 82 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a50b34e..4e9299c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-19 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/nio/ChannelOutputStream.java: New file.
+ * java/nio/channels/Channels.java
+ (newOutputStream): Implemented.
+ * Makefile.am (ordinary_java_source_files)
+ Added gnu/java/nio/ChannelOutputStream.java.
+ * Makefile.in: Regenerated.
+
2003-12-19 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/FlowLayout.java (layoutContainer): Let components
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index acd6f2a..e76e64c 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/ChannelInputStream.java \
+gnu/java/nio/ChannelOutputStream.java \
gnu/java/nio/InputStreamChannel.java \
gnu/java/nio/OutputStreamChannel.java \
gnu/java/nio/PipeImpl.java \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 522cbcb..f887b94 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/ChannelInputStream.java \
+gnu/java/nio/ChannelOutputStream.java \
gnu/java/nio/InputStreamChannel.java \
gnu/java/nio/OutputStreamChannel.java \
gnu/java/nio/PipeImpl.java \
@@ -3066,6 +3067,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/gnu/java/net/protocol/jar/Connection.P \
.deps/gnu/java/net/protocol/jar/Handler.P \
.deps/gnu/java/nio/ChannelInputStream.P \
+.deps/gnu/java/nio/ChannelOutputStream.P \
.deps/gnu/java/nio/DatagramChannelImpl.P \
.deps/gnu/java/nio/DatagramChannelSelectionKey.P \
.deps/gnu/java/nio/FileLockImpl.P \
diff --git a/libjava/gnu/java/nio/ChannelOutputStream.java b/libjava/gnu/java/nio/ChannelOutputStream.java
new file mode 100644
index 0000000..96dc761
--- /dev/null
+++ b/libjava/gnu/java/nio/ChannelOutputStream.java
@@ -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);
+ }
+}
diff --git a/libjava/java/nio/channels/Channels.java b/libjava/java/nio/channels/Channels.java
index d70410c..cb6154e 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.ChannelInputStream;
+import gnu.java.nio.ChannelOutputStream;
import gnu.java.nio.InputStreamChannel;
import gnu.java.nio.OutputStreamChannel;
import java.io.InputStream;
@@ -64,9 +65,9 @@ public final class Channels
/**
* 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);
}
/**