Index: include/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v retrieving revision 1.37 diff -u -r1.37 Makefile.am --- include/Makefile.am 11 Jan 2005 15:06:03 -0000 1.37 +++ include/Makefile.am 12 Jan 2005 10:07:45 -0000 @@ -89,7 +89,6 @@ $(top_srcdir)/include/java_net_NetworkInterface.h \ $(top_srcdir)/include/java_nio_VMDirectByteBuffer.h \ $(top_srcdir)/include/java_nio_MappedByteBufferImpl.h \ -$(top_srcdir)/include/java_nio_channels_Channels.h \ $(top_srcdir)/include/java_util_VMTimeZone.h if CREATE_JNI_HEADERS @@ -146,8 +145,6 @@ $(JAVAH) -o $@ java.nio.VMDirectByteBuffer $(top_srcdir)/include/java_nio_MappedByteBufferImpl.h: $(top_srcdir)/java/nio/MappedByteBufferImpl.java $(JAVAH) -o $@ java.nio.MappedByteBufferImpl -$(top_srcdir)/include/java_nio_channels_Channels.h: $(top_srcdir)/java/nio/channels/Channels.java - $(JAVAH) -o $@ java.nio.channels.Channels $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/channels/FileChannelImpl.java $(JAVAH) -o $@ gnu.java.nio.channels.FileChannelImpl $(top_srcdir)/include/java_util_VMTimeZone.h: $(top_srcdir)/vm/reference/java/util/VMTimeZone.java Index: include/java_nio_channels_Channels.h =================================================================== RCS file: include/java_nio_channels_Channels.h diff -N include/java_nio_channels_Channels.h --- include/java_nio_channels_Channels.h 28 May 2004 17:27:56 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ - -#ifndef __java_nio_channels_Channels__ -#define __java_nio_channels_Channels__ - -#include - -#ifdef __cplusplus -extern "C" -{ -#endif - -JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newInputStream (JNIEnv *env, jclass, jobject); -JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newOutputStream (JNIEnv *env, jclass, jobject); - -#ifdef __cplusplus -} -#endif - -#endif /* __java_nio_channels_Channels__ */ Index: java/nio/channels/Channels.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/nio/channels/Channels.java,v retrieving revision 1.9 diff -u -r1.9 Channels.java --- java/nio/channels/Channels.java 15 Nov 2004 14:13:26 -0000 1.9 +++ java/nio/channels/Channels.java 12 Jan 2005 10:07:45 -0000 @@ -1,5 +1,5 @@ /* Channels.java -- - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,16 +35,12 @@ obligated to do so. If you do not wish to do so, delete this 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 gnu.java.nio.channels.FileChannelImpl; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -62,16 +58,17 @@ /** * This class isn't intended to be instantiated. */ - private Channels() {} + private Channels() + { + // Do nothing here. + } /** * Constructs a stream that reads bytes from the given channel. */ public static InputStream newInputStream(ReadableByteChannel ch) { - if (ch instanceof FileChannelImpl) - return newInputStream((FileChannelImpl) ch); - return new ChannelInputStream(ch); + return VMChannels.newInputStream(ch); } /** @@ -79,15 +76,9 @@ */ public static OutputStream newOutputStream(WritableByteChannel ch) { - if (ch instanceof FileChannelImpl) - return newOutputStream((FileChannelImpl) ch); - return new ChannelOutputStream(ch); + return VMChannels.newOutputStream(ch); } - static native FileInputStream newInputStream(FileChannelImpl ch); - - static native FileOutputStream newOutputStream(FileChannelImpl ch); - /** * Constructs a channel that reads bytes from the given stream. */ Index: native/jni/java-nio/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v retrieving revision 1.15 diff -u -r1.15 Makefile.am --- native/jni/java-nio/Makefile.am 23 Nov 2004 12:51:36 -0000 1.15 +++ native/jni/java-nio/Makefile.am 12 Jan 2005 10:07:45 -0000 @@ -4,8 +4,7 @@ gnu_java_nio_VMSelector.c \ gnu_java_nio_channels_FileChannelImpl.c \ java_nio_MappedByteBufferImpl.c \ - java_nio_VMDirectByteBuffer.c \ - java_nio_channels_Channels.c + java_nio_VMDirectByteBuffer.c libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo Index: native/jni/java-nio/java_nio_channels_Channels.c =================================================================== RCS file: native/jni/java-nio/java_nio_channels_Channels.c diff -N native/jni/java-nio/java_nio_channels_Channels.c --- native/jni/java-nio/java_nio_channels_Channels.c 26 Oct 2004 20:26:03 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,69 +0,0 @@ -/* java_nio_channels_Channels.c - Native methods for Channel - Copyright (C) 2004 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. */ - -#include -#include - -#include -#include - -#include "java_nio_channels_Channels.h" - -#define IO_EXCEPTION "java/io/IOException" - -JNIEXPORT jobject JNICALL -Java_java_nio_channels_Channels_newInputStream (JNIEnv *env, - jclass cls - __attribute__ ((__unused__)), - jobject filechannel - __attribute__ ((__unused__))) -{ - JCL_ThrowException (env, IO_EXCEPTION, "java.nio.channels.Channels.newInputStream(): not implemented"); - return NULL; -} - -JNIEXPORT jobject JNICALL -Java_java_nio_channels_Channels_newOutputStream (JNIEnv *env, - jclass cls - __attribute__ ((__unused__)), - jobject filechannel - __attribute__ ((__unused__))) -{ - JCL_ThrowException (env, IO_EXCEPTION, "java.nio.channels.Channels.newOutputStream(): not implemented"); - return NULL; -} - Index: vm/reference/java/nio/channels/VMChannels.java =================================================================== RCS file: vm/reference/java/nio/channels/VMChannels.java diff -N vm/reference/java/nio/channels/VMChannels.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ vm/reference/java/nio/channels/VMChannels.java 12 Jan 2005 10:07:45 -0000 @@ -0,0 +1,116 @@ +/* VMChannels.java -- + Copyright (C) 2005 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 gnu.java.nio.ChannelInputStream; +import gnu.java.nio.ChannelOutputStream; +import gnu.java.nio.channels.FileChannelImpl; + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; + +public final class VMChannels +{ + /** + * This class isn't intended to be instantiated. + */ + private VMChannels() + { + // Do nothing here. + } + + private static Object createStream(Class streamClass, Channel ch) + { + try + { + Class[] argTypes = new Class[1]; + argTypes[0] = FileChannelImpl.class; + Constructor constructor = + streamClass.getDeclaredConstructor(argTypes); + constructor.setAccessible(true); + Object[] args = new Object[1]; + args[0] = ch; + return constructor.newInstance(args); + } + catch (IllegalAccessException e) + { + // Ignored. + } + catch (InstantiationException e) + { + // Ignored. + } + catch (InvocationTargetException e) + { + // Ignored. + } + catch (NoSuchMethodException e) + { + // Ignored. + } + + return null; + } + + /** + * Constructs a stream that reads bytes from the given channel. + */ + public static InputStream newInputStream(ReadableByteChannel ch) + { + if (ch instanceof FileChannelImpl) + return (FileInputStream) createStream(FileInputStream.class, ch); + + return new ChannelInputStream(ch); + } + + /** + * Constructs a stream that writes bytes to the given channel. + */ + public static OutputStream newOutputStream(WritableByteChannel ch) + { + if (ch instanceof FileChannelImpl) + return (FileOutputStream) createStream(FileOutputStream.class, ch); + + return new ChannelOutputStream(ch); + } +}