From 3a5eb28322868f15d7daab0f97a5b6833632c854 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 20 May 2003 08:58:31 +0000 Subject: [PATCH] ByteBufferImpl.java, [...]: Moved files to java/nio. 2003-05-20 Michael Koch * gnu/java/nio/ByteBufferImpl.java, gnu/java/nio/CharBufferImpl.java, gnu/java/nio/CharViewBufferImpl.java, gnu/java/nio/DirectByteBufferImpl.java, gnu/java/nio/DoubleBufferImpl.java, gnu/java/nio/DoubleViewBufferImpl.java, gnu/java/nio/FloatBufferImpl.java, gnu/java/nio/FloatViewBufferImpl.java, gnu/java/nio/IntBufferImpl.java, gnu/java/nio/IntViewBufferImpl.java, gnu/java/nio/LongBufferImpl.java, gnu/java/nio/LongViewBufferImpl.java, gnu/java/nio/natDirectByteBufferImpl.cc, gnu/java/nio/ShortBufferImpl.java, gnu/java/nio/ShortViewBufferImpl.java: Moved files to java/nio. * gnu/java/nio/SocketChannelImpl.java * java/nio/ByteBuffer.java, java/nio/CharBuffer.java, java/nio/DoubleBuffer.java, java/nio/FloatBuffer.java, java/nio/IntBuffer.java, java/nio/LongBuffer.java, java/nio/ShortBuffer.java: Dont import anything. * java/nio/ByteBufferImpl.java, java/nio/CharBufferImpl.java, java/nio/CharViewBufferImpl.java, java/nio/DirectByteBufferImpl.java, java/nio/DoubleBufferImpl.java, java/nio/DoubleViewBufferImpl.java, java/nio/FloatBufferImpl.java, java/nio/FloatViewBufferImpl.java, java/nio/IntBufferImpl.java, java/nio/IntViewBufferImpl.java, java/nio/LongBufferImpl.java, java/nio/LongViewBufferImpl.java, java/nio/natDirectByteBufferImpl.cc, java/nio/ShortBufferImpl.java, java/nio/ShortViewBufferImpl.java: Moved from gnu/java/nio. * Makefile.am (ordinary_java_source_files): Moved files from gnu/java/nio to java/nio. (nat_source_files): Moved natDirectByteBufferImpl.cc from gnu/java/nio to java/nio. * Makefile.in: Regenerated. From-SVN: r66990 --- libjava/ChangeLog | 51 ++++++++++ libjava/Makefile.am | 30 +++--- libjava/Makefile.in | 92 +++++++++---------- libjava/gnu/java/nio/SocketChannelImpl.java | 23 +++-- libjava/java/nio/ByteBuffer.java | 4 +- .../{gnu => }/java/nio/ByteBufferImpl.java | 23 +---- libjava/java/nio/CharBuffer.java | 3 +- .../{gnu => }/java/nio/CharBufferImpl.java | 7 +- .../java/nio/CharViewBufferImpl.java | 6 +- .../java/nio/DirectByteBufferImpl.java | 9 +- libjava/java/nio/DoubleBuffer.java | 3 +- .../{gnu => }/java/nio/DoubleBufferImpl.java | 7 +- .../java/nio/DoubleViewBufferImpl.java | 6 +- libjava/java/nio/FloatBuffer.java | 3 +- .../{gnu => }/java/nio/FloatBufferImpl.java | 7 +- .../java/nio/FloatViewBufferImpl.java | 6 +- libjava/java/nio/IntBuffer.java | 3 +- libjava/{gnu => }/java/nio/IntBufferImpl.java | 7 +- .../{gnu => }/java/nio/IntViewBufferImpl.java | 6 +- libjava/java/nio/LongBuffer.java | 3 +- .../{gnu => }/java/nio/LongBufferImpl.java | 7 +- .../java/nio/LongViewBufferImpl.java | 6 +- libjava/java/nio/ShortBuffer.java | 3 +- .../{gnu => }/java/nio/ShortBufferImpl.java | 7 +- .../java/nio/ShortViewBufferImpl.java | 6 +- .../java/nio/natDirectByteBufferImpl.cc | 10 +- 26 files changed, 145 insertions(+), 193 deletions(-) rename libjava/{gnu => }/java/nio/ByteBufferImpl.java (96%) rename libjava/{gnu => }/java/nio/CharBufferImpl.java (97%) rename libjava/{gnu => }/java/nio/CharViewBufferImpl.java (98%) rename libjava/{gnu => }/java/nio/DirectByteBufferImpl.java (98%) rename libjava/{gnu => }/java/nio/DoubleBufferImpl.java (96%) rename libjava/{gnu => }/java/nio/DoubleViewBufferImpl.java (97%) rename libjava/{gnu => }/java/nio/FloatBufferImpl.java (96%) rename libjava/{gnu => }/java/nio/FloatViewBufferImpl.java (97%) rename libjava/{gnu => }/java/nio/IntBufferImpl.java (96%) rename libjava/{gnu => }/java/nio/IntViewBufferImpl.java (97%) rename libjava/{gnu => }/java/nio/LongBufferImpl.java (96%) rename libjava/{gnu => }/java/nio/LongViewBufferImpl.java (97%) rename libjava/{gnu => }/java/nio/ShortBufferImpl.java (96%) rename libjava/{gnu => }/java/nio/ShortViewBufferImpl.java (97%) rename libjava/{gnu => }/java/nio/natDirectByteBufferImpl.cc (65%) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 459ef17af6a..470570294b1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,54 @@ +2003-05-20 Michael Koch + + * gnu/java/nio/ByteBufferImpl.java, + gnu/java/nio/CharBufferImpl.java, + gnu/java/nio/CharViewBufferImpl.java, + gnu/java/nio/DirectByteBufferImpl.java, + gnu/java/nio/DoubleBufferImpl.java, + gnu/java/nio/DoubleViewBufferImpl.java, + gnu/java/nio/FloatBufferImpl.java, + gnu/java/nio/FloatViewBufferImpl.java, + gnu/java/nio/IntBufferImpl.java, + gnu/java/nio/IntViewBufferImpl.java, + gnu/java/nio/LongBufferImpl.java, + gnu/java/nio/LongViewBufferImpl.java, + gnu/java/nio/natDirectByteBufferImpl.cc, + gnu/java/nio/ShortBufferImpl.java, + gnu/java/nio/ShortViewBufferImpl.java: + Moved files to java/nio. + * gnu/java/nio/SocketChannelImpl.java + + * java/nio/ByteBuffer.java, + java/nio/CharBuffer.java, + java/nio/DoubleBuffer.java, + java/nio/FloatBuffer.java, + java/nio/IntBuffer.java, + java/nio/LongBuffer.java, + java/nio/ShortBuffer.java: + Dont import anything. + * java/nio/ByteBufferImpl.java, + java/nio/CharBufferImpl.java, + java/nio/CharViewBufferImpl.java, + java/nio/DirectByteBufferImpl.java, + java/nio/DoubleBufferImpl.java, + java/nio/DoubleViewBufferImpl.java, + java/nio/FloatBufferImpl.java, + java/nio/FloatViewBufferImpl.java, + java/nio/IntBufferImpl.java, + java/nio/IntViewBufferImpl.java, + java/nio/LongBufferImpl.java, + java/nio/LongViewBufferImpl.java, + java/nio/natDirectByteBufferImpl.cc, + java/nio/ShortBufferImpl.java, + java/nio/ShortViewBufferImpl.java: + Moved from gnu/java/nio. + * Makefile.am + (ordinary_java_source_files): Moved files from gnu/java/nio to + java/nio. + (nat_source_files): Moved natDirectByteBufferImpl.cc from gnu/java/nio + to java/nio. + * Makefile.in: Regenerated. + 2003-05-19 Michael Koch * java/util/Calendar.java diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ff60cba7ec4..af64941ce95 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2096,29 +2096,15 @@ gnu/java/locale/LocaleInformation_zh_HK.java \ gnu/java/locale/LocaleInformation_zh_SG.java \ gnu/java/locale/LocaleInformation_zh_TW.java \ gnu/java/math/MPN.java \ -gnu/java/nio/ByteBufferImpl.java \ -gnu/java/nio/CharBufferImpl.java \ -gnu/java/nio/CharViewBufferImpl.java \ gnu/java/nio/DatagramChannelImpl.java \ -gnu/java/nio/DirectByteBufferImpl.java \ -gnu/java/nio/DoubleBufferImpl.java \ -gnu/java/nio/DoubleViewBufferImpl.java \ gnu/java/nio/FileChannelImpl.java \ gnu/java/nio/FileLockImpl.java \ -gnu/java/nio/FloatBufferImpl.java \ -gnu/java/nio/FloatViewBufferImpl.java \ -gnu/java/nio/IntBufferImpl.java \ -gnu/java/nio/IntViewBufferImpl.java \ -gnu/java/nio/LongBufferImpl.java \ -gnu/java/nio/LongViewBufferImpl.java \ gnu/java/nio/MappedByteFileBuffer.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectorImpl.java \ gnu/java/nio/SelectorProviderImpl.java \ gnu/java/nio/ServerSocketChannelImpl.java \ -gnu/java/nio/ShortBufferImpl.java \ -gnu/java/nio/ShortViewBufferImpl.java \ gnu/java/nio/SocketChannelImpl.java \ gnu/java/nio/charset/ISO_8859_1.java \ gnu/java/nio/charset/Provider.java \ @@ -2236,16 +2222,30 @@ java/nio/Buffer.java \ java/nio/BufferOverflowException.java \ java/nio/BufferUnderflowException.java \ java/nio/ByteBuffer.java \ +java/nio/ByteBufferImpl.java \ java/nio/ByteOrder.java \ java/nio/CharBuffer.java \ +java/nio/CharBufferImpl.java \ +java/nio/CharViewBufferImpl.java \ +java/nio/DirectByteBufferImpl.java \ java/nio/DoubleBuffer.java \ +java/nio/DoubleBufferImpl.java \ +java/nio/DoubleViewBufferImpl.java \ java/nio/FloatBuffer.java \ +java/nio/FloatBufferImpl.java \ +java/nio/FloatViewBufferImpl.java \ java/nio/IntBuffer.java \ +java/nio/IntBufferImpl.java \ +java/nio/IntViewBufferImpl.java \ java/nio/InvalidMarkException.java \ java/nio/LongBuffer.java \ +java/nio/LongBufferImpl.java \ +java/nio/LongViewBufferImpl.java \ java/nio/MappedByteBuffer.java \ java/nio/ReadOnlyBufferException.java \ java/nio/ShortBuffer.java \ +java/nio/ShortBufferImpl.java \ +java/nio/ShortViewBufferImpl.java \ java/nio/channels/AlreadyConnectedException.java \ java/nio/channels/AsynchronousCloseException.java \ java/nio/channels/ByteChannel.java \ @@ -2563,7 +2563,6 @@ gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natVMClassLoader.cc \ -gnu/java/nio/natDirectByteBufferImpl.cc \ gnu/java/nio/natFileChannelImpl.cc \ gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natMappedByteFileBuffer.cc \ @@ -2597,6 +2596,7 @@ java/net/natNetworkInterface.cc \ java/net/natInetAddress.cc \ java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainSocketImpl.cc \ +java/nio/natDirectByteBufferImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ java/util/natTimeZone.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 9fb912d7923..11d94d69067 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1858,29 +1858,15 @@ gnu/java/locale/LocaleInformation_zh_HK.java \ gnu/java/locale/LocaleInformation_zh_SG.java \ gnu/java/locale/LocaleInformation_zh_TW.java \ gnu/java/math/MPN.java \ -gnu/java/nio/ByteBufferImpl.java \ -gnu/java/nio/CharBufferImpl.java \ -gnu/java/nio/CharViewBufferImpl.java \ gnu/java/nio/DatagramChannelImpl.java \ -gnu/java/nio/DirectByteBufferImpl.java \ -gnu/java/nio/DoubleBufferImpl.java \ -gnu/java/nio/DoubleViewBufferImpl.java \ gnu/java/nio/FileChannelImpl.java \ gnu/java/nio/FileLockImpl.java \ -gnu/java/nio/FloatBufferImpl.java \ -gnu/java/nio/FloatViewBufferImpl.java \ -gnu/java/nio/IntBufferImpl.java \ -gnu/java/nio/IntViewBufferImpl.java \ -gnu/java/nio/LongBufferImpl.java \ -gnu/java/nio/LongViewBufferImpl.java \ gnu/java/nio/MappedByteFileBuffer.java \ gnu/java/nio/PipeImpl.java \ gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectorImpl.java \ gnu/java/nio/SelectorProviderImpl.java \ gnu/java/nio/ServerSocketChannelImpl.java \ -gnu/java/nio/ShortBufferImpl.java \ -gnu/java/nio/ShortViewBufferImpl.java \ gnu/java/nio/SocketChannelImpl.java \ gnu/java/nio/charset/ISO_8859_1.java \ gnu/java/nio/charset/Provider.java \ @@ -1998,16 +1984,30 @@ java/nio/Buffer.java \ java/nio/BufferOverflowException.java \ java/nio/BufferUnderflowException.java \ java/nio/ByteBuffer.java \ +java/nio/ByteBufferImpl.java \ java/nio/ByteOrder.java \ java/nio/CharBuffer.java \ +java/nio/CharBufferImpl.java \ +java/nio/CharViewBufferImpl.java \ +java/nio/DirectByteBufferImpl.java \ java/nio/DoubleBuffer.java \ +java/nio/DoubleBufferImpl.java \ +java/nio/DoubleViewBufferImpl.java \ java/nio/FloatBuffer.java \ +java/nio/FloatBufferImpl.java \ +java/nio/FloatViewBufferImpl.java \ java/nio/IntBuffer.java \ +java/nio/IntBufferImpl.java \ +java/nio/IntViewBufferImpl.java \ java/nio/InvalidMarkException.java \ java/nio/LongBuffer.java \ +java/nio/LongBufferImpl.java \ +java/nio/LongViewBufferImpl.java \ java/nio/MappedByteBuffer.java \ java/nio/ReadOnlyBufferException.java \ java/nio/ShortBuffer.java \ +java/nio/ShortBufferImpl.java \ +java/nio/ShortViewBufferImpl.java \ java/nio/channels/AlreadyConnectedException.java \ java/nio/channels/AsynchronousCloseException.java \ java/nio/channels/ByteChannel.java \ @@ -2324,7 +2324,6 @@ gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natVMClassLoader.cc \ -gnu/java/nio/natDirectByteBufferImpl.cc \ gnu/java/nio/natFileChannelImpl.cc \ gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natMappedByteFileBuffer.cc \ @@ -2358,6 +2357,7 @@ java/net/natNetworkInterface.cc \ java/net/natInetAddress.cc \ java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainSocketImpl.cc \ +java/nio/natDirectByteBufferImpl.cc \ java/text/natCollator.cc \ java/util/natResourceBundle.cc \ java/util/natTimeZone.cc \ @@ -2500,17 +2500,15 @@ gnu/gcj/io/shs.lo gnu/gcj/protocol/core/natCoreInputStream.lo \ 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/nio/natDirectByteBufferImpl.lo \ -gnu/java/nio/natFileChannelImpl.lo gnu/java/nio/natFileLockImpl.lo \ -gnu/java/nio/natMappedByteFileBuffer.lo gnu/java/nio/natSelectorImpl.lo \ -gnu/java/nio/natSocketChannelImpl.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/gcj/runtime/natVMClassLoader.lo gnu/java/nio/natFileChannelImpl.lo \ +gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natMappedByteFileBuffer.lo \ +gnu/java/nio/natSelectorImpl.lo gnu/java/nio/natSocketChannelImpl.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 \ @@ -2518,9 +2516,9 @@ 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/text/natCollator.lo java/util/natResourceBundle.lo \ -java/util/natTimeZone.lo java/util/zip/natDeflater.lo \ -java/util/zip/natInflater.lo +java/nio/natDirectByteBufferImpl.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 = lib_org_xml_sax_la_LIBADD = lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \ @@ -2673,7 +2671,7 @@ libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ @@ -2965,26 +2963,12 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/gnu/java/locale/LocaleInformation_zh_HK.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/ByteBufferImpl.P \ -.deps/gnu/java/nio/CharBufferImpl.P \ -.deps/gnu/java/nio/CharViewBufferImpl.P \ -.deps/gnu/java/nio/DatagramChannelImpl.P \ -.deps/gnu/java/nio/DirectByteBufferImpl.P \ -.deps/gnu/java/nio/DoubleBufferImpl.P \ -.deps/gnu/java/nio/DoubleViewBufferImpl.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/FloatBufferImpl.P \ -.deps/gnu/java/nio/FloatViewBufferImpl.P \ -.deps/gnu/java/nio/IntBufferImpl.P \ -.deps/gnu/java/nio/IntViewBufferImpl.P \ -.deps/gnu/java/nio/LongBufferImpl.P \ -.deps/gnu/java/nio/LongViewBufferImpl.P \ .deps/gnu/java/nio/MappedByteFileBuffer.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/ShortBufferImpl.P \ -.deps/gnu/java/nio/ShortViewBufferImpl.P \ .deps/gnu/java/nio/SocketChannelImpl.P \ .deps/gnu/java/nio/charset/ISO_8859_1.P \ .deps/gnu/java/nio/charset/Provider.P \ @@ -2995,7 +2979,6 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.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/natDirectByteBufferImpl.P \ .deps/gnu/java/nio/natFileChannelImpl.P \ .deps/gnu/java/nio/natFileLockImpl.P \ .deps/gnu/java/nio/natMappedByteFileBuffer.P \ @@ -3505,11 +3488,19 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/net/natPlainSocketImpl.P .deps/java/nio/Buffer.P \ .deps/java/nio/BufferOverflowException.P \ .deps/java/nio/BufferUnderflowException.P .deps/java/nio/ByteBuffer.P \ -.deps/java/nio/ByteOrder.P .deps/java/nio/CharBuffer.P \ -.deps/java/nio/DoubleBuffer.P .deps/java/nio/FloatBuffer.P \ -.deps/java/nio/IntBuffer.P .deps/java/nio/InvalidMarkException.P \ -.deps/java/nio/LongBuffer.P .deps/java/nio/MappedByteBuffer.P \ +.deps/java/nio/ByteBufferImpl.P .deps/java/nio/ByteOrder.P \ +.deps/java/nio/CharBuffer.P .deps/java/nio/CharBufferImpl.P \ +.deps/java/nio/CharViewBufferImpl.P \ +.deps/java/nio/DirectByteBufferImpl.P .deps/java/nio/DoubleBuffer.P \ +.deps/java/nio/DoubleBufferImpl.P .deps/java/nio/DoubleViewBufferImpl.P \ +.deps/java/nio/FloatBuffer.P .deps/java/nio/FloatBufferImpl.P \ +.deps/java/nio/FloatViewBufferImpl.P .deps/java/nio/IntBuffer.P \ +.deps/java/nio/IntBufferImpl.P .deps/java/nio/IntViewBufferImpl.P \ +.deps/java/nio/InvalidMarkException.P .deps/java/nio/LongBuffer.P \ +.deps/java/nio/LongBufferImpl.P .deps/java/nio/LongViewBufferImpl.P \ +.deps/java/nio/MappedByteBuffer.P \ .deps/java/nio/ReadOnlyBufferException.P .deps/java/nio/ShortBuffer.P \ +.deps/java/nio/ShortBufferImpl.P .deps/java/nio/ShortViewBufferImpl.P \ .deps/java/nio/channels/AlreadyConnectedException.P \ .deps/java/nio/channels/AsynchronousCloseException.P \ .deps/java/nio/channels/ByteChannel.P \ @@ -3561,6 +3552,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/nio/charset/UnmappableCharacterException.P \ .deps/java/nio/charset/UnsupportedCharsetException.P \ .deps/java/nio/charset/spi/CharsetProvider.P \ +.deps/java/nio/natDirectByteBufferImpl.P \ .deps/java/rmi/AccessException.P .deps/java/rmi/AlreadyBoundException.P \ .deps/java/rmi/ConnectException.P .deps/java/rmi/ConnectIOException.P \ .deps/java/rmi/MarshalException.P .deps/java/rmi/MarshalledObject.P \ diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java index 65ca62341ae..48cf585cb05 100644 --- a/libjava/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/gnu/java/nio/SocketChannelImpl.java @@ -194,20 +194,19 @@ public class SocketChannelImpl extends SocketChannel int bytes = 0; int len = src.position(); - if (src instanceof ByteBufferImpl) - { - ByteBufferImpl bi = (ByteBufferImpl) src; - byte[]b = bi.array(); - bytes = SocketWrite(fd, b, 0, len); - } + if (src.hasArray ()) + { + byte[] b = src.array (); + bytes = SocketWrite (fd, b, 0, len); + } else - { - byte[]b = new byte[len]; - src.get(b, 0, len); - bytes = SocketWrite(fd, b, 0, len); - } + { + byte[] b = new byte [len]; + src.get (b, 0, len); + bytes = SocketWrite (fd, b, 0, len); + } - return bytes; + return bytes; } public long write (ByteBuffer[] srcs, int offset, int length) diff --git a/libjava/java/nio/ByteBuffer.java b/libjava/java/nio/ByteBuffer.java index cb743c799c7..1727b410079 100644 --- a/libjava/java/nio/ByteBuffer.java +++ b/libjava/java/nio/ByteBuffer.java @@ -35,10 +35,8 @@ 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; -import gnu.java.nio.ByteBufferImpl; -import gnu.java.nio.DirectByteBufferImpl; +package java.nio; /** * @since 1.4 diff --git a/libjava/gnu/java/nio/ByteBufferImpl.java b/libjava/java/nio/ByteBufferImpl.java similarity index 96% rename from libjava/gnu/java/nio/ByteBufferImpl.java rename to libjava/java/nio/ByteBufferImpl.java index f9de8c7d152..4642288e79a 100644 --- a/libjava/gnu/java/nio/ByteBufferImpl.java +++ b/libjava/java/nio/ByteBufferImpl.java @@ -36,16 +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; - -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.nio.DoubleBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.LongBuffer; -import java.nio.ReadOnlyBufferException; -import java.nio.ShortBuffer; +package java.nio; /** * This is a Heap memory implementation @@ -65,18 +56,6 @@ public final class ByteBufferImpl extends ByteBuffer this.readOnly = readOnly; } - public ByteBufferImpl (ByteBufferImpl copy) - { - super (copy.capacity (), copy.limit (), copy.position (), 0); - backing_buffer = copy.backing_buffer; - readOnly = copy.isReadOnly (); - } - - void inc_pos (int toAdd) - { - position (position () + toAdd); - } - public CharBuffer asCharBuffer () { return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ()); diff --git a/libjava/java/nio/CharBuffer.java b/libjava/java/nio/CharBuffer.java index 9b97b4a6fee..15a53570979 100644 --- a/libjava/java/nio/CharBuffer.java +++ b/libjava/java/nio/CharBuffer.java @@ -35,9 +35,8 @@ 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; -import gnu.java.nio.CharBufferImpl; +package java.nio; /** * @since 1.4 diff --git a/libjava/gnu/java/nio/CharBufferImpl.java b/libjava/java/nio/CharBufferImpl.java similarity index 97% rename from libjava/gnu/java/nio/CharBufferImpl.java rename to libjava/java/nio/CharBufferImpl.java index fcf0e15e474..708ab403f54 100644 --- a/libjava/gnu/java/nio/CharBufferImpl.java +++ b/libjava/java/nio/CharBufferImpl.java @@ -36,12 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.CharBuffer; -import java.nio.ReadOnlyBufferException; +package java.nio; /** * This is a Heap memory implementation diff --git a/libjava/gnu/java/nio/CharViewBufferImpl.java b/libjava/java/nio/CharViewBufferImpl.java similarity index 98% rename from libjava/gnu/java/nio/CharViewBufferImpl.java rename to libjava/java/nio/CharViewBufferImpl.java index 7280de50904..6da6d59afeb 100644 --- a/libjava/gnu/java/nio/CharViewBufferImpl.java +++ b/libjava/java/nio/CharViewBufferImpl.java @@ -36,11 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.CharBuffer; +package java.nio; class CharViewBufferImpl extends CharBuffer { diff --git a/libjava/gnu/java/nio/DirectByteBufferImpl.java b/libjava/java/nio/DirectByteBufferImpl.java similarity index 98% rename from libjava/gnu/java/nio/DirectByteBufferImpl.java rename to libjava/java/nio/DirectByteBufferImpl.java index d214f0c4d83..b037385c4af 100644 --- a/libjava/gnu/java/nio/DirectByteBufferImpl.java +++ b/libjava/java/nio/DirectByteBufferImpl.java @@ -36,15 +36,8 @@ 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; -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.nio.DoubleBuffer; -import java.nio.FloatBuffer; -import java.nio.IntBuffer; -import java.nio.LongBuffer; -import java.nio.ShortBuffer; import gnu.gcj.RawData; public class DirectByteBufferImpl extends ByteBuffer diff --git a/libjava/java/nio/DoubleBuffer.java b/libjava/java/nio/DoubleBuffer.java index f212566111c..644f33ba6d5 100644 --- a/libjava/java/nio/DoubleBuffer.java +++ b/libjava/java/nio/DoubleBuffer.java @@ -35,9 +35,8 @@ 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; -import gnu.java.nio.DoubleBufferImpl; +package java.nio; /** * @since 1.4 diff --git a/libjava/gnu/java/nio/DoubleBufferImpl.java b/libjava/java/nio/DoubleBufferImpl.java similarity index 96% rename from libjava/gnu/java/nio/DoubleBufferImpl.java rename to libjava/java/nio/DoubleBufferImpl.java index dc809598238..dbc63bbad29 100644 --- a/libjava/gnu/java/nio/DoubleBufferImpl.java +++ b/libjava/java/nio/DoubleBufferImpl.java @@ -36,12 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.DoubleBuffer; -import java.nio.ReadOnlyBufferException; +package java.nio; /** * This is a Heap memory implementation diff --git a/libjava/gnu/java/nio/DoubleViewBufferImpl.java b/libjava/java/nio/DoubleViewBufferImpl.java similarity index 97% rename from libjava/gnu/java/nio/DoubleViewBufferImpl.java rename to libjava/java/nio/DoubleViewBufferImpl.java index d9e1b1b6179..480b97f6d03 100644 --- a/libjava/gnu/java/nio/DoubleViewBufferImpl.java +++ b/libjava/java/nio/DoubleViewBufferImpl.java @@ -36,11 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.DoubleBuffer; +package java.nio; class DoubleViewBufferImpl extends DoubleBuffer { diff --git a/libjava/java/nio/FloatBuffer.java b/libjava/java/nio/FloatBuffer.java index 65d680bb108..5fcfc8e6ec5 100644 --- a/libjava/java/nio/FloatBuffer.java +++ b/libjava/java/nio/FloatBuffer.java @@ -35,9 +35,8 @@ 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; -import gnu.java.nio.FloatBufferImpl; +package java.nio; /** * @since 1.4 diff --git a/libjava/gnu/java/nio/FloatBufferImpl.java b/libjava/java/nio/FloatBufferImpl.java similarity index 96% rename from libjava/gnu/java/nio/FloatBufferImpl.java rename to libjava/java/nio/FloatBufferImpl.java index 69acecf52fe..93dd1d0b35a 100644 --- a/libjava/gnu/java/nio/FloatBufferImpl.java +++ b/libjava/java/nio/FloatBufferImpl.java @@ -36,12 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; -import java.nio.ReadOnlyBufferException; +package java.nio; /** * This is a Heap memory implementation diff --git a/libjava/gnu/java/nio/FloatViewBufferImpl.java b/libjava/java/nio/FloatViewBufferImpl.java similarity index 97% rename from libjava/gnu/java/nio/FloatViewBufferImpl.java rename to libjava/java/nio/FloatViewBufferImpl.java index 946120341a8..e44cd5e18fd 100644 --- a/libjava/gnu/java/nio/FloatViewBufferImpl.java +++ b/libjava/java/nio/FloatViewBufferImpl.java @@ -36,11 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; +package java.nio; class FloatViewBufferImpl extends FloatBuffer { diff --git a/libjava/java/nio/IntBuffer.java b/libjava/java/nio/IntBuffer.java index c8e0d0f4b9c..79167859541 100644 --- a/libjava/java/nio/IntBuffer.java +++ b/libjava/java/nio/IntBuffer.java @@ -35,9 +35,8 @@ 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; -import gnu.java.nio.IntBufferImpl; +package java.nio; /** * @since 1.4 diff --git a/libjava/gnu/java/nio/IntBufferImpl.java b/libjava/java/nio/IntBufferImpl.java similarity index 96% rename from libjava/gnu/java/nio/IntBufferImpl.java rename to libjava/java/nio/IntBufferImpl.java index 573e5e0372b..ebf33ecbc51 100644 --- a/libjava/gnu/java/nio/IntBufferImpl.java +++ b/libjava/java/nio/IntBufferImpl.java @@ -36,12 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.IntBuffer; -import java.nio.ReadOnlyBufferException; +package java.nio; /** * This is a Heap memory implementation diff --git a/libjava/gnu/java/nio/IntViewBufferImpl.java b/libjava/java/nio/IntViewBufferImpl.java similarity index 97% rename from libjava/gnu/java/nio/IntViewBufferImpl.java rename to libjava/java/nio/IntViewBufferImpl.java index d049eb3f55e..e60f3cb99a4 100644 --- a/libjava/gnu/java/nio/IntViewBufferImpl.java +++ b/libjava/java/nio/IntViewBufferImpl.java @@ -36,11 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.IntBuffer; +package java.nio; class IntViewBufferImpl extends IntBuffer { diff --git a/libjava/java/nio/LongBuffer.java b/libjava/java/nio/LongBuffer.java index 8808fd5f507..a39a83d94e8 100644 --- a/libjava/java/nio/LongBuffer.java +++ b/libjava/java/nio/LongBuffer.java @@ -35,9 +35,8 @@ 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; -import gnu.java.nio.LongBufferImpl; +package java.nio; /** * @since 1.4 diff --git a/libjava/gnu/java/nio/LongBufferImpl.java b/libjava/java/nio/LongBufferImpl.java similarity index 96% rename from libjava/gnu/java/nio/LongBufferImpl.java rename to libjava/java/nio/LongBufferImpl.java index e37ac8e4b2c..08d4ac5486f 100644 --- a/libjava/gnu/java/nio/LongBufferImpl.java +++ b/libjava/java/nio/LongBufferImpl.java @@ -36,12 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.LongBuffer; -import java.nio.ReadOnlyBufferException; +package java.nio; /** * This is a Heap memory implementation diff --git a/libjava/gnu/java/nio/LongViewBufferImpl.java b/libjava/java/nio/LongViewBufferImpl.java similarity index 97% rename from libjava/gnu/java/nio/LongViewBufferImpl.java rename to libjava/java/nio/LongViewBufferImpl.java index 3742fca1d0b..c7ada48658f 100644 --- a/libjava/gnu/java/nio/LongViewBufferImpl.java +++ b/libjava/java/nio/LongViewBufferImpl.java @@ -36,11 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.LongBuffer; +package java.nio; class LongViewBufferImpl extends LongBuffer { diff --git a/libjava/java/nio/ShortBuffer.java b/libjava/java/nio/ShortBuffer.java index db14b483b66..6bd3de9c755 100644 --- a/libjava/java/nio/ShortBuffer.java +++ b/libjava/java/nio/ShortBuffer.java @@ -35,9 +35,8 @@ 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; -import gnu.java.nio.ShortBufferImpl; +package java.nio; /** * @since 1.4 diff --git a/libjava/gnu/java/nio/ShortBufferImpl.java b/libjava/java/nio/ShortBufferImpl.java similarity index 96% rename from libjava/gnu/java/nio/ShortBufferImpl.java rename to libjava/java/nio/ShortBufferImpl.java index 3dc625e1158..fcfbee64f96 100644 --- a/libjava/gnu/java/nio/ShortBufferImpl.java +++ b/libjava/java/nio/ShortBufferImpl.java @@ -36,12 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.ShortBuffer; -import java.nio.ReadOnlyBufferException; +package java.nio; /** * This is a Heap memory implementation diff --git a/libjava/gnu/java/nio/ShortViewBufferImpl.java b/libjava/java/nio/ShortViewBufferImpl.java similarity index 97% rename from libjava/gnu/java/nio/ShortViewBufferImpl.java rename to libjava/java/nio/ShortViewBufferImpl.java index e7853bcfeb6..9594642ba89 100644 --- a/libjava/gnu/java/nio/ShortViewBufferImpl.java +++ b/libjava/java/nio/ShortViewBufferImpl.java @@ -36,11 +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; - -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.ShortBuffer; +package java.nio; class ShortViewBufferImpl extends ShortBuffer { diff --git a/libjava/gnu/java/nio/natDirectByteBufferImpl.cc b/libjava/java/nio/natDirectByteBufferImpl.cc similarity index 65% rename from libjava/gnu/java/nio/natDirectByteBufferImpl.cc rename to libjava/java/nio/natDirectByteBufferImpl.cc index 5fd6cfc63d0..82863900256 100644 --- a/libjava/gnu/java/nio/natDirectByteBufferImpl.cc +++ b/libjava/java/nio/natDirectByteBufferImpl.cc @@ -14,23 +14,23 @@ details. */ #include #include -#include +#include gnu::gcj::RawData* -gnu::java::nio::DirectByteBufferImpl::allocateImpl (jint capacity) +java::nio::DirectByteBufferImpl::allocateImpl (jint /*capacity*/) { // FIXME: implement this return 0; } void -gnu::java::nio::DirectByteBufferImpl::freeImpl (gnu::gcj::RawData* address) +java::nio::DirectByteBufferImpl::freeImpl (gnu::gcj::RawData* /*address*/) { // FIXME: implement this } jbyte -gnu::java::nio::DirectByteBufferImpl::getImpl (jint index) +java::nio::DirectByteBufferImpl::getImpl (jint /*index*/) { // FIXME: implement this // Dont forget: add offset to index @@ -38,7 +38,7 @@ gnu::java::nio::DirectByteBufferImpl::getImpl (jint index) } void -gnu::java::nio::DirectByteBufferImpl::putImpl (jint index, jbyte value) +java::nio::DirectByteBufferImpl::putImpl (jint /*index*/, jbyte /*value*/) { // FIXME: implement this // Dont forget: add offset to index -- 2.30.2