FYI: Patch: java.nio.channel.Channels

[Michael Koch <konqueror at gmx dot de>]

Hi list,


I commited the attached patch to implement another mehtod in 
java.nio.channel.Channels. It needs a helper class too.


Michael

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2467
diff -u -b -B -r1.2467 ChangeLog
--- ChangeLog	19 Dec 2003 16:31:57 -0000	1.2467
+++ ChangeLog	19 Dec 2003 19:06:06 -0000
@@ -1,5 +1,15 @@
 2003-12-19  Michael Koch  <konqueror@gmx.de>
 
+	* gnu/java/nio/ChannelInputStream.java: New file.
+	* java/nio/channels/Channels.java (newInputStream): Implemented.
+	* java/nio/channels/FileChannelImpl.java
+	(readImpl): Only put data into buffer if something was read.
+	* Makefile.am (ordinary_java_source_files):
+	Added gnu/java/nio/ChannelInputStream.java.
+	* Makefile.in: Regenerated.
+
+2003-12-19  Michael Koch  <konqueror@gmx.de>
+
 	* gnu/java/nio/OutputStreamChannel.java: New file.
 	* java/nio/channels/Channels.java (newChannel): Implemented.
 	* Makefile.am (ordinary_java_source_files):
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.339
diff -u -b -B -r1.339 Makefile.am
--- Makefile.am	19 Dec 2003 16:31:58 -0000	1.339
+++ Makefile.am	19 Dec 2003 19:06:06 -0000
@@ -2224,6 +2224,7 @@
 gnu/java/nio/NIODatagramSocket.java \
 gnu/java/nio/NIOServerSocket.java \
 gnu/java/nio/NIOSocket.java \
+gnu/java/nio/ChannelInputStream.java \
 gnu/java/nio/InputStreamChannel.java \
 gnu/java/nio/OutputStreamChannel.java \
 gnu/java/nio/PipeImpl.java \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.363
diff -u -b -B -r1.363 Makefile.in
--- Makefile.in	19 Dec 2003 16:31:58 -0000	1.363
+++ Makefile.in	19 Dec 2003 19:06:09 -0000
@@ -1931,6 +1931,7 @@
 gnu/java/nio/NIODatagramSocket.java \
 gnu/java/nio/NIOServerSocket.java \
 gnu/java/nio/NIOSocket.java \
+gnu/java/nio/ChannelInputStream.java \
 gnu/java/nio/InputStreamChannel.java \
 gnu/java/nio/OutputStreamChannel.java \
 gnu/java/nio/PipeImpl.java \
@@ -3064,6 +3065,7 @@
 .deps/gnu/java/net/protocol/http/Handler.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/DatagramChannelImpl.P \
 .deps/gnu/java/nio/DatagramChannelSelectionKey.P \
 .deps/gnu/java/nio/FileLockImpl.P \
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	19 Dec 2003 19:06:09 -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: java/nio/channels/Channels.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/channels/Channels.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 Channels.java
--- java/nio/channels/Channels.java	19 Dec 2003 16:31:59 -0000	1.4
+++ java/nio/channels/Channels.java	19 Dec 2003 19:06:09 -0000
@@ -37,6 +37,7 @@
 
 package java.nio.channels;
 
+import gnu.java.nio.ChannelInputStream;
 import gnu.java.nio.InputStreamChannel;
 import gnu.java.nio.OutputStreamChannel;
 import java.io.InputStream;
@@ -55,9 +56,9 @@
   /**
    * 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);
   }
   
   /**
Index: java/nio/channels/FileChannelImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/nio/channels/FileChannelImpl.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 FileChannelImpl.java
--- java/nio/channels/FileChannelImpl.java	21 Oct 2003 12:55:02 -0000	1.3
+++ java/nio/channels/FileChannelImpl.java	19 Dec 2003 19:06:09 -0000
@@ -169,6 +169,8 @@
     byte[] buffer = new byte [dst.remaining ()];
     
     result = implRead (buffer, 0, buffer.length);
+
+    if (result > 0)
     dst.put (buffer, 0, result);
 
     return result;