From ae26c8e25f9bad8b4d26f10d091d6342330f3cfb Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sun, 13 Jul 2003 16:53:05 +0000 Subject: [PATCH] FileChannelImpl.java, [...]: Removed. 2003-07-13 Michael Koch * gnu/java/nio/FileChannelImpl.java, gnu/java/nio/natFileChannelImpl.cc: Removed. * java/io/FileInputStream.java, java/io/FileOutputStream.java, java/io/RandomAccessFile.java, java/nio/MappedByteBufferImpl.java: Import java.nio.channels.FileChannelImpl instead of gnu.java.nio.FileChannelImpl. * java/nio/channels/FileChannelImpl.java, java/nio/channels/natFileChannelImpl.cc: New files. * Makefile.am (ordinary_java_source_files): Removed gnu/java/nio/FileChannelImpl.java and added java/nio/channels/FileChannelImpl.java. (nat source_files): Removed gnu/java/nio/natFileChannelImpl.cc and added java/nio/channels/natFileChannelImpl.cc. * Makefile.in: Regenerated. From-SVN: r69296 --- libjava/ChangeLog | 22 +++++++++++++ libjava/Makefile.am | 4 +-- libjava/Makefile.in | 33 +++++++++---------- libjava/java/io/FileInputStream.java | 2 +- libjava/java/io/FileOutputStream.java | 2 +- libjava/java/io/RandomAccessFile.java | 2 +- libjava/java/nio/MappedByteBufferImpl.java | 2 +- .../nio/channels}/FileChannelImpl.java | 9 +---- .../nio/channels}/natFileChannelImpl.cc | 30 ++++++++--------- 9 files changed, 60 insertions(+), 46 deletions(-) rename libjava/{gnu/java/nio => java/nio/channels}/FileChannelImpl.java (96%) rename libjava/{gnu/java/nio => java/nio/channels}/natFileChannelImpl.cc (56%) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 93fc7dc2fc4..fb23402138d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,25 @@ +2003-07-13 Michael Koch + + * gnu/java/nio/FileChannelImpl.java, + gnu/java/nio/natFileChannelImpl.cc: Removed. + * java/io/FileInputStream.java, + java/io/FileOutputStream.java, + java/io/RandomAccessFile.java, + java/nio/MappedByteBufferImpl.java: + Import java.nio.channels.FileChannelImpl instead of + gnu.java.nio.FileChannelImpl. + * java/nio/channels/FileChannelImpl.java, + java/nio/channels/natFileChannelImpl.cc: + New files. + * Makefile.am + (ordinary_java_source_files): + Removed gnu/java/nio/FileChannelImpl.java and added + java/nio/channels/FileChannelImpl.java. + (nat source_files): + Removed gnu/java/nio/natFileChannelImpl.cc and added + java/nio/channels/natFileChannelImpl.cc. + * Makefile.in: Regenerated. + 2003-07-13 Michael Koch * javax/swing/plaf/basic/BasicBorders.java, diff --git a/libjava/Makefile.am b/libjava/Makefile.am index a7388a7e422..de217371699 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2109,7 +2109,6 @@ gnu/java/locale/LocaleInformation_zh_SG.java \ gnu/java/locale/LocaleInformation_zh_TW.java \ gnu/java/math/MPN.java \ gnu/java/nio/DatagramChannelImpl.java \ -gnu/java/nio/FileChannelImpl.java \ gnu/java/nio/FileLockImpl.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ @@ -2270,6 +2269,7 @@ java/nio/channels/ClosedSelectorException.java \ java/nio/channels/ConnectionPendingException.java \ java/nio/channels/DatagramChannel.java \ java/nio/channels/FileChannel.java \ +java/nio/channels/FileChannelImpl.java \ java/nio/channels/FileLock.java \ java/nio/channels/FileLockInterruptionException.java \ java/nio/channels/GatheringByteChannel.java \ @@ -2576,7 +2576,6 @@ gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natVMClassLoader.cc \ gnu/java/awt/natEmbeddedWindow.cc \ -gnu/java/nio/natFileChannelImpl.cc \ gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natSelectorImpl.cc \ java/io/natFile.cc \ @@ -2608,6 +2607,7 @@ java/net/natInetAddress.cc \ java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainSocketImpl.cc \ java/nio/natDirectByteBufferImpl.cc \ +java/nio/channels/natFileChannelImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ java/util/natTimeZone.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 563e516c65c..bc78ea935ab 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1873,7 +1873,6 @@ gnu/java/locale/LocaleInformation_zh_SG.java \ gnu/java/locale/LocaleInformation_zh_TW.java \ gnu/java/math/MPN.java \ gnu/java/nio/DatagramChannelImpl.java \ -gnu/java/nio/FileChannelImpl.java \ gnu/java/nio/FileLockImpl.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ @@ -2034,6 +2033,7 @@ java/nio/channels/ClosedSelectorException.java \ java/nio/channels/ConnectionPendingException.java \ java/nio/channels/DatagramChannel.java \ java/nio/channels/FileChannel.java \ +java/nio/channels/FileChannelImpl.java \ java/nio/channels/FileLock.java \ java/nio/channels/FileLockInterruptionException.java \ java/nio/channels/GatheringByteChannel.java \ @@ -2339,7 +2339,6 @@ gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natVMClassLoader.cc \ gnu/java/awt/natEmbeddedWindow.cc \ -gnu/java/nio/natFileChannelImpl.cc \ gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natSelectorImpl.cc \ java/io/natFile.cc \ @@ -2371,6 +2370,7 @@ java/net/natInetAddress.cc \ java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainSocketImpl.cc \ java/nio/natDirectByteBufferImpl.cc \ +java/nio/channels/natFileChannelImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ java/util/natTimeZone.cc \ @@ -2515,14 +2515,13 @@ gnu/gcj/runtime/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \ gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \ gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \ gnu/gcj/runtime/natVMClassLoader.lo gnu/java/awt/natEmbeddedWindow.lo \ -gnu/java/nio/natFileChannelImpl.lo gnu/java/nio/natFileLockImpl.lo \ -gnu/java/nio/natSelectorImpl.lo java/io/natFile.lo \ -java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \ -java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \ -java/lang/natClass.lo java/lang/natClassLoader.lo \ -java/lang/natConcreteProcess.lo java/lang/natDouble.lo \ -java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \ -java/lang/natRuntime.lo java/lang/natString.lo \ +gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natSelectorImpl.lo \ +java/io/natFile.lo java/io/natFileDescriptor.lo \ +java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \ +java/lang/natCharacter.lo java/lang/natClass.lo \ +java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \ +java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \ +java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \ java/lang/natStringBuffer.lo java/lang/natSystem.lo \ java/lang/natThread.lo java/lang/natVMSecurityManager.lo \ java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \ @@ -2530,7 +2529,8 @@ java/lang/reflect/natConstructor.lo java/lang/reflect/natField.lo \ java/lang/reflect/natMethod.lo java/lang/reflect/natProxy.lo \ java/net/natNetworkInterface.lo java/net/natInetAddress.lo \ java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \ -java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \ +java/nio/natDirectByteBufferImpl.lo \ +java/nio/channels/natFileChannelImpl.lo java/text/natCollator.lo \ java/util/natResourceBundle.lo java/util/natTimeZone.lo \ java/util/zip/natDeflater.lo java/util/zip/natInflater.lo lib_org_xml_sax_la_LDFLAGS = @@ -2981,9 +2981,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/locale/LocaleInformation_zh_SG.P \ .deps/gnu/java/locale/LocaleInformation_zh_TW.P \ .deps/gnu/java/math/MPN.P .deps/gnu/java/nio/DatagramChannelImpl.P \ -.deps/gnu/java/nio/FileChannelImpl.P .deps/gnu/java/nio/FileLockImpl.P \ -.deps/gnu/java/nio/PipeImpl.P .deps/gnu/java/nio/SelectionKeyImpl.P \ -.deps/gnu/java/nio/SelectorImpl.P \ +.deps/gnu/java/nio/FileLockImpl.P .deps/gnu/java/nio/PipeImpl.P \ +.deps/gnu/java/nio/SelectionKeyImpl.P .deps/gnu/java/nio/SelectorImpl.P \ .deps/gnu/java/nio/SelectorProviderImpl.P \ .deps/gnu/java/nio/ServerSocketChannelImpl.P \ .deps/gnu/java/nio/SocketChannelImpl.P \ @@ -2995,9 +2994,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/nio/charset/UTF_16Decoder.P \ .deps/gnu/java/nio/charset/UTF_16Encoder.P \ .deps/gnu/java/nio/charset/UTF_16LE.P \ -.deps/gnu/java/nio/charset/UTF_8.P \ -.deps/gnu/java/nio/natFileChannelImpl.P \ -.deps/gnu/java/nio/natFileLockImpl.P \ +.deps/gnu/java/nio/charset/UTF_8.P .deps/gnu/java/nio/natFileLockImpl.P \ .deps/gnu/java/nio/natSelectorImpl.P \ .deps/gnu/java/rmi/RMIMarshalledObjectInputStream.P \ .deps/gnu/java/rmi/RMIMarshalledObjectOutputStream.P \ @@ -3527,6 +3524,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/nio/channels/ConnectionPendingException.P \ .deps/java/nio/channels/DatagramChannel.P \ .deps/java/nio/channels/FileChannel.P \ +.deps/java/nio/channels/FileChannelImpl.P \ .deps/java/nio/channels/FileLock.P \ .deps/java/nio/channels/FileLockInterruptionException.P \ .deps/java/nio/channels/GatheringByteChannel.P \ @@ -3550,6 +3548,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/nio/channels/UnresolvedAddressException.P \ .deps/java/nio/channels/UnsupportedAddressTypeException.P \ .deps/java/nio/channels/WritableByteChannel.P \ +.deps/java/nio/channels/natFileChannelImpl.P \ .deps/java/nio/channels/spi/AbstractInterruptibleChannel.P \ .deps/java/nio/channels/spi/AbstractSelectableChannel.P \ .deps/java/nio/channels/spi/AbstractSelectionKey.P \ diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java index e22a23a4326..4c599d11d1b 100644 --- a/libjava/java/io/FileInputStream.java +++ b/libjava/java/io/FileInputStream.java @@ -39,7 +39,7 @@ exception statement from your version. */ package java.io; import java.nio.channels.FileChannel; -import gnu.java.nio.FileChannelImpl; +import java.nio.channels.FileChannelImpl; /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 diff --git a/libjava/java/io/FileOutputStream.java b/libjava/java/io/FileOutputStream.java index 12543506643..f0d34e3fe5a 100644 --- a/libjava/java/io/FileOutputStream.java +++ b/libjava/java/io/FileOutputStream.java @@ -39,7 +39,7 @@ exception statement from your version. */ package java.io; import java.nio.channels.FileChannel; -import gnu.java.nio.FileChannelImpl; +import java.nio.channels.FileChannelImpl; /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 diff --git a/libjava/java/io/RandomAccessFile.java b/libjava/java/io/RandomAccessFile.java index 08fedb0e095..de00f4d141c 100644 --- a/libjava/java/io/RandomAccessFile.java +++ b/libjava/java/io/RandomAccessFile.java @@ -39,7 +39,7 @@ exception statement from your version. */ package java.io; import java.nio.channels.FileChannel; -import gnu.java.nio.FileChannelImpl; +import java.nio.channels.FileChannelImpl; /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 diff --git a/libjava/java/nio/MappedByteBufferImpl.java b/libjava/java/nio/MappedByteBufferImpl.java index 422794872b7..f28f1137535 100644 --- a/libjava/java/nio/MappedByteBufferImpl.java +++ b/libjava/java/nio/MappedByteBufferImpl.java @@ -38,8 +38,8 @@ exception statement from your version. */ package java.nio; -import gnu.java.nio.FileChannelImpl; import java.io.IOException; +import java.nio.channels.FileChannelImpl; import gnu.gcj.RawData; public class MappedByteBufferImpl extends MappedByteBuffer diff --git a/libjava/gnu/java/nio/FileChannelImpl.java b/libjava/java/nio/channels/FileChannelImpl.java similarity index 96% rename from libjava/gnu/java/nio/FileChannelImpl.java rename to libjava/java/nio/channels/FileChannelImpl.java index 943bdd78652..9d610551a37 100644 --- a/libjava/gnu/java/nio/FileChannelImpl.java +++ b/libjava/java/nio/channels/FileChannelImpl.java @@ -36,7 +36,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -package gnu.java.nio; +package java.nio.channels; import java.io.EOFException; import java.io.FileDescriptor; @@ -47,13 +47,6 @@ import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.MappedByteBufferImpl; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.FileChannel; -import java.nio.channels.FileLock; -import java.nio.channels.NonReadableChannelException; -import java.nio.channels.NonWritableChannelException; -import java.nio.channels.ReadableByteChannel; -import java.nio.channels.WritableByteChannel; import gnu.gcj.RawData; /** diff --git a/libjava/gnu/java/nio/natFileChannelImpl.cc b/libjava/java/nio/channels/natFileChannelImpl.cc similarity index 56% rename from libjava/gnu/java/nio/natFileChannelImpl.cc rename to libjava/java/nio/channels/natFileChannelImpl.cc index 6119775d55a..8dbbd141e60 100644 --- a/libjava/gnu/java/nio/natFileChannelImpl.cc +++ b/libjava/java/nio/channels/natFileChannelImpl.cc @@ -25,70 +25,70 @@ details. */ #endif #include -#include #include #include #include #include +#include jlong -gnu::java::nio::FileChannelImpl::size () +java::nio::channels::FileChannelImpl::size () { return fd->getLength (); } jlong -gnu::java::nio::FileChannelImpl::implPosition () +java::nio::channels::FileChannelImpl::implPosition () { return fd->getFilePointer (); } java::nio::channels::FileChannel* -gnu::java::nio::FileChannelImpl::implPosition (jlong newPosition) +java::nio::channels::FileChannelImpl::implPosition (jlong newPosition) { fd->seek (newPosition, ::java::io::FileDescriptor::SET, true); return this; } jint -gnu::java::nio::FileChannelImpl::implRead (JArray* buffer, - jint offset, jint len) +java::nio::channels::FileChannelImpl::implRead (JArray* buffer, + jint offset, jint len) { return fd->read (buffer, offset, len); } jint -gnu::java::nio::FileChannelImpl::implWrite (JArray* buffer, - jint offset, jint len) +java::nio::channels::FileChannelImpl::implWrite (JArray* buffer, + jint offset, jint len) { fd->write (buffer, offset, len); return len; } java::nio::channels::FileChannel* -gnu::java::nio::FileChannelImpl::implTruncate (jlong size) +java::nio::channels::FileChannelImpl::implTruncate (jlong size) { fd->setLength (size); return this; } gnu::gcj::RawData* -gnu::java::nio::FileChannelImpl::nio_mmap_file (jlong /*pos*/, jlong /*size*/, - jint /*mode*/) +java::nio::channels::FileChannelImpl::nio_mmap_file (jlong /*pos*/, jlong /*size*/, + jint /*mode*/) { throw new ::java::io::IOException (JvNewStringUTF ("mmap not implemented")); } void -gnu::java::nio::FileChannelImpl::nio_unmmap_file (gnu::gcj::RawData* /*address*/, - jint /*size*/) +java::nio::channels::FileChannelImpl::nio_unmmap_file (gnu::gcj::RawData* /*address*/, + jint /*size*/) { throw new ::java::io::IOException (JvNewStringUTF ("munmap not implemented")); } void -gnu::java::nio::FileChannelImpl::nio_msync (gnu::gcj::RawData* /*map_address*/, - jint /*length*/) +java::nio::channels::FileChannelImpl::nio_msync (gnu::gcj::RawData* /*map_address*/, + jint /*length*/) { throw new ::java::io::IOException (JvNewStringUTF ("msync not implemented")); }