Skip to content

R
riscv-gcc-1
Commit 3a5eb283 by Michael Koch Committed by Michael Koch
Options

ByteBufferImpl.java, [...]: Moved files to java/nio. 

2003-05-20  Michael Koch  <konqueror@gmx.de>

	* 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
parent 1db0418a
Showing with 145 additions and 193 deletions
libjava/ChangeLog
2003-05-20 Michael Koch <konqueror@gmx.de>
* 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 <konqueror@gmx.de> 2003-05-19 Michael Koch <konqueror@gmx.de>
* java/util/Calendar.java * java/util/Calendar.java
......
libjava/Makefile.am
...@@ -2096,29 +2096,15 @@ gnu/java/locale/LocaleInformation_zh_HK.java \ ...@@ -2096,29 +2096,15 @@ gnu/java/locale/LocaleInformation_zh_HK.java \
gnu/java/locale/LocaleInformation_zh_SG.java \ gnu/java/locale/LocaleInformation_zh_SG.java \
gnu/java/locale/LocaleInformation_zh_TW.java \ gnu/java/locale/LocaleInformation_zh_TW.java \
gnu/java/math/MPN.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/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/FileChannelImpl.java \
gnu/java/nio/FileLockImpl.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/MappedByteFileBuffer.java \
gnu/java/nio/PipeImpl.java \ gnu/java/nio/PipeImpl.java \
gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectionKeyImpl.java \
gnu/java/nio/SelectorImpl.java \ gnu/java/nio/SelectorImpl.java \
gnu/java/nio/SelectorProviderImpl.java \ gnu/java/nio/SelectorProviderImpl.java \
gnu/java/nio/ServerSocketChannelImpl.java \ gnu/java/nio/ServerSocketChannelImpl.java \
gnu/java/nio/ShortBufferImpl.java \
gnu/java/nio/ShortViewBufferImpl.java \
gnu/java/nio/SocketChannelImpl.java \ gnu/java/nio/SocketChannelImpl.java \
gnu/java/nio/charset/ISO_8859_1.java \ gnu/java/nio/charset/ISO_8859_1.java \
gnu/java/nio/charset/Provider.java \ gnu/java/nio/charset/Provider.java \
...@@ -2236,16 +2222,30 @@ java/nio/Buffer.java \ ...@@ -2236,16 +2222,30 @@ java/nio/Buffer.java \
java/nio/BufferOverflowException.java \ java/nio/BufferOverflowException.java \
java/nio/BufferUnderflowException.java \ java/nio/BufferUnderflowException.java \
java/nio/ByteBuffer.java \ java/nio/ByteBuffer.java \
java/nio/ByteBufferImpl.java \
java/nio/ByteOrder.java \ java/nio/ByteOrder.java \
java/nio/CharBuffer.java \ java/nio/CharBuffer.java \
java/nio/CharBufferImpl.java \
java/nio/CharViewBufferImpl.java \
java/nio/DirectByteBufferImpl.java \
java/nio/DoubleBuffer.java \ java/nio/DoubleBuffer.java \
java/nio/DoubleBufferImpl.java \
java/nio/DoubleViewBufferImpl.java \
java/nio/FloatBuffer.java \ java/nio/FloatBuffer.java \
java/nio/FloatBufferImpl.java \
java/nio/FloatViewBufferImpl.java \
java/nio/IntBuffer.java \ java/nio/IntBuffer.java \
java/nio/IntBufferImpl.java \
java/nio/IntViewBufferImpl.java \
java/nio/InvalidMarkException.java \ java/nio/InvalidMarkException.java \
java/nio/LongBuffer.java \ java/nio/LongBuffer.java \
java/nio/LongBufferImpl.java \
java/nio/LongViewBufferImpl.java \
java/nio/MappedByteBuffer.java \ java/nio/MappedByteBuffer.java \
java/nio/ReadOnlyBufferException.java \ java/nio/ReadOnlyBufferException.java \
java/nio/ShortBuffer.java \ java/nio/ShortBuffer.java \
java/nio/ShortBufferImpl.java \
java/nio/ShortViewBufferImpl.java \
java/nio/channels/AlreadyConnectedException.java \ java/nio/channels/AlreadyConnectedException.java \
java/nio/channels/AsynchronousCloseException.java \ java/nio/channels/AsynchronousCloseException.java \
java/nio/channels/ByteChannel.java \ java/nio/channels/ByteChannel.java \
...@@ -2563,7 +2563,6 @@ gnu/gcj/runtime/natSharedLibLoader.cc \ ...@@ -2563,7 +2563,6 @@ gnu/gcj/runtime/natSharedLibLoader.cc \
gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStackTrace.cc \
gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natStringBuffer.cc \
gnu/gcj/runtime/natVMClassLoader.cc \ gnu/gcj/runtime/natVMClassLoader.cc \
gnu/java/nio/natDirectByteBufferImpl.cc \
gnu/java/nio/natFileChannelImpl.cc \ gnu/java/nio/natFileChannelImpl.cc \
gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natFileLockImpl.cc \
gnu/java/nio/natMappedByteFileBuffer.cc \ gnu/java/nio/natMappedByteFileBuffer.cc \
...@@ -2597,6 +2596,7 @@ java/net/natNetworkInterface.cc \ ...@@ -2597,6 +2596,7 @@ java/net/natNetworkInterface.cc \
java/net/natInetAddress.cc \ java/net/natInetAddress.cc \
java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainDatagramSocketImpl.cc \
java/net/natPlainSocketImpl.cc \ java/net/natPlainSocketImpl.cc \
java/nio/natDirectByteBufferImpl.cc \
java/text/natCollator.cc \ java/text/natCollator.cc \
java/util/natResourceBundle.cc \ java/util/natResourceBundle.cc \
java/util/natTimeZone.cc \ java/util/natTimeZone.cc \
......
libjava/Makefile.in
...@@ -1858,29 +1858,15 @@ gnu/java/locale/LocaleInformation_zh_HK.java \ ...@@ -1858,29 +1858,15 @@ gnu/java/locale/LocaleInformation_zh_HK.java \
gnu/java/locale/LocaleInformation_zh_SG.java \ gnu/java/locale/LocaleInformation_zh_SG.java \
gnu/java/locale/LocaleInformation_zh_TW.java \ gnu/java/locale/LocaleInformation_zh_TW.java \
gnu/java/math/MPN.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/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/FileChannelImpl.java \
gnu/java/nio/FileLockImpl.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/MappedByteFileBuffer.java \
gnu/java/nio/PipeImpl.java \ gnu/java/nio/PipeImpl.java \
gnu/java/nio/SelectionKeyImpl.java \ gnu/java/nio/SelectionKeyImpl.java \
gnu/java/nio/SelectorImpl.java \ gnu/java/nio/SelectorImpl.java \
gnu/java/nio/SelectorProviderImpl.java \ gnu/java/nio/SelectorProviderImpl.java \
gnu/java/nio/ServerSocketChannelImpl.java \ gnu/java/nio/ServerSocketChannelImpl.java \
gnu/java/nio/ShortBufferImpl.java \
gnu/java/nio/ShortViewBufferImpl.java \
gnu/java/nio/SocketChannelImpl.java \ gnu/java/nio/SocketChannelImpl.java \
gnu/java/nio/charset/ISO_8859_1.java \ gnu/java/nio/charset/ISO_8859_1.java \
gnu/java/nio/charset/Provider.java \ gnu/java/nio/charset/Provider.java \
...@@ -1998,16 +1984,30 @@ java/nio/Buffer.java \ ...@@ -1998,16 +1984,30 @@ java/nio/Buffer.java \
java/nio/BufferOverflowException.java \ java/nio/BufferOverflowException.java \
java/nio/BufferUnderflowException.java \ java/nio/BufferUnderflowException.java \
java/nio/ByteBuffer.java \ java/nio/ByteBuffer.java \
java/nio/ByteBufferImpl.java \
java/nio/ByteOrder.java \ java/nio/ByteOrder.java \
java/nio/CharBuffer.java \ java/nio/CharBuffer.java \
java/nio/CharBufferImpl.java \
java/nio/CharViewBufferImpl.java \
java/nio/DirectByteBufferImpl.java \
java/nio/DoubleBuffer.java \ java/nio/DoubleBuffer.java \
java/nio/DoubleBufferImpl.java \
java/nio/DoubleViewBufferImpl.java \
java/nio/FloatBuffer.java \ java/nio/FloatBuffer.java \
java/nio/FloatBufferImpl.java \
java/nio/FloatViewBufferImpl.java \
java/nio/IntBuffer.java \ java/nio/IntBuffer.java \
java/nio/IntBufferImpl.java \
java/nio/IntViewBufferImpl.java \
java/nio/InvalidMarkException.java \ java/nio/InvalidMarkException.java \
java/nio/LongBuffer.java \ java/nio/LongBuffer.java \
java/nio/LongBufferImpl.java \
java/nio/LongViewBufferImpl.java \
java/nio/MappedByteBuffer.java \ java/nio/MappedByteBuffer.java \
java/nio/ReadOnlyBufferException.java \ java/nio/ReadOnlyBufferException.java \
java/nio/ShortBuffer.java \ java/nio/ShortBuffer.java \
java/nio/ShortBufferImpl.java \
java/nio/ShortViewBufferImpl.java \
java/nio/channels/AlreadyConnectedException.java \ java/nio/channels/AlreadyConnectedException.java \
java/nio/channels/AsynchronousCloseException.java \ java/nio/channels/AsynchronousCloseException.java \
java/nio/channels/ByteChannel.java \ java/nio/channels/ByteChannel.java \
...@@ -2324,7 +2324,6 @@ gnu/gcj/runtime/natSharedLibLoader.cc \ ...@@ -2324,7 +2324,6 @@ gnu/gcj/runtime/natSharedLibLoader.cc \
gnu/gcj/runtime/natStackTrace.cc \ gnu/gcj/runtime/natStackTrace.cc \
gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/runtime/natStringBuffer.cc \
gnu/gcj/runtime/natVMClassLoader.cc \ gnu/gcj/runtime/natVMClassLoader.cc \
gnu/java/nio/natDirectByteBufferImpl.cc \
gnu/java/nio/natFileChannelImpl.cc \ gnu/java/nio/natFileChannelImpl.cc \
gnu/java/nio/natFileLockImpl.cc \ gnu/java/nio/natFileLockImpl.cc \
gnu/java/nio/natMappedByteFileBuffer.cc \ gnu/java/nio/natMappedByteFileBuffer.cc \
...@@ -2358,6 +2357,7 @@ java/net/natNetworkInterface.cc \ ...@@ -2358,6 +2357,7 @@ java/net/natNetworkInterface.cc \
java/net/natInetAddress.cc \ java/net/natInetAddress.cc \
java/net/natPlainDatagramSocketImpl.cc \ java/net/natPlainDatagramSocketImpl.cc \
java/net/natPlainSocketImpl.cc \ java/net/natPlainSocketImpl.cc \
java/nio/natDirectByteBufferImpl.cc \
java/text/natCollator.cc \ java/text/natCollator.cc \
java/util/natResourceBundle.cc \ java/util/natResourceBundle.cc \
java/util/natTimeZone.cc \ java/util/natTimeZone.cc \
...@@ -2500,17 +2500,15 @@ gnu/gcj/io/shs.lo gnu/gcj/protocol/core/natCoreInputStream.lo \ ...@@ -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/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \
gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \ gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \
gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \ gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \
gnu/gcj/runtime/natVMClassLoader.lo \ gnu/gcj/runtime/natVMClassLoader.lo gnu/java/nio/natFileChannelImpl.lo \
gnu/java/nio/natDirectByteBufferImpl.lo \ gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natMappedByteFileBuffer.lo \
gnu/java/nio/natFileChannelImpl.lo gnu/java/nio/natFileLockImpl.lo \ gnu/java/nio/natSelectorImpl.lo gnu/java/nio/natSocketChannelImpl.lo \
gnu/java/nio/natMappedByteFileBuffer.lo gnu/java/nio/natSelectorImpl.lo \ java/io/natFile.lo java/io/natFileDescriptor.lo \
gnu/java/nio/natSocketChannelImpl.lo java/io/natFile.lo \ java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \
java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \ java/lang/natCharacter.lo java/lang/natClass.lo \
java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \ java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
java/lang/natClass.lo java/lang/natClassLoader.lo \ java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \
java/lang/natConcreteProcess.lo java/lang/natDouble.lo \ java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.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/natStringBuffer.lo java/lang/natSystem.lo \
java/lang/natThread.lo java/lang/natVMSecurityManager.lo \ java/lang/natThread.lo java/lang/natVMSecurityManager.lo \
java/lang/ref/natReference.lo java/lang/reflect/natArray.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 \ ...@@ -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/lang/reflect/natMethod.lo java/lang/reflect/natProxy.lo \
java/net/natNetworkInterface.lo java/net/natInetAddress.lo \ java/net/natNetworkInterface.lo java/net/natInetAddress.lo \
java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \ java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \
java/text/natCollator.lo java/util/natResourceBundle.lo \ java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \
java/util/natTimeZone.lo java/util/zip/natDeflater.lo \ java/util/natResourceBundle.lo java/util/natTimeZone.lo \
java/util/zip/natInflater.lo java/util/zip/natDeflater.lo java/util/zip/natInflater.lo
lib_org_xml_sax_la_LDFLAGS = lib_org_xml_sax_la_LDFLAGS =
lib_org_xml_sax_la_LIBADD = lib_org_xml_sax_la_LIBADD =
lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \ lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \
...@@ -2673,7 +2671,7 @@ libgcj-test.spec.in libgcj.spec.in ...@@ -2673,7 +2671,7 @@ libgcj-test.spec.in libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
...@@ -2965,26 +2963,12 @@ 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_HK.P \
.deps/gnu/java/locale/LocaleInformation_zh_SG.P \ .deps/gnu/java/locale/LocaleInformation_zh_SG.P \
.deps/gnu/java/locale/LocaleInformation_zh_TW.P \ .deps/gnu/java/locale/LocaleInformation_zh_TW.P \
.deps/gnu/java/math/MPN.P .deps/gnu/java/nio/ByteBufferImpl.P \ .deps/gnu/java/math/MPN.P .deps/gnu/java/nio/DatagramChannelImpl.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/nio/FileChannelImpl.P .deps/gnu/java/nio/FileLockImpl.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/MappedByteFileBuffer.P .deps/gnu/java/nio/PipeImpl.P \
.deps/gnu/java/nio/SelectionKeyImpl.P .deps/gnu/java/nio/SelectorImpl.P \ .deps/gnu/java/nio/SelectionKeyImpl.P .deps/gnu/java/nio/SelectorImpl.P \
.deps/gnu/java/nio/SelectorProviderImpl.P \ .deps/gnu/java/nio/SelectorProviderImpl.P \
.deps/gnu/java/nio/ServerSocketChannelImpl.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/SocketChannelImpl.P \
.deps/gnu/java/nio/charset/ISO_8859_1.P \ .deps/gnu/java/nio/charset/ISO_8859_1.P \
.deps/gnu/java/nio/charset/Provider.P \ .deps/gnu/java/nio/charset/Provider.P \
...@@ -2995,7 +2979,6 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.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_16Encoder.P \
.deps/gnu/java/nio/charset/UTF_16LE.P \ .deps/gnu/java/nio/charset/UTF_16LE.P \
.deps/gnu/java/nio/charset/UTF_8.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/natFileChannelImpl.P \
.deps/gnu/java/nio/natFileLockImpl.P \ .deps/gnu/java/nio/natFileLockImpl.P \
.deps/gnu/java/nio/natMappedByteFileBuffer.P \ .deps/gnu/java/nio/natMappedByteFileBuffer.P \
...@@ -3505,11 +3488,19 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.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/net/natPlainSocketImpl.P .deps/java/nio/Buffer.P \
.deps/java/nio/BufferOverflowException.P \ .deps/java/nio/BufferOverflowException.P \
.deps/java/nio/BufferUnderflowException.P .deps/java/nio/ByteBuffer.P \ .deps/java/nio/BufferUnderflowException.P .deps/java/nio/ByteBuffer.P \
.deps/java/nio/ByteOrder.P .deps/java/nio/CharBuffer.P \ .deps/java/nio/ByteBufferImpl.P .deps/java/nio/ByteOrder.P \
.deps/java/nio/DoubleBuffer.P .deps/java/nio/FloatBuffer.P \ .deps/java/nio/CharBuffer.P .deps/java/nio/CharBufferImpl.P \
.deps/java/nio/IntBuffer.P .deps/java/nio/InvalidMarkException.P \ .deps/java/nio/CharViewBufferImpl.P \
.deps/java/nio/LongBuffer.P .deps/java/nio/MappedByteBuffer.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/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/AlreadyConnectedException.P \
.deps/java/nio/channels/AsynchronousCloseException.P \ .deps/java/nio/channels/AsynchronousCloseException.P \
.deps/java/nio/channels/ByteChannel.P \ .deps/java/nio/channels/ByteChannel.P \
...@@ -3561,6 +3552,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.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/UnmappableCharacterException.P \
.deps/java/nio/charset/UnsupportedCharsetException.P \ .deps/java/nio/charset/UnsupportedCharsetException.P \
.deps/java/nio/charset/spi/CharsetProvider.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/AccessException.P .deps/java/rmi/AlreadyBoundException.P \
.deps/java/rmi/ConnectException.P .deps/java/rmi/ConnectIOException.P \ .deps/java/rmi/ConnectException.P .deps/java/rmi/ConnectIOException.P \
.deps/java/rmi/MarshalException.P .deps/java/rmi/MarshalledObject.P \ .deps/java/rmi/MarshalException.P .deps/java/rmi/MarshalledObject.P \
......
libjava/gnu/java/nio/SocketChannelImpl.java
...@@ -194,20 +194,19 @@ public class SocketChannelImpl extends SocketChannel ...@@ -194,20 +194,19 @@ public class SocketChannelImpl extends SocketChannel
int bytes = 0; int bytes = 0;
int len = src.position(); int len = src.position();
if (src instanceof ByteBufferImpl) if (src.hasArray ())
{ {
ByteBufferImpl bi = (ByteBufferImpl) src; byte[] b = src.array ();
byte[]b = bi.array(); bytes = SocketWrite (fd, b, 0, len);
bytes = SocketWrite(fd, b, 0, len); }
}
else else
{ {
byte[]b = new byte[len]; byte[] b = new byte [len];
src.get(b, 0, len); src.get (b, 0, len);
bytes = SocketWrite(fd, b, 0, len); bytes = SocketWrite (fd, b, 0, len);
} }
return bytes; return bytes;
} }
public long write (ByteBuffer[] srcs, int offset, int length) public long write (ByteBuffer[] srcs, int offset, int length)
......
libjava/java/nio/ByteBuffer.java
...@@ -35,10 +35,8 @@ this exception to your version of the library, but you are not ...@@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio;
import gnu.java.nio.ByteBufferImpl; package java.nio;
import gnu.java.nio.DirectByteBufferImpl;
/** /**
* @since 1.4 * @since 1.4
......
libjava/gnu/java/nio/ByteBufferImpl.java → libjava/java/nio/ByteBufferImpl.java
...@@ -36,16 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,16 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ 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.ReadOnlyBufferException;
import java.nio.ShortBuffer;
/** /**
* This is a Heap memory implementation * This is a Heap memory implementation
...@@ -65,18 +56,6 @@ public final class ByteBufferImpl extends ByteBuffer ...@@ -65,18 +56,6 @@ public final class ByteBufferImpl extends ByteBuffer
this.readOnly = readOnly; 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 () public CharBuffer asCharBuffer ()
{ {
return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ()); return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
......
libjava/java/nio/CharBuffer.java
...@@ -35,9 +35,8 @@ this exception to your version of the library, but you are not ...@@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio;
import gnu.java.nio.CharBufferImpl; package java.nio;
/** /**
* @since 1.4 * @since 1.4
......
libjava/gnu/java/nio/CharBufferImpl.java → libjava/java/nio/CharBufferImpl.java
...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.CharBuffer;
import java.nio.ReadOnlyBufferException;
/** /**
* This is a Heap memory implementation * This is a Heap memory implementation
......
libjava/gnu/java/nio/CharViewBufferImpl.java → libjava/java/nio/CharViewBufferImpl.java
...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.CharBuffer;
class CharViewBufferImpl extends CharBuffer class CharViewBufferImpl extends CharBuffer
{ {
......
libjava/gnu/java/nio/DirectByteBufferImpl.java → libjava/java/nio/DirectByteBufferImpl.java
...@@ -36,15 +36,8 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,15 +36,8 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ 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; import gnu.gcj.RawData;
public class DirectByteBufferImpl extends ByteBuffer public class DirectByteBufferImpl extends ByteBuffer
......
libjava/java/nio/DoubleBuffer.java
...@@ -35,9 +35,8 @@ this exception to your version of the library, but you are not ...@@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio;
import gnu.java.nio.DoubleBufferImpl; package java.nio;
/** /**
* @since 1.4 * @since 1.4
......
libjava/gnu/java/nio/DoubleBufferImpl.java → libjava/java/nio/DoubleBufferImpl.java
...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.DoubleBuffer;
import java.nio.ReadOnlyBufferException;
/** /**
* This is a Heap memory implementation * This is a Heap memory implementation
......
libjava/gnu/java/nio/DoubleViewBufferImpl.java → libjava/java/nio/DoubleViewBufferImpl.java
...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.DoubleBuffer;
class DoubleViewBufferImpl extends DoubleBuffer class DoubleViewBufferImpl extends DoubleBuffer
{ {
......
libjava/java/nio/FloatBuffer.java
...@@ -35,9 +35,8 @@ this exception to your version of the library, but you are not ...@@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio;
import gnu.java.nio.FloatBufferImpl; package java.nio;
/** /**
* @since 1.4 * @since 1.4
......
libjava/gnu/java/nio/FloatBufferImpl.java → libjava/java/nio/FloatBufferImpl.java
...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.nio.ReadOnlyBufferException;
/** /**
* This is a Heap memory implementation * This is a Heap memory implementation
......
libjava/gnu/java/nio/FloatViewBufferImpl.java → libjava/java/nio/FloatViewBufferImpl.java
...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
class FloatViewBufferImpl extends FloatBuffer class FloatViewBufferImpl extends FloatBuffer
{ {
......
libjava/java/nio/IntBuffer.java
...@@ -35,9 +35,8 @@ this exception to your version of the library, but you are not ...@@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio;
import gnu.java.nio.IntBufferImpl; package java.nio;
/** /**
* @since 1.4 * @since 1.4
......
libjava/gnu/java/nio/IntBufferImpl.java → libjava/java/nio/IntBufferImpl.java
...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.IntBuffer;
import java.nio.ReadOnlyBufferException;
/** /**
* This is a Heap memory implementation * This is a Heap memory implementation
......
libjava/gnu/java/nio/IntViewBufferImpl.java → libjava/java/nio/IntViewBufferImpl.java
...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.IntBuffer;
class IntViewBufferImpl extends IntBuffer class IntViewBufferImpl extends IntBuffer
{ {
......
libjava/java/nio/LongBuffer.java
...@@ -35,9 +35,8 @@ this exception to your version of the library, but you are not ...@@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio;
import gnu.java.nio.LongBufferImpl; package java.nio;
/** /**
* @since 1.4 * @since 1.4
......
libjava/gnu/java/nio/LongBufferImpl.java → libjava/java/nio/LongBufferImpl.java
...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.LongBuffer;
import java.nio.ReadOnlyBufferException;
/** /**
* This is a Heap memory implementation * This is a Heap memory implementation
......
libjava/gnu/java/nio/LongViewBufferImpl.java → libjava/java/nio/LongViewBufferImpl.java
...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.LongBuffer;
class LongViewBufferImpl extends LongBuffer class LongViewBufferImpl extends LongBuffer
{ {
......
libjava/java/nio/ShortBuffer.java
...@@ -35,9 +35,8 @@ this exception to your version of the library, but you are not ...@@ -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 obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package java.nio;
import gnu.java.nio.ShortBufferImpl; package java.nio;
/** /**
* @since 1.4 * @since 1.4
......
libjava/gnu/java/nio/ShortBufferImpl.java → libjava/java/nio/ShortBufferImpl.java
...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,12 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ShortBuffer;
import java.nio.ReadOnlyBufferException;
/** /**
* This is a Heap memory implementation * This is a Heap memory implementation
......
libjava/gnu/java/nio/ShortViewBufferImpl.java → libjava/java/nio/ShortViewBufferImpl.java
...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this ...@@ -36,11 +36,7 @@ obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */ exception statement from your version. */
package gnu.java.nio; package java.nio;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ShortBuffer;
class ShortViewBufferImpl extends ShortBuffer class ShortViewBufferImpl extends ShortBuffer
{ {
......
libjava/gnu/java/nio/natDirectByteBufferImpl.cc → libjava/java/nio/natDirectByteBufferImpl.cc
...@@ -14,23 +14,23 @@ details. */ ...@@ -14,23 +14,23 @@ details. */
#include <jvm.h> #include <jvm.h>
#include <gnu/gcj/RawData.h> #include <gnu/gcj/RawData.h>
#include <gnu/java/nio/DirectByteBufferImpl.h> #include <java/nio/DirectByteBufferImpl.h>
gnu::gcj::RawData* gnu::gcj::RawData*
gnu::java::nio::DirectByteBufferImpl::allocateImpl (jint capacity) java::nio::DirectByteBufferImpl::allocateImpl (jint /*capacity*/)
{ {
// FIXME: implement this // FIXME: implement this
return 0; return 0;
} }
void void
gnu::java::nio::DirectByteBufferImpl::freeImpl (gnu::gcj::RawData* address) java::nio::DirectByteBufferImpl::freeImpl (gnu::gcj::RawData* /*address*/)
{ {
// FIXME: implement this // FIXME: implement this
} }
jbyte jbyte
gnu::java::nio::DirectByteBufferImpl::getImpl (jint index) java::nio::DirectByteBufferImpl::getImpl (jint /*index*/)
{ {
// FIXME: implement this // FIXME: implement this
// Dont forget: add offset to index // Dont forget: add offset to index
...@@ -38,7 +38,7 @@ gnu::java::nio::DirectByteBufferImpl::getImpl (jint index) ...@@ -38,7 +38,7 @@ gnu::java::nio::DirectByteBufferImpl::getImpl (jint index)
} }
void void
gnu::java::nio::DirectByteBufferImpl::putImpl (jint index, jbyte value) java::nio::DirectByteBufferImpl::putImpl (jint /*index*/, jbyte /*value*/)
{ {
// FIXME: implement this // FIXME: implement this
// Dont forget: add offset to index // Dont forget: add offset to index
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment