From 628cacef2409f1aae7d75090cbd851f5dd14a80f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 13 May 2006 21:21:28 +0000 Subject: sources.am, [...]: Rebuilt. * sources.am, Makefile.in: Rebuilt. * Makefile.am (nat_source_files): Mention natVMChannels.cc, not natChannels.cc. * java/nio/channels/natVMChannels.cc: Renamed from natChannels.cc. * java/nio/channels/Channels.java: Removed. * java/nio/channels/natChannels.cc: Removed. * java/nio/channels/VMChannels.java: New file. From-SVN: r113745 --- libjava/ChangeLog | 11 ++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 17 ++-- libjava/java/nio/channels/Channels.java | 156 ----------------------------- libjava/java/nio/channels/VMChannels.java | 85 ++++++++++++++++ libjava/java/nio/channels/natChannels.cc | 36 ------- libjava/java/nio/channels/natVMChannels.cc | 37 +++++++ libjava/sources.am | 3 +- 8 files changed, 145 insertions(+), 202 deletions(-) delete mode 100644 libjava/java/nio/channels/Channels.java create mode 100644 libjava/java/nio/channels/VMChannels.java delete mode 100644 libjava/java/nio/channels/natChannels.cc create mode 100644 libjava/java/nio/channels/natVMChannels.cc diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 87c18c1..fc7eddc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,6 +1,17 @@ 2006-05-13 Tom Tromey * sources.am, Makefile.in: Rebuilt. + * Makefile.am (nat_source_files): Mention natVMChannels.cc, not + natChannels.cc. + * java/nio/channels/natVMChannels.cc: Renamed from + natChannels.cc. + * java/nio/channels/Channels.java: Removed. + * java/nio/channels/natChannels.cc: Removed. + * java/nio/channels/VMChannels.java: New file. + +2006-05-13 Tom Tromey + + * sources.am, Makefile.in: Rebuilt. * java/text/DateFormat.java: Removed. 2006-05-13 Tom Tromey diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 520b18f..d2faf9e 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -821,7 +821,7 @@ java/lang/reflect/natField.cc \ java/lang/reflect/natMethod.cc \ java/net/natVMNetworkInterface.cc \ java/net/natInetAddress.cc \ -java/nio/channels/natChannels.cc \ +java/nio/channels/natVMChannels.cc \ java/nio/natDirectByteBufferImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index dbadd61..077b4f3 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -277,7 +277,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \ java/lang/reflect/natConstructor.cc \ java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \ java/net/natVMNetworkInterface.cc java/net/natInetAddress.cc \ - java/nio/channels/natChannels.cc \ + java/nio/channels/natVMChannels.cc \ java/nio/natDirectByteBufferImpl.cc java/text/natCollator.cc \ java/util/natResourceBundle.cc java/util/natVMTimeZone.cc \ java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \ @@ -318,7 +318,7 @@ am__objects_2 = gnu/classpath/natSystemProperties.lo \ java/lang/reflect/natConstructor.lo \ java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \ java/net/natVMNetworkInterface.lo java/net/natInetAddress.lo \ - java/nio/channels/natChannels.lo \ + java/nio/channels/natVMChannels.lo \ java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \ java/util/natResourceBundle.lo java/util/natVMTimeZone.lo \ java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \ @@ -3793,7 +3793,7 @@ classpath/java/nio/channels/AsynchronousCloseException.java \ classpath/java/nio/channels/ByteChannel.java \ classpath/java/nio/channels/CancelledKeyException.java \ classpath/java/nio/channels/Channel.java \ -java/nio/channels/Channels.java \ +classpath/java/nio/channels/Channels.java \ classpath/java/nio/channels/ClosedByInterruptException.java \ classpath/java/nio/channels/ClosedChannelException.java \ classpath/java/nio/channels/ClosedSelectorException.java \ @@ -3822,6 +3822,7 @@ classpath/java/nio/channels/ServerSocketChannel.java \ classpath/java/nio/channels/SocketChannel.java \ classpath/java/nio/channels/UnresolvedAddressException.java \ classpath/java/nio/channels/UnsupportedAddressTypeException.java \ +java/nio/channels/VMChannels.java \ classpath/java/nio/channels/WritableByteChannel.java java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files))) @@ -6789,7 +6790,7 @@ java/lang/reflect/natField.cc \ java/lang/reflect/natMethod.cc \ java/net/natVMNetworkInterface.cc \ java/net/natInetAddress.cc \ -java/nio/channels/natChannels.cc \ +java/nio/channels/natVMChannels.cc \ java/nio/natDirectByteBufferImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ @@ -7234,7 +7235,7 @@ java/nio/channels/$(am__dirstamp): java/nio/channels/$(DEPDIR)/$(am__dirstamp): @$(mkdir_p) java/nio/channels/$(DEPDIR) @: > java/nio/channels/$(DEPDIR)/$(am__dirstamp) -java/nio/channels/natChannels.lo: java/nio/channels/$(am__dirstamp) \ +java/nio/channels/natVMChannels.lo: java/nio/channels/$(am__dirstamp) \ java/nio/channels/$(DEPDIR)/$(am__dirstamp) java/nio/$(am__dirstamp): @$(mkdir_p) java/nio @@ -7541,8 +7542,8 @@ mostlyclean-compile: -rm -f java/net/natInetAddress.lo -rm -f java/net/natVMNetworkInterface.$(OBJEXT) -rm -f java/net/natVMNetworkInterface.lo - -rm -f java/nio/channels/natChannels.$(OBJEXT) - -rm -f java/nio/channels/natChannels.lo + -rm -f java/nio/channels/natVMChannels.$(OBJEXT) + -rm -f java/nio/channels/natVMChannels.lo -rm -f java/nio/natDirectByteBufferImpl.$(OBJEXT) -rm -f java/nio/natDirectByteBufferImpl.lo -rm -f java/text/natCollator.$(OBJEXT) @@ -7658,7 +7659,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natInetAddress.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMNetworkInterface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natDirectByteBufferImpl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natChannels.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natVMChannels.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/text/$(DEPDIR)/natCollator.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natResourceBundle.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natVMTimeZone.Plo@am__quote@ diff --git a/libjava/java/nio/channels/Channels.java b/libjava/java/nio/channels/Channels.java deleted file mode 100644 index b326a25..0000000 --- a/libjava/java/nio/channels/Channels.java +++ /dev/null @@ -1,156 +0,0 @@ -/* Channels.java -- - Copyright (C) 2002, 2003, 2004, 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., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 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.ChannelReader; -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; -import java.io.Writer; -import java.nio.charset.Charset; -import java.nio.charset.CharsetDecoder; -import java.nio.charset.CharsetEncoder; - - -/** - * @since 1.4 - */ -public final class Channels -{ - /** - * This class isn't intended to be instantiated. - */ - 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); - } - - /** - * Constructs a stream that writes bytes to the given channel. - */ - public static OutputStream newOutputStream(WritableByteChannel ch) - { - if (ch instanceof FileChannelImpl) - return newOutputStream((FileChannelImpl) ch); - return new ChannelOutputStream(ch); - } - - static native FileInputStream newInputStream(FileChannelImpl ch); - - static native FileOutputStream newOutputStream(FileChannelImpl ch); - - /** - * Constructs a channel that reads bytes from the given stream. - */ - public static ReadableByteChannel newChannel(InputStream in) - { - return new InputStreamChannel(in); - } - - /** - * Constructs a channel that writes bytes to the given stream. - */ - public static WritableByteChannel newChannel(OutputStream out) - { - return new OutputStreamChannel(out); - } - - /** - * Constructs a reader that decodes bytes from the given channel using the - * given decoder. - */ - public static Reader newReader(ReadableByteChannel ch, CharsetDecoder dec, - int minBufferCap) - { - return new ChannelReader(ch, dec, minBufferCap); - } - - /** - * 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) - { - // FIXME: implement java.nio.channels.Channel.newWriter(WritableByteChannel, CharsetEncoder, int) - 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); - } -} diff --git a/libjava/java/nio/channels/VMChannels.java b/libjava/java/nio/channels/VMChannels.java new file mode 100644 index 0000000..4f43a42 --- /dev/null +++ b/libjava/java/nio/channels/VMChannels.java @@ -0,0 +1,85 @@ +/* VMChannels.java -- + Copyright (C) 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 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; + +final class VMChannels +{ + /** + * This class isn't intended to be instantiated. + */ + private VMChannels() + { + // Do nothing here. + } + + static native FileInputStream newInputStream(FileChannelImpl ch); + + static native FileOutputStream newOutputStream(FileChannelImpl ch); + + /** + * Constructs a stream that reads bytes from the given channel. + */ + static InputStream newInputStream(ReadableByteChannel ch) + { + if (ch instanceof FileChannelImpl) + return newInputStream((FileChannelImpl) ch); + return new ChannelInputStream(ch); + } + + /** + * Constructs a stream that writes bytes to the given channel. + */ + static OutputStream newOutputStream(WritableByteChannel ch) + { + if (ch instanceof FileChannelImpl) + return newOutputStream((FileChannelImpl) ch); + return new ChannelOutputStream(ch); + } +} diff --git a/libjava/java/nio/channels/natChannels.cc b/libjava/java/nio/channels/natChannels.cc deleted file mode 100644 index 5e363ee..0000000 --- a/libjava/java/nio/channels/natChannels.cc +++ /dev/null @@ -1,36 +0,0 @@ -// natChannels.cc - Native part of Channels class. - -/* Copyright (C) 2004 Free Software Foundation - - This file is part of libgcj. - -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - -#include -#include - -#include -#include -#include -#include - -using java::nio::channels::Channels; -using java::io::FileInputStream; -using java::io::FileOutputStream; -using gnu::java::nio::channels::FileChannelImpl; - -FileInputStream* -Channels::newInputStream(FileChannelImpl* ch) -{ - // Needs to be native to bypass Java access protection. - return new FileInputStream (ch); -} - -FileOutputStream* -Channels::newOutputStream(FileChannelImpl* ch) -{ - // Needs to be native to bypass Java access protection. - return new FileOutputStream (ch); -} diff --git a/libjava/java/nio/channels/natVMChannels.cc b/libjava/java/nio/channels/natVMChannels.cc new file mode 100644 index 0000000..d40a516 --- /dev/null +++ b/libjava/java/nio/channels/natVMChannels.cc @@ -0,0 +1,37 @@ +// natVMChannels.cc - Native part of VMChannels class. + +/* Copyright (C) 2004, 2006 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +#include +#include + +#include +#include +#include +#include +#include + +using java::nio::channels::VMChannels; +using java::io::FileInputStream; +using java::io::FileOutputStream; +using gnu::java::nio::channels::FileChannelImpl; + +FileInputStream* +VMChannels::newInputStream(FileChannelImpl* ch) +{ + // Needs to be native to bypass Java access protection. + return new FileInputStream (ch); +} + +FileOutputStream* +VMChannels::newOutputStream(FileChannelImpl* ch) +{ + // Needs to be native to bypass Java access protection. + return new FileOutputStream (ch); +} diff --git a/libjava/sources.am b/libjava/sources.am index eb2a1aa..eacb5cc 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -4491,7 +4491,7 @@ classpath/java/nio/channels/AsynchronousCloseException.java \ classpath/java/nio/channels/ByteChannel.java \ classpath/java/nio/channels/CancelledKeyException.java \ classpath/java/nio/channels/Channel.java \ -java/nio/channels/Channels.java \ +classpath/java/nio/channels/Channels.java \ classpath/java/nio/channels/ClosedByInterruptException.java \ classpath/java/nio/channels/ClosedChannelException.java \ classpath/java/nio/channels/ClosedSelectorException.java \ @@ -4520,6 +4520,7 @@ classpath/java/nio/channels/ServerSocketChannel.java \ classpath/java/nio/channels/SocketChannel.java \ classpath/java/nio/channels/UnresolvedAddressException.java \ classpath/java/nio/channels/UnsupportedAddressTypeException.java \ +java/nio/channels/VMChannels.java \ classpath/java/nio/channels/WritableByteChannel.java java_nio_channels_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_nio_channels_source_files))) -- cgit v1.1