harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r370460 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java: com/ibm/io/nio/ java/nio/
Date Thu, 19 Jan 2006 11:33:16 GMT
Author: tellison
Date: Thu Jan 19 03:31:59 2006
New Revision: 370460

URL: http://svn.apache.org/viewcvs?rev=370460&view=rev
Log:
Refactoring and visibility fixes to java.nio buffers to make them spec-compliant.
Details in HARMONY-26.

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BaseByteBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BaseByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BufferFactory.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BufferFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharSequenceAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharSequenceAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharToByteBufferAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffers.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatToByteBufferAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/HeapByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntToByteBufferAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongToByteBufferAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedToByteBufferAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyCharArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDirectByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDoubleArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFloatArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyHeapByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyIntArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyLongArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyShortArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteCharArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDirectByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDoubleArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFloatArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteHeapByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteIntArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteLongArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteShortArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortArrayBuffer.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java
      - copied, changed from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortToByteBufferAdapter.java
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BaseByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BufferFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharSequenceAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffers.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/HeapByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedToByteBufferAdapter.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyCharArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDirectByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDoubleArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFloatArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyHeapByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyIntArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyLongArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyShortArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteCharArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDirectByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDoubleArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFloatArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteHeapByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteIntArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteLongArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteShortArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortArrayBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortToByteBufferAdapter.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/Buffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortBuffer.java

Added: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java?rev=370460&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java Thu Jan 19 03:31:59 2006
@@ -0,0 +1,29 @@
+/* Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.ibm.io.nio;
+
+import com.ibm.platform.struct.PlatformAddress;
+
+public interface DirectBuffer {
+	public PlatformAddress getEffectiveAddress();
+    
+    public PlatformAddress getBaseAddress();
+    
+    public boolean isAddressValid();
+    
+    public void addressValidityCheck();
+    
+    public void free();
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java Thu Jan 19 03:31:59 2006
@@ -267,14 +267,13 @@
 		int bytesRead;
 		synchronized (repositioningLock) {
 			if (buffer.isDirect()) {
-				DirectByteBuffer directBuffer = (DirectByteBuffer) buffer;
+				DirectBuffer directBuffer = (DirectBuffer) buffer;
 				long address = directBuffer.getEffectiveAddress().toLong();
 				bytesRead = (int) fileSystem.readDirect(handle, address, buffer
 						.remaining());
 			} else {
-				HeapByteBuffer heapBuffer = (HeapByteBuffer) buffer;
-				bytesRead = (int) fileSystem.read(handle, heapBuffer.array(),
-						heapBuffer.arrayOffset(), buffer.remaining());
+				bytesRead = (int) fileSystem.read(handle, buffer.array(),
+						buffer.arrayOffset(), buffer.remaining());
 			}
 			if (bytesRead > 0) {
 				buffer.position(buffer.position() + bytesRead);
@@ -346,14 +345,13 @@
 		int bytesWritten;
 		synchronized (repositioningLock) {
 			if (buffer.isDirect()) {
-				DirectByteBuffer directBuffer = (DirectByteBuffer) buffer;
+				DirectBuffer directBuffer = (DirectBuffer) buffer;
 				long address = directBuffer.getEffectiveAddress().toLong();
 				bytesWritten = (int) fileSystem.writeDirect(handle, address,
 						buffer.remaining());
 			} else {
-				HeapByteBuffer heapBuffer = (HeapByteBuffer) buffer;
-				bytesWritten = (int) fileSystem.write(handle, heapBuffer
-						.array(), heapBuffer.arrayOffset(), buffer.remaining());
+				bytesWritten = (int) fileSystem.write(handle, buffer
+						.array(), buffer.arrayOffset(), buffer.remaining());
 			}
 			if (bytesWritten > 0) {
 				buffer.position(buffer.position() + bytesWritten);

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BaseByteBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BaseByteBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BaseByteBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BaseByteBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BaseByteBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BaseByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BaseByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,15 +13,8 @@
  * limitations under the License.
  */
 
-package com.ibm.io.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;
 
 /**
  * Serves as the root of other byte buffer impl classes, implements common

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/Buffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/Buffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/Buffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/Buffer.java Thu Jan 19 03:31:59 2006
@@ -52,31 +52,31 @@
 	/**
 	 * <code>UNSET_MARK</code> means the mark has not been set.
 	 */
-	protected final static int UNSET_MARK = -1;
+	final static int UNSET_MARK = -1;
 
 	/**
 	 * The capacity of this buffer, which never change.
 	 */
-	protected final int capacity;
+	final int capacity;
 
 	/**
 	 * <code>limit - 1</code> is the last element that can be read or write.
 	 * Limit must be no less than zero and no greater than <code>capacity</code>.
 	 */
-	protected int limit;
+	int limit;
 
 	/**
 	 * Mark is the position will be set when <code>reset()</code> is called.
 	 * Mark is not set by default. Mark is always no less than zero and no
 	 * greater than <code>position</code>.
 	 */
-	protected int mark = UNSET_MARK;
+	int mark = UNSET_MARK;
 
 	/**
 	 * The current position of this buffer. Position is always no less than zero
 	 * and no greater than <code>limit</code>.
 	 */
-	protected int position = 0;
+	int position = 0;
 
 	/**
 	 * Construct a buffer with the specified capacity.
@@ -84,7 +84,7 @@
 	 * @param capacity
 	 *            The capacity of this buffer
 	 */
-	protected Buffer(int capacity) {
+	Buffer(int capacity) {
 		super();
 		if (capacity < 0) {
 			throw new IllegalArgumentException();

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BufferFactory.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BufferFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BufferFactory.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BufferFactory.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BufferFactory.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/BufferFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/BufferFactory.java Thu Jan 19 03:31:59 2006
@@ -13,18 +13,10 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
 import java.io.File;
-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.MappedByteBuffer;
-import java.nio.ShortBuffer;
 import java.nio.channels.FileChannel.MapMode;
 
 /**
@@ -36,7 +28,7 @@
  * </p>
  * 
  */
-public final class BufferFactory {
+final class BufferFactory {
 
 	/**
 	 * Returns a new byte buffer based on the specified byte array.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -16,7 +16,6 @@
 package java.nio;
 
 
-import com.ibm.io.nio.BufferFactory;
 import com.ibm.platform.Endianness;
 
 /**
@@ -119,14 +118,14 @@
 	/**
 	 * The byte order of this buffer, default is <code>BIG_ENDIAN</code>.
 	 */
-	protected Endianness order = Endianness.BIG_ENDIAN;
+	Endianness order = Endianness.BIG_ENDIAN;
 
 	/**
 	 * Constructs a <code>ByteBuffer</code> with given capacity.
 	 * 
 	 * @param capacity  The capacity of the buffer
 	 */
-	protected ByteBuffer(int capacity) {
+	ByteBuffer(int capacity) {
 		super(capacity);
 	}
 
@@ -694,7 +693,7 @@
 	 * @param byteOrder     The byte order to set
 	 * @return This buffer
 	 */
-	public ByteBuffer order(ByteOrder byteOrder) {
+	public final ByteBuffer order(ByteOrder byteOrder) {
 		/*
 		 * This method is not 'final', because MappedToByteBufferAdapter 
 		 * needs to override this method.
@@ -712,21 +711,21 @@
 	 * 
 	 * @return see <code>array()</code>
 	 */
-	protected abstract byte[] protectedArray();
+	abstract byte[] protectedArray();
 
 	/**
 	 * Child class implements this method to realize <code>arrayOffset()</code>.
 	 * 
 	 * @return see <code>arrayOffset()</code>
 	 */
-	protected abstract int protectedArrayOffset();
+	abstract int protectedArrayOffset();
 
 	/**
 	 * Child class implements this method to realize <code>hasArray()</code>.
 	 * 
 	 * @return see <code>hasArray()</code>
 	 */
-	protected abstract boolean protectedHasArray();
+	abstract boolean protectedHasArray();
 
 	/**
 	 * Writes the given byte to the current position and increase the position

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferUnderflowException;
-import java.nio.ByteOrder;
-import java.nio.CharBuffer;
 
 /**
  * CharArrayBuffer, ReadWriteCharArrayBuffer and ReadOnlyCharArrayBuffer compose

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharBuffer.java Thu Jan 19 03:31:59 2006
@@ -16,7 +16,6 @@
 package java.nio;
 
 
-import com.ibm.io.nio.BufferFactory;
 
 /**
  * A buffer of <code>char</code>s.
@@ -159,7 +158,7 @@
 	 * @param capacity
 	 *            The capacity of the buffer
 	 */
-	protected CharBuffer(int capacity) {
+	CharBuffer(int capacity) {
 		super(capacity);
 	}
 
@@ -478,21 +477,21 @@
 	 * 
 	 * @return see <code>array()</code>
 	 */
-	protected abstract char[] protectedArray();
+	abstract char[] protectedArray();
 
 	/**
 	 * Child class implements this method to realize <code>arrayOffset()</code>.
 	 * 
 	 * @return see <code>arrayOffset()</code>
 	 */
-	protected abstract int protectedArrayOffset();
+	abstract int protectedArrayOffset();
 
 	/**
 	 * Child class implements this method to realize <code>hasArray()</code>.
 	 * 
 	 * @return see <code>hasArray()</code>
 	 */
-	protected abstract boolean protectedHasArray();
+	abstract boolean protectedHasArray();
 
 	/**
 	 * Writes the given char to the current position and increase the position
@@ -526,7 +525,7 @@
 	 * @exception ReadOnlyBufferException
 	 *                If no changes may be made to the contents of this buffer
 	 */
-	public CharBuffer put(char[] src) {
+	public final CharBuffer put(char[] src) {
 		return put(src, 0, src.length);
 	}
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharSequenceAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharSequenceAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharSequenceAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharSequenceAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharSequenceAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharSequenceAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharSequenceAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,13 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferUnderflowException;
-import java.nio.ByteOrder;
-import java.nio.CharBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * This class wraps a char sequence to be a char buffer.

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharToByteBufferAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharToByteBufferAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharToByteBufferAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharToByteBufferAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharToByteBufferAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/CharToByteBufferAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/CharToByteBufferAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,15 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.CharBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * This class wraps a byte buffer to be a char buffer.

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferUnderflowException;
 
+import com.ibm.io.nio.DirectBuffer;
 import com.ibm.platform.struct.PlatformAddress;
 
 /**
@@ -32,11 +32,10 @@
  * </p>
  * 
  */
-abstract class DirectByteBuffer extends BaseByteBuffer {
+abstract class DirectByteBuffer extends BaseByteBuffer implements DirectBuffer {
 
-	// This private class will help us track whether the address is valid or
-	// not.
-	protected static final class SafeAddress {
+	// This class will help us track whether the address is valid or not.
+	static final class SafeAddress {
 		protected boolean isValid = true;
 
 		protected final PlatformAddress address;
@@ -168,11 +167,11 @@
 		return true;
 	}
 
-	protected final boolean isAddressValid() {
+	public final boolean isAddressValid() {
 		return safeAddress.isValid;
 	}
 
-	protected final void addressValidityCheck() {
+	public final void addressValidityCheck() {
 		if (!isAddressValid()) {
 			throw new IllegalStateException(
 					"Cannot use the direct byte buffer after it has been explicitly freed."); //$NON-NLS-1$
@@ -186,7 +185,7 @@
 	/*
 	 * Answers the base address of the buffer (i.e. before offset).
 	 */
-	protected final PlatformAddress getBaseAddress() {
+	public final PlatformAddress getBaseAddress() {
 		addressValidityCheck();
 		return safeAddress.address;
 	}
@@ -207,7 +206,7 @@
 	 *             if this buffer address is known to have been freed
 	 *             previously.
 	 */
-	final PlatformAddress getEffectiveAddress() {
+	public final PlatformAddress getEffectiveAddress() {
 		return getBaseAddress().offsetBytes(offset);
 	}
 
@@ -222,7 +221,7 @@
 	 * form.
 	 * </p>
 	 */
-	final void free() {
+	public final void free() {
 		if (isAddressValid()) {
 			markAddressInvalid();
 			safeAddress.address.free();

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffers.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffers.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectByteBuffers.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java Thu Jan 19 03:31:59 2006
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio; 
+package java.nio; 
 
 
-import java.nio.ByteBuffer;
 
 import com.ibm.platform.struct.PlatformAddress;
 
@@ -25,7 +24,7 @@
  * 
  * @see java.nio.ByteBuffer
  */
-public class DirectByteBuffers {
+class DirectByteBuffers {
 
 	/**
 	 * Explicitly frees the memory used by the given direct byte buffer.

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio; 
+package java.nio; 
 
 
-import java.nio.BufferUnderflowException;
-import java.nio.ByteOrder;
-import java.nio.DoubleBuffer;
 
 /**
  * DoubleArrayBuffer, ReadWriteDoubleArrayBuffer and ReadOnlyDoubleArrayBuffer

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleBuffer.java Thu Jan 19 03:31:59 2006
@@ -16,7 +16,6 @@
 package java.nio;
 
 
-import com.ibm.io.nio.BufferFactory;
 
 /**
  * A buffer of <code>double</code>s.
@@ -103,7 +102,7 @@
 	 * 
 	 * @param capacity  The capacity of the buffer
 	 */
-	protected DoubleBuffer(int capacity) {
+	DoubleBuffer(int capacity) {
 		super(capacity);
 	}
 
@@ -380,21 +379,21 @@
 	 * 
 	 * @return see <code>array()</code>
 	 */
-	protected abstract double[] protectedArray();
+	abstract double[] protectedArray();
 
 	/**
 	 * Child class implements this method to realize <code>arrayOffset()</code>.
 	 * 
 	 * @return see <code>arrayOffset()</code>
 	 */
-	protected abstract int protectedArrayOffset();
+	abstract int protectedArrayOffset();
 
 	/**
 	 * Child class implements this method to realize <code>hasArray()</code>.
 	 * 
 	 * @return see <code>hasArray()</code>
 	 */
-	protected abstract boolean protectedHasArray();
+	abstract boolean protectedHasArray();
 
 	/**
 	 * Writes the given double to the current position and increase the position

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleToByteBufferAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleToByteBufferAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DoubleToByteBufferAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,15 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.DoubleBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * This class wraps a byte buffer to be a double buffer.

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferUnderflowException;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
 
 /**
  * FloatArrayBuffer, ReadWriteFloatArrayBuffer and ReadOnlyFloatArrayBuffer

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatBuffer.java Thu Jan 19 03:31:59 2006
@@ -16,7 +16,6 @@
 package java.nio;
 
 
-import com.ibm.io.nio.BufferFactory;
 
 /**
  * A buffer of <code>float</code>s.
@@ -102,7 +101,7 @@
 	 * 
 	 * @param capacity  The capacity of the buffer
 	 */
-	protected FloatBuffer(int capacity) {
+	FloatBuffer(int capacity) {
 		super(capacity);
 	}
 
@@ -377,21 +376,21 @@
 	 * 
 	 * @return see <code>array()</code>
 	 */
-	protected abstract float[] protectedArray();
+	abstract float[] protectedArray();
 
 	/**
 	 * Child class implements this method to realize <code>arrayOffset()</code>.
 	 * 
 	 * @return see <code>arrayOffset()</code>
 	 */
-	protected abstract int protectedArrayOffset();
+	abstract int protectedArrayOffset();
 
 	/**
 	 * Child class implements this method to realize <code>hasArray()</code>.
 	 * 
 	 * @return see <code>hasArray()</code>
 	 */
-	protected abstract boolean protectedHasArray();
+	abstract boolean protectedHasArray();
 
 	/**
 	 * Writes the given float to the current position and increase the position

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatToByteBufferAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatToByteBufferAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatToByteBufferAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatToByteBufferAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatToByteBufferAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FloatToByteBufferAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/FloatToByteBufferAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,15 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * This class wraps a byte buffer to be a float buffer.

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/HeapByteBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/HeapByteBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/HeapByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferUnderflowException;
 
 import com.ibm.platform.Endianness;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio; 
+package java.nio; 
 
 
-import java.nio.BufferUnderflowException;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
 
 /**
  * IntArrayBuffer, ReadWriteIntArrayBuffer and ReadOnlyIntArrayBuffer compose

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntBuffer.java Thu Jan 19 03:31:59 2006
@@ -16,7 +16,6 @@
 package java.nio;
 
 
-import com.ibm.io.nio.BufferFactory;
 
 /**
  * A buffer of <code>int</code>s.
@@ -106,7 +105,7 @@
 	 * @param capacity
 	 *            The capacity of the buffer
 	 */
-	protected IntBuffer(int capacity) {
+	IntBuffer(int capacity) {
 		super(capacity);
 	}
 
@@ -392,21 +391,21 @@
 	 * 
 	 * @return see <code>array()</code>
 	 */
-	protected abstract int[] protectedArray();
+	abstract int[] protectedArray();
 
 	/**
 	 * Child class implements this method to realize <code>arrayOffset()</code>.
 	 * 
 	 * @return see <code>arrayOffset()</code>
 	 */
-	protected abstract int protectedArrayOffset();
+	abstract int protectedArrayOffset();
 
 	/**
 	 * Child class implements this method to realize <code>hasArray()</code>.
 	 * 
 	 * @return see <code>hasArray()</code>
 	 */
-	protected abstract boolean protectedHasArray();
+	abstract boolean protectedHasArray();
 
 	/**
 	 * Writes the given int to the current position and increase the position by

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntToByteBufferAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntToByteBufferAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntToByteBufferAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntToByteBufferAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntToByteBufferAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/IntToByteBufferAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/IntToByteBufferAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,15 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * This class wraps a byte buffer to be a int buffer.

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferUnderflowException;
-import java.nio.ByteOrder;
-import java.nio.LongBuffer;
 
 /**
  * LongArrayBuffer, ReadWriteLongArrayBuffer and ReadOnlyLongArrayBuffer compose

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongBuffer.java Thu Jan 19 03:31:59 2006
@@ -16,7 +16,6 @@
 package java.nio;
 
 
-import com.ibm.io.nio.BufferFactory;
 
 /**
  * A buffer of <code>long</code>s.
@@ -107,7 +106,7 @@
 	 * @param capacity
 	 *            The capacity of the buffer
 	 */
-	protected LongBuffer(int capacity) {
+	LongBuffer(int capacity) {
 		super(capacity);
 	}
 
@@ -399,21 +398,21 @@
 	 * 
 	 * @return see <code>array()</code>
 	 */
-	protected abstract long[] protectedArray();
+	abstract long[] protectedArray();
 
 	/**
 	 * Child class implements this method to realize <code>arrayOffset()</code>.
 	 * 
 	 * @return see <code>arrayOffset()</code>
 	 */
-	protected abstract int protectedArrayOffset();
+	abstract int protectedArrayOffset();
 
 	/**
 	 * Child class implements this method to realize <code>hasArray()</code>.
 	 * 
 	 * @return see <code>hasArray()</code>
 	 */
-	protected abstract boolean protectedHasArray();
+	abstract boolean protectedHasArray();
 
 	/**
 	 * Writes the given long to the current position and increase the position

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongToByteBufferAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongToByteBufferAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongToByteBufferAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongToByteBufferAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongToByteBufferAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/LongToByteBufferAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/LongToByteBufferAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,15 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.LongBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * This class wraps a byte buffer to be a long buffer.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -43,23 +43,23 @@
 	/**
 	 * The map mode used when creating this buffer.
 	 */
-	protected final MapMode mapMode;
+	final MapMode mapMode;
 
 	/**
 	 * The mapped file.
 	 */
-	protected final File mappedFile;
+	final File mappedFile;
 
 	/**
 	 * The offset of the mapped region. The size of the mapped region is defined
 	 * by capacity.
 	 */
-	protected final long offset;
+	final long offset;
 
 	/**
 	 * The wrapped byte buffer.
 	 */
-	protected final ByteBuffer wrappedBuffer;
+	final ByteBuffer wrappedBuffer;
 
 	/**
 	 * Create a new mapped byte buffer, mapping to the specified region of file.
@@ -70,7 +70,7 @@
 	 * @param size
 	 * @param mapMode
 	 */
-	protected MappedByteBuffer(File mappedFile, long offset, int size,
+	MappedByteBuffer(File mappedFile, long offset, int size,
 			MapMode mapMode) {
 		super(size);
 		this.mappedFile = mappedFile;
@@ -91,7 +91,7 @@
 	 * @param mapMode
 	 * @param wrappedBuffer
 	 */
-	protected MappedByteBuffer(File mappedFile, long offset, int size,
+	MappedByteBuffer(File mappedFile, long offset, int size,
 			MapMode mapMode, ByteBuffer wrappedBuffer) {
 		super(size);
 		this.mappedFile = mappedFile;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedToByteBufferAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedToByteBufferAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedToByteBufferAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedToByteBufferAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedToByteBufferAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedToByteBufferAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedToByteBufferAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,22 +13,10 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
 import java.io.File;
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.CharBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.LongBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.ReadOnlyBufferException;
-import java.nio.ShortBuffer;
 import java.nio.channels.FileChannel.MapMode;
 
 /**
@@ -337,15 +325,6 @@
 	 */
 	public boolean isReadOnly() {
 		return mapMode == MapMode.READ_ONLY || wrappedBuffer.isReadOnly();
-	}
-
-	/*
-	 * Override to keep this.order linked with wrappedBuffer.order
-	 */
-	public ByteBuffer order(ByteOrder byteOrder) {
-		super.order(byteOrder);
-		wrappedBuffer.order(byteOrder);
-		return this;
 	}
 
 	/*

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyCharArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyCharArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyCharArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.CharBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * CharArrayBuffer, ReadWriteCharArrayBuffer and ReadOnlyCharArrayBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDirectByteBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDirectByteBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDirectByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.ByteBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * DirectByteBuffer, ReadWriteDirectByteBuffer and ReadOnlyDirectByteBuffer

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDoubleArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDoubleArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyDoubleArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.DoubleBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * DoubleArrayBuffer, ReadWriteDoubleArrayBuffer and ReadOnlyDoubleArrayBuffer

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFloatArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFloatArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFloatArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.FloatBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * FloatArrayBuffer, ReadWriteFloatArrayBuffer and ReadOnlyFloatArrayBuffer

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyHeapByteBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyHeapByteBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyHeapByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.ByteBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * HeapByteBuffer, ReadWriteHeapByteBuffer and ReadOnlyHeapByteBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyIntArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyIntArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyIntArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.IntBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * IntArrayBuffer, ReadWriteIntArrayBuffer and ReadOnlyIntArrayBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyLongArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyLongArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyLongArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.LongBuffer;
-import java.nio.ReadOnlyBufferException;
 
 /**
  * LongArrayBuffer, ReadWriteLongArrayBuffer and ReadOnlyLongArrayBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyShortArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyShortArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyShortArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.ReadOnlyBufferException;
-import java.nio.ShortBuffer;
 
 /**
  * ShortArrayBuffer, ReadWriteShortArrayBuffer and ReadOnlyShortArrayBuffer

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteCharArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteCharArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteCharArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.CharBuffer;
 
 /**
  * CharArrayBuffer, ReadWriteCharArrayBuffer and ReadOnlyCharArrayBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDirectByteBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDirectByteBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDirectByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
 
 import com.ibm.platform.struct.PlatformAddress;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDoubleArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDoubleArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteDoubleArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.DoubleBuffer;
 
 /**
  * DoubleArrayBuffer, ReadWriteDoubleArrayBuffer and ReadOnlyDoubleArrayBuffer

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFloatArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFloatArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFloatArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.FloatBuffer;
 
 /**
  * FloatArrayBuffer, ReadWriteFloatArrayBuffer and ReadOnlyFloatArrayBuffer

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteHeapByteBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteHeapByteBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteHeapByteBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
 
 /**
  * HeapByteBuffer, ReadWriteHeapByteBuffer and ReadOnlyHeapByteBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteIntArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteIntArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteIntArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.IntBuffer;
 
 /**
  * IntArrayBuffer, ReadWriteIntArrayBuffer and ReadOnlyIntArrayBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteLongArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteLongArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteLongArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.LongBuffer;
 
 /**
  * LongArrayBuffer, ReadWriteLongArrayBuffer and ReadOnlyLongArrayBuffer compose

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteShortArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteShortArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteShortArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,11 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.ShortBuffer;
 
 /**
  * ShortArrayBuffer, ReadWriteShortArrayBuffer and ReadOnlyShortArrayBuffer

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortArrayBuffer.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortArrayBuffer.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortArrayBuffer.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortArrayBuffer.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortArrayBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortArrayBuffer.java Thu Jan 19 03:31:59 2006
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferUnderflowException;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
 
 /**
  * ShortArrayBuffer, ReadWriteShortArrayBuffer and ReadOnlyShortArrayBuffer

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortBuffer.java?rev=370460&r1=370459&r2=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortBuffer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortBuffer.java Thu Jan 19 03:31:59 2006
@@ -16,7 +16,6 @@
 package java.nio;
 
 
-import com.ibm.io.nio.BufferFactory;
 
 /**
  * A buffer of <code>short</code>s.
@@ -107,7 +106,7 @@
 	 * @param capacity
 	 *            The capacity of the buffer
 	 */
-	protected ShortBuffer(int capacity) {
+	ShortBuffer(int capacity) {
 		super(capacity);
 	}
 
@@ -397,21 +396,21 @@
 	 * 
 	 * @return see <code>array()</code>
 	 */
-	protected abstract short[] protectedArray();
+	abstract short[] protectedArray();
 
 	/**
 	 * Child class implements this method to realize <code>arrayOffset()</code>.
 	 * 
 	 * @return see <code>arrayOffset()</code>
 	 */
-	protected abstract int protectedArrayOffset();
+	abstract int protectedArrayOffset();
 
 	/**
 	 * Child class implements this method to realize <code>hasArray()</code>.
 	 * 
 	 * @return see <code>hasArray()</code>
 	 */
-	protected abstract boolean protectedHasArray();
+	abstract boolean protectedHasArray();
 
 	/**
 	 * Writes the given short to the current position and increase the position

Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java (from r370457, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortToByteBufferAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortToByteBufferAdapter.java&r1=370457&r2=370460&rev=370460&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ShortToByteBufferAdapter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java Thu Jan 19 03:31:59 2006
@@ -13,15 +13,9 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package java.nio;
 
 
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ReadOnlyBufferException;
-import java.nio.ShortBuffer;
 
 /**
  * This class wraps a byte buffer to be a short buffer.



Mime
View raw message