harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r386037 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni: META-INF/ src/main/java/java/io/ src/main/java/org/apache/harmony/luni/platform/ src/main/java/org/apache/harmony/luni/platform/struct/
Date Wed, 15 Mar 2006 10:37:17 GMT
Author: tellison
Date: Wed Mar 15 02:37:15 2006
New Revision: 386037

URL: http://svn.apache.org/viewcvs?rev=386037&view=rev
Log:
Move o.a.h.luni.platform.struct types into .luni.platform
Reflect NIO package renaming
(Temporarily import an internal NIO package -- requires further refactoring)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
      - copied, changed from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java
      - copied, changed from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
      - copied, changed from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
      - copied, changed from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java
      - copied, changed from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java
      - copied, changed from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
      - copied, changed from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF?rev=386037&r1=386036&r2=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF Wed Mar 15
02:37:15 2006
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0
 Bundle-ClassPath: .
 Eclipse-JREBundle: true
-Import-Package: com.ibm.io.nio,
+Import-Package: org.apache.harmony.nio.internal,
  java.math,
  java.nio.charset,
  java.util.jar,
@@ -21,4 +21,6 @@
  java.lang.reflect,
  java.net,
  java.util,
- org.apache.harmony.luni.util
+ org.apache.harmony.luni.util,
+ org.apache.harmony.luni.platform
+

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java?rev=386037&r1=386036&r2=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java
Wed Mar 15 02:37:15 2006
@@ -18,9 +18,9 @@
 
 import java.nio.channels.FileChannel;
 
-import com.ibm.io.nio.ReadOnlyFileChannel;
-import com.ibm.io.nio.ReadWriteFileChannel;
-import com.ibm.io.nio.WriteOnlyFileChannel;
+import org.apache.harmony.nio.internal.ReadOnlyFileChannel;
+import org.apache.harmony.nio.internal.ReadWriteFileChannel;
+import org.apache.harmony.nio.internal.WriteOnlyFileChannel;
 import org.apache.harmony.luni.platform.IFileSystem;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java?rev=386037&r1=386036&r2=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
Wed Mar 15 02:37:15 2006
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.IdentityHashMap;
+import java.util.Iterator;
 
 import com.ibm.oti.util.PriviAction;
 
@@ -1235,29 +1236,38 @@
 			streamClassList.add(0, nextStreamClass);
 			nextStreamClass = nextStreamClass.getSuperclass();
 		}
-		ArrayList classList = new ArrayList(32);
-		Class nextClass = object.getClass();
-		while (nextClass != null) {
-			Class testClass = nextClass.getSuperclass();
-			if (testClass != null) {
-				classList.add(0, nextClass);
-			}
-			nextClass = testClass;
-		}
-		int lastIndex = 0;
-		for (int i = 0; i < classList.size(); i++) {
-			Class superclass = (Class) classList.get(i);
-			int index = findStreamSuperclass(superclass, streamClassList,
-					lastIndex);
-			if (index == -1) {
-				readObjectNoData(object, superclass);
-			} else {
-				for (int j = lastIndex; j <= index; j++) {
-					readObjectForClass(object,
-							(ObjectStreamClass) streamClassList.get(j));
+		if (object == null) {
+			Iterator streamIt = streamClassList.iterator();
+			while (streamIt.hasNext()) {
+				ObjectStreamClass streamClass = (ObjectStreamClass) streamIt
+						.next();
+				readObjectForClass(object, streamClass);
+			}
+		} else {
+			ArrayList classList = new ArrayList(32);
+			Class nextClass = object.getClass();
+			while (nextClass != null) {
+				Class testClass = nextClass.getSuperclass();
+				if (testClass != null) {
+					classList.add(0, nextClass);
+				}
+				nextClass = testClass;
+			}
+			int lastIndex = 0;
+			for (int i = 0; i < classList.size(); i++) {
+				Class superclass = (Class) classList.get(i);
+				int index = findStreamSuperclass(superclass, streamClassList,
+						lastIndex);
+				if (index == -1) {
+					readObjectNoData(object, superclass);
+				} else {
+					for (int j = lastIndex; j <= index; j++) {
+						readObjectForClass(object,
+								(ObjectStreamClass) streamClassList.get(j));
+					}
 				}
+				lastIndex = index + 1;
 			}
-			lastIndex = index + 1;
 		}
 	}
 
@@ -2100,12 +2110,7 @@
 	 */
 	private Object registeredObjectRead(Integer handle)
 			throws InvalidObjectException {
-		Object objectRead = objectsRead.get(handle);
-		if (objectRead == null) {
-			throw new InvalidObjectException(
-					"Back reference to unshared object"); //$NON-NLS-1$
-		}
-		return objectRead;
+		return objectsRead.get(handle);
 	}
 
 	/**

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
(from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java&r1=385665&r2=386037&rev=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AbstractMemorySpy.java
Wed Mar 15 02:37:15 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.luni.platform.struct;
+package org.apache.harmony.luni.platform;
 
 
 import java.lang.ref.ReferenceQueue;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java
(from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java&r1=385665&r2=386037&rev=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/DebugMemorySpy.java
Wed Mar 15 02:37:15 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.luni.platform.struct; 
+package org.apache.harmony.luni.platform; 
 
 
 /**

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
(from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java&r1=385665&r2=386037&rev=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ICommonDataTypes.java
Wed Mar 15 02:37:15 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.luni.platform.struct;
+package org.apache.harmony.luni.platform;
 
 
 /**

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
(from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java&r1=385665&r2=386037&rev=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySpy.java
Wed Mar 15 02:37:15 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.luni.platform.struct;
+package org.apache.harmony.luni.platform;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java?rev=386037&r1=386036&r2=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java
Wed Mar 15 02:37:15 2006
@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
 
 /**
  * IMemorySystem

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java
(from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java&r1=385665&r2=386037&rev=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IPlatformConstants.java
Wed Mar 15 02:37:15 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.luni.platform.struct;
+package org.apache.harmony.luni.platform;
 
 
 public interface IPlatformConstants {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java?rev=386037&r1=386036&r2=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java
Wed Mar 15 02:37:15 2006
@@ -19,7 +19,6 @@
 
 import org.apache.harmony.luni.util.NotYetImplementedException;
 
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
 
 // import com.ibm.oti.vm.VM;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java
(from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java&r1=385665&r2=386037&rev=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddress.java
Wed Mar 15 02:37:15 2006
@@ -13,11 +13,8 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.luni.platform.struct;
+package org.apache.harmony.luni.platform;
 
-import org.apache.harmony.luni.platform.Endianness;
-import org.apache.harmony.luni.platform.IMemorySystem;
-import org.apache.harmony.luni.platform.Platform;
 
 /**
  * The platform address class is an unsafe virtualization of an OS memory block.

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
(from r385665, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java&r1=385665&r2=386037&rev=386037&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/RuntimeMemorySpy.java
Wed Mar 15 02:37:15 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.luni.platform.struct;
+package org.apache.harmony.luni.platform;
 
 import java.lang.ref.Reference;
 



Mime
View raw message