incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r827952 [3/7] - in /incubator/kato/branches/experimental/thirdview/org.apache.kato: kato.api/src/main/java/javax/tools/diagnostics/ kato.api/src/main/java/javax/tools/diagnostics/image/ kato.api/src/main/java/javax/tools/diagnostics/runtime...
Date Wed, 21 Oct 2009 10:29:59 GMT
Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/JavaRuntimeImpl.java Wed Oct 21 10:29:55 2009
@@ -23,13 +23,13 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaVMInitArgs;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMInitArgs;
 
 import org.apache.kato.jvmti.javaruntime.model.Model;
 
-public class JavaRuntimeImpl implements JavaRuntime {
+public class JavaRuntimeImpl implements JVMRuntime {
 
 
 	private Model base=null;
@@ -67,7 +67,7 @@
 	}
 
 	@Override
-	public JavaVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
+	public JVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
 			CorruptDataException {
 		throw new DataUnavailable();
 	}
@@ -79,7 +79,7 @@
 	}
 
 	@Override
-	public JavaObject getObjectAtAddress(ImagePointer arg0)
+	public JVMObject getObjectAtAddress(ImagePointer arg0)
 			throws CorruptDataException, IllegalArgumentException,
 			MemoryAccessException, DataUnavailable {
 		throw new DataUnavailable();

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClass.java Wed Oct 21 10:29:55 2009
@@ -8,14 +8,14 @@
 
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.common.ObjectMapList;
 
 
-public class JClass implements JavaClass{
+public class JClass implements JVMClass{
 	   /**
 	 * 
 	 */
@@ -41,7 +41,7 @@
 		private ObjectMapList<Integer, JField> fields=null;
 		
 		@Override
-		public JavaClassLoader getClassLoader() throws CorruptDataException {
+		public JVMClassLoader getClassLoader() throws CorruptDataException {
 			
 			return classloader;
 		}
@@ -61,7 +61,7 @@
 			
 		}
 		@Override
-		public JavaClass getComponentType() throws CorruptDataException {
+		public JVMClass getComponentType() throws CorruptDataException {
 			// TODO Auto-generated method stub
 			return null;
 		}
@@ -103,7 +103,7 @@
 			return classSig;
 		}
 		@Override
-		public JavaObject getObject() throws CorruptDataException {
+		public JVMObject getObject() throws CorruptDataException {
 			// TODO Auto-generated method stub
 			return null;
 		}
@@ -112,7 +112,7 @@
 			return new LinkedList();
 		}
 		@Override
-		public JavaClass getSuperclass() throws CorruptDataException {
+		public JVMClass getSuperclass() throws CorruptDataException {
 			return model.getClass(new Integer(superclassid));
 		}
 		@Override

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JClassLoader.java Wed Oct 21 10:29:55 2009
@@ -7,23 +7,23 @@
 import java.util.List;
 
 import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 
-public class JClassLoader implements JavaClassLoader {
+public class JClassLoader implements JVMClassLoader {
 
-	private List<JavaClass> classes=null;
+	private List<JVMClass> classes=null;
 	
 	@Override
-	public JavaClass findClass(String name) throws CorruptDataException {
+	public JVMClass findClass(String name) throws CorruptDataException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	public void addClass(JClass c) {
-		if(classes==null) classes=new LinkedList<JavaClass>();
+		if(classes==null) classes=new LinkedList<JVMClass>();
 		classes.add(c);
 		
 	}
@@ -35,12 +35,12 @@
 
 	@Override
 	public List getDefinedClasses() {
-		if(classes==null) classes=new LinkedList<JavaClass>();
+		if(classes==null) classes=new LinkedList<JVMClass>();
 		return classes;
 	}
 
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		// TODO Auto-generated method stub
 		return null;
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JField.java Wed Oct 21 10:29:55 2009
@@ -6,11 +6,11 @@
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
-public class JField implements JavaField , JValueHolder{
+public class JField implements JVMField , JValueHolder{
 
 	private JClass clazzid=null;
 	private int id=0;
@@ -28,7 +28,7 @@
 	}
 
 	@Override
-	public Object get(JavaObject arg0) throws CorruptDataException,
+	public Object get(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getValue(id);
@@ -36,70 +36,70 @@
 	}
 
 	@Override
-	public boolean getBoolean(JavaObject arg0) throws CorruptDataException,
+	public boolean getBoolean(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getBooleanValue(id);
 	}
 
 	@Override
-	public byte getByte(JavaObject arg0) throws CorruptDataException,
+	public byte getByte(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getByteValue(id);
 	}
 
 	@Override
-	public char getChar(JavaObject arg0) throws CorruptDataException,
+	public char getChar(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getCharValue(id);
 	}
 
 	@Override
-	public double getDouble(JavaObject arg0) throws CorruptDataException,
+	public double getDouble(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getDoubleValue(id);
 	}
 
 	@Override
-	public float getFloat(JavaObject arg0) throws CorruptDataException,
+	public float getFloat(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getFloatValue(id);
 	}
 
 	@Override
-	public int getInt(JavaObject arg0) throws CorruptDataException,
+	public int getInt(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getIntValue(id);
 	}
 
 	@Override
-	public long getLong(JavaObject arg0) throws CorruptDataException,
+	public long getLong(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getLongValue(id);
 	}
 
 	@Override
-	public short getShort(JavaObject arg0) throws CorruptDataException,
+	public short getShort(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getShortValue(id);
 	}
 
 	@Override
-	public String getString(JavaObject arg0) throws CorruptDataException,
+	public String getString(JVMObject arg0) throws CorruptDataException,
 			MemoryAccessException {
 		JObject job=(JObject) arg0;
 		return job.getStringValue(id);
 	}
 
 	@Override
-	public JavaClass getDeclaringClass() throws CorruptDataException,
+	public JVMClass getDeclaringClass() throws CorruptDataException,
 			DataUnavailable {
 		
 		return clazzid;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariable.java Wed Oct 21 10:29:55 2009
@@ -1,9 +1,9 @@
 package org.apache.kato.jvmti.javaruntime.model;
 
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
-public class JLocalVariable implements JValueHolder,JavaVariable{
+public class JLocalVariable implements JValueHolder,JVMVariable{
 
 	public Object value=null;
 	public int slot=0;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocalVariableTableEntry.java Wed Oct 21 10:29:55 2009
@@ -4,9 +4,9 @@
 package org.apache.kato.jvmti.javaruntime.model;
 
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
-public class JLocalVariableTableEntry implements JavaVariable {
+public class JLocalVariableTableEntry implements JVMVariable {
 
 	public String gensig;
 	public String sig;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JLocation.java Wed Oct 21 10:29:55 2009
@@ -6,10 +6,10 @@
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
 
-public class JLocation implements JavaLocation {
+public class JLocation implements JVMLocation {
 
 	
 	public JMethod method=null;
@@ -45,7 +45,7 @@
 	}
 
 	@Override
-	public JavaMethod getMethod() throws CorruptDataException {
+	public JVMMethod getMethod() throws CorruptDataException {
 		return method;
 	}
 	

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMethod.java Wed Oct 21 10:29:55 2009
@@ -8,14 +8,14 @@
 
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
 import org.apache.kato.common.ObjectMapList;
 
 
-public class JMethod implements JavaMethod {
+public class JMethod implements JVMMethod {
 
 	
 	public String genericsignature;
@@ -27,7 +27,7 @@
 	public int mods=0;
 	public JClass parent=null;
 	
-	private ObjectMapList<Integer,JavaVariable> localVars=null;
+	private ObjectMapList<Integer,JVMVariable> localVars=null;
 	public JMethod() {
 		
 	}
@@ -39,7 +39,7 @@
 
 	public void addLocalVariableTableEntry(JLocalVariableTableEntry entry) {
 		if(localVars==null) {
-			localVars=new ObjectMapList<Integer, JavaVariable>();
+			localVars=new ObjectMapList<Integer, JVMVariable>();
 		}
 		
 		localVars.put(entry.slot,entry);
@@ -57,7 +57,7 @@
 	}
 
 	@Override
-	public JavaClass getDeclaringClass() throws CorruptDataException,
+	public JVMClass getDeclaringClass() throws CorruptDataException,
 			DataUnavailable {
 		
 		return parent;
@@ -80,16 +80,16 @@
 	}
 
 	@Override
-	public List<JavaVariable> getVariables() {
+	public List<JVMVariable> getVariables() {
 		if(localVars==null) {
-			localVars=new ObjectMapList<Integer, JavaVariable>();
+			localVars=new ObjectMapList<Integer, JVMVariable>();
 		}
 		return localVars.values();
 	}
 
 	public JLocalVariableTableEntry getEntry(int slot) {
 		if(localVars==null) {
-			localVars=new ObjectMapList<Integer, JavaVariable>();
+			localVars=new ObjectMapList<Integer, JVMVariable>();
 		}
 		return (JLocalVariableTableEntry) localVars.get(slot);
 			

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JMonitor.java Wed Oct 21 10:29:55 2009
@@ -10,19 +10,19 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMThread;
 
 
-public class JMonitor implements JavaMonitor {
+public class JMonitor implements JVMMonitor {
 
 	private JThread owner=null;
 	private int id=0;
 	
-	List<JavaThread> waiters=new LinkedList<JavaThread>();
+	List<JVMThread> waiters=new LinkedList<JVMThread>();
 	public JMonitor(int monitorid) {
 		this.id=monitorid;
 	}
@@ -57,9 +57,9 @@
 	}
 
 	@Override
-	public JavaObject getObject() {
+	public JVMObject getObject() {
 		
-		return new JavaObject(){
+		return new JVMObject(){
 
 			@Override
 			public void arraycopy(int srcStart, Object dst, int dstStart,
@@ -83,7 +83,7 @@
 			}
 
 			@Override
-			public JavaHeap getHeap() throws CorruptDataException,
+			public JVMHeap getHeap() throws CorruptDataException,
 					DataUnavailable {
 				// TODO Auto-generated method stub
 				return null;
@@ -95,7 +95,7 @@
 			}
 
 			@Override
-			public JavaClass getJavaClass() throws CorruptDataException {
+			public JVMClass getJavaClass() throws CorruptDataException {
 				// TODO Auto-generated method stub
 				return null;
 			}
@@ -133,7 +133,7 @@
 	}
 
 	@Override
-	public JavaThread getOwner() throws CorruptDataException {
+	public JVMThread getOwner() throws CorruptDataException {
 		return owner;
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JObject.java Wed Oct 21 10:29:55 2009
@@ -12,12 +12,12 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 
-public class JObject implements JavaObject {
+public class JObject implements JVMObject {
 
 	private int objid=0;
 	private long size=0;
@@ -105,7 +105,7 @@
 	}
 
 	@Override
-	public JavaHeap getHeap() throws CorruptDataException, DataUnavailable {
+	public JVMHeap getHeap() throws CorruptDataException, DataUnavailable {
 		// TODO Auto-generated method stub
 		return null;
 	}
@@ -116,7 +116,7 @@
 	}
 
 	@Override
-	public JavaClass getJavaClass() throws CorruptDataException {
+	public JVMClass getJavaClass() throws CorruptDataException {
 		
 		System.out.println("asking for class "+clazz);
 		return clazz;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JStackFrame.java Wed Oct 21 10:29:55 2009
@@ -9,17 +9,17 @@
 import javax.tools.diagnostics.image.CorruptDataException;
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
 import org.apache.kato.common.ObjectMapList;
 
 
-public class JStackFrame implements JavaStackFrame {
+public class JStackFrame implements JVMStackFrame {
 
 	private JLocation location=null;
-	private ObjectMapList<Integer,JavaVariable> vars=new ObjectMapList<Integer, JavaVariable>();
+	private ObjectMapList<Integer,JVMVariable> vars=new ObjectMapList<Integer, JVMVariable>();
 	@Override
 	public ImagePointer getBasePointer() throws CorruptDataException {
 		
@@ -35,7 +35,7 @@
 	}
 
 	@Override
-	public JavaLocation getLocation() throws CorruptDataException {
+	public JVMLocation getLocation() throws CorruptDataException {
 		
 			return location;
 	}
@@ -51,11 +51,11 @@
 	
 	public void addVariable(JLocalVariable value) {
 		value.setLocation(location);
-		vars.put(value.slot, (JavaVariable) value);
+		vars.put(value.slot, (JVMVariable) value);
 	}
 
 	@Override
-	public List<JavaVariable> getVariables() {
+	public List<JVMVariable> getVariables() {
 		
 		return vars.values();
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/JThread.java Wed Oct 21 10:29:55 2009
@@ -11,15 +11,15 @@
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.ImageThread;
 import javax.tools.diagnostics.image.MemoryAccessException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
 
 
-public class JThread implements JavaThread{
+public class JThread implements JVMThread{
 	public JMonitor contendedMonitor=null;
 	public int id=0;
 	public short priority=0;
@@ -27,8 +27,8 @@
 	public int   groupID=0;
 	public String threadName=null;
 	
-	private List<JavaMonitor> monitors=null;
-	private List<JavaStackFrame> frames=new LinkedList<JavaStackFrame>();
+	private List<JVMMonitor> monitors=null;
+	private List<JVMStackFrame> frames=new LinkedList<JVMStackFrame>();
 	
 	
 	public JThread(int id) {
@@ -44,7 +44,7 @@
 	
 	public void addMonitor(JMonitor mon) {
 		if(monitors==null) {
-			monitors=new LinkedList<JavaMonitor>();
+			monitors=new LinkedList<JVMMonitor>();
 			
 		}
 		mon.setOwner(this);
@@ -68,9 +68,9 @@
 		return threadName;
 	}
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		
-		return new JavaObject(){
+		return new JVMObject(){
 
 			@Override
 			public void arraycopy(int srcStart, Object dst, int dstStart,
@@ -94,7 +94,7 @@
 			}
 
 			@Override
-			public JavaHeap getHeap() throws CorruptDataException,
+			public JVMHeap getHeap() throws CorruptDataException,
 					DataUnavailable {
 				// TODO Auto-generated method stub
 				return null;
@@ -106,7 +106,7 @@
 			}
 
 			@Override
-			public JavaClass getJavaClass() throws CorruptDataException {
+			public JVMClass getJavaClass() throws CorruptDataException {
 				// TODO Auto-generated method stub
 				return null;
 			}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/javaruntime/model/Model.java Wed Oct 21 10:29:55 2009
@@ -4,12 +4,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaMonitor;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMMonitor;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMThread;
 
 import org.apache.kato.common.ObjectMapList;
 
@@ -17,12 +17,12 @@
 public class Model {
 
 	
-	private ObjectMapList<Integer,JavaThread> threadMap=new ObjectMapList<Integer,JavaThread>();
-	Map<Integer,JavaClass>  classMap=new HashMap<Integer,JavaClass>();
-	private ObjectMapList<Integer,JavaClassLoader> loadersMap=new ObjectMapList<Integer,JavaClassLoader>();
-	private ObjectMapList<Integer,JavaMonitor> monitorsMap=new ObjectMapList<Integer,JavaMonitor>();
-	private ObjectMapList<Integer,JavaMethod>  methodMap=new ObjectMapList<Integer,JavaMethod>();
-	private ObjectMapList<Integer,JavaObject>  objectMap=new ObjectMapList<Integer,JavaObject>();
+	private ObjectMapList<Integer,JVMThread> threadMap=new ObjectMapList<Integer,JVMThread>();
+	Map<Integer,JVMClass>  classMap=new HashMap<Integer,JVMClass>();
+	private ObjectMapList<Integer,JVMClassLoader> loadersMap=new ObjectMapList<Integer,JVMClassLoader>();
+	private ObjectMapList<Integer,JVMMonitor> monitorsMap=new ObjectMapList<Integer,JVMMonitor>();
+	private ObjectMapList<Integer,JVMMethod>  methodMap=new ObjectMapList<Integer,JVMMethod>();
+	private ObjectMapList<Integer,JVMObject>  objectMap=new ObjectMapList<Integer,JVMObject>();
 	
 	
 	public JClass getClass(int id) {

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/process/ImageFactoryImpl.java Wed Oct 21 10:29:55 2009
@@ -22,7 +22,7 @@
 import javax.tools.diagnostics.image.ImageFactory;
 import javax.tools.diagnostics.image.ImageProcess;
 import javax.tools.diagnostics.runtime.ManagedRuntime;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 
 public class ImageFactoryImpl implements ImageFactory{
@@ -63,14 +63,14 @@
 		return suffixes;
 	}
 	@Override
-	public JavaRuntime getJavaRuntime(File file) throws IOException {
+	public JVMRuntime getJavaRuntime(File file) throws IOException {
 		 Image i=getImage(file);
 		 if(i==null) return null;
 		 
 		for(ImageAddressSpace space:i.getAddressSpaces()) {
 			ImageProcess process=space.getCurrentProcess();
 			for(ManagedRuntime r : process.getRuntimes()) {
-				if(r instanceof JavaRuntime) return (JavaRuntime) r;
+				if(r instanceof JVMRuntime) return (JVMRuntime) r;
 			}
 		}
 		return null;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/XMLReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/XMLReader.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/XMLReader.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jvmti/src/main/java/org/apache/kato/jvmti/reader/XMLReader.java Wed Oct 21 10:29:55 2009
@@ -6,7 +6,7 @@
 import java.util.Vector;
 
 import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.classpath?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.classpath (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.classpath Wed Oct 21 10:29:55 2009
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.settings/org.eclipse.jdt.core.prefs?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.native/kato.native.cjvmti/.settings/org.eclipse.jdt.core.prefs Wed Oct 21 10:29:55 2009
@@ -1,5 +1,5 @@
-#Thu Sep 03 09:16:58 BST 2009
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+#Wed Oct 21 08:38:55 BST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.source=1.3

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/IJavaRuntimeCreator.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/IJavaRuntimeCreator.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/IJavaRuntimeCreator.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/api/IJavaRuntimeCreator.java Wed Oct 21 10:29:55 2009
@@ -15,11 +15,11 @@
 
 import java.io.IOException;
 
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 
 
 public interface IJavaRuntimeCreator {
 
-	public JavaRuntime createJavaRuntime(TCKConfiguration config) throws IOException;
+	public JVMRuntime createJavaRuntime(TCKConfiguration config) throws IOException;
 }

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java Wed Oct 21 10:29:55 2009
@@ -20,19 +20,19 @@
 
 import javax.tools.diagnostics.image.CorruptData;
 import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 import org.apache.kato.tck.api.IJavaRuntimeCreator;
 
 
 public abstract class TCKJavaRuntimeTestcase extends AbstractTCKTestcase {
 
-	private static JavaRuntime runtime=null;
+	private static JVMRuntime runtime=null;
 	private static IJavaRuntimeCreator creator=null;
 
 	
@@ -53,17 +53,17 @@
 	 * @return JavaField found, or null if not found.
 	 * @throws CorruptDataException
 	 */
-	public static JavaField getJavaField(JavaClass javaClass, String fieldName)
+	public static JVMField getJavaField(JVMClass javaClass, String fieldName)
 			throws CorruptDataException {
-				JavaField foundField = null;
+				JVMField foundField = null;
 				
-				for(JavaField nextField : javaClass.getDeclaredFields()) {
+				for(JVMField nextField : javaClass.getDeclaredFields()) {
 										
 					if (nextField instanceof CorruptData) {
 						continue;
 					}
 					
-					JavaField field = (JavaField) nextField;
+					JVMField field = (JVMField) nextField;
 					
 					if (field.getName().equals(fieldName)) {
 						foundField = field;
@@ -84,12 +84,12 @@
 	 * @return JavaField or null if not found.
 	 * @throws CorruptDataException
 	 */
-	public static JavaField getJavaField(JavaObject javaObject, String fieldName)
+	public static JVMField getJavaField(JVMObject javaObject, String fieldName)
 			throws CorruptDataException {
 				return getJavaField(javaObject.getJavaClass(), fieldName);
 			}
 
-	public JavaRuntime getJavaRuntime()
+	public JVMRuntime getJavaRuntime()
 	{
 		if(runtime==null) {
 			IJavaRuntimeCreator creator=getJavaRuntimeCreator();
@@ -130,21 +130,21 @@
 	 * @return the JavaClassLoader object representing the system classloader.
 	 */
 	
-	protected JavaClassLoader getBootClassLoader() {
+	protected JVMClassLoader getBootClassLoader() {
 	
-		JavaRuntime run = getJavaRuntime();
+		JVMRuntime run = getJavaRuntime();
 		
 		// Find the bootstrap loader using the idea that it it the only loader to have loaded itself
-		JavaClassLoader bootLoader = null;
+		JVMClassLoader bootLoader = null;
 		HashMap loaders = new HashMap();
 		for (Iterator i = run.getJavaClassLoaders().iterator(); i.hasNext();) {
 			Object next = i.next();
 			if (next instanceof CorruptData) {
 				continue;
 			}
-			JavaClassLoader jcl = (JavaClassLoader)next;
+			JVMClassLoader jcl = (JVMClassLoader)next;
 			try {
-				JavaObject loaderObject = jcl.getObject();
+				JVMObject loaderObject = jcl.getObject();
 				// Remember the class loader
 				loaders.put(loaderObject, jcl);
 				if (loaderObject == null) {
@@ -157,9 +157,9 @@
 					bootLoader = jcl;
 					break;
 				} else {
-					JavaClass loadObjectClass = loaderObject.getJavaClass();
+					JVMClass loadObjectClass = loaderObject.getJavaClass();
 					System.out.println("Found class loader "+loadObjectClass.getName()+" at "+format(loaderObject.getID().getAddress()));
-					JavaClassLoader jcl2 = getClassLoader(loadObjectClass);
+					JVMClassLoader jcl2 = getClassLoader(loadObjectClass);
 					if (jcl.equals(jcl2)) {
 						System.out.println("Found boot class loader "+loadObjectClass.getName()+" at "+format(loaderObject.getID().getAddress()));
 						bootLoader = jcl;
@@ -180,11 +180,11 @@
 	 * 
 	 * @throws CorruptDataException
 	 */
-	private JavaClassLoader getClassLoader1(JavaClass j2) throws CorruptDataException {
-		JavaClassLoader load;
+	private JVMClassLoader getClassLoader1(JVMClass j2) throws CorruptDataException {
+		JVMClassLoader load;
 		// Fix up possible problem with arrays not having a class loader
 		// Use the loader of the component type instead
-		for (JavaClass j3 = j2; ; j3 = j3.getComponentType()) {
+		for (JVMClass j3 = j2; ; j3 = j3.getComponentType()) {
 			load = j3.getClassLoader();
 			if (load != null) break;
 		}
@@ -198,11 +198,11 @@
 	 * 
 	 * @throws CorruptDataException
 	 */
-	private JavaClassLoader getClassLoader(JavaClass j1) throws CorruptDataException {
+	private JVMClassLoader getClassLoader(JVMClass j1) throws CorruptDataException {
 		try {
 			return getClassLoader1(j1);
 		} catch (CorruptDataException e) {
-			JavaClassLoader load = getClassLoader2(j1);
+			JVMClassLoader load = getClassLoader2(j1);
 			if (load != null) return load;
 			throw e;
 		}
@@ -213,21 +213,21 @@
 	 * 
 	 * @throws CorruptDataException
 	 */
-	private JavaClassLoader getClassLoader2(JavaClass j1) throws CorruptDataException {		
-		JavaClassLoader load = null;
-		JavaRuntime run = getJavaRuntime();
+	private JVMClassLoader getClassLoader2(JVMClass j1) throws CorruptDataException {		
+		JVMClassLoader load = null;
+		JVMRuntime run = getJavaRuntime();
 		for (Iterator i = run.getJavaClassLoaders().iterator(); i.hasNext();) {
 			Object next = i.next();
 			if (next instanceof CorruptData) {
 				continue;
 			}
-			JavaClassLoader jcl = (JavaClassLoader)next;
+			JVMClassLoader jcl = (JVMClassLoader)next;
 			for (Iterator j = jcl.getDefinedClasses().iterator();j.hasNext();) {
 				Object next2 = j.next();
 				if (next2 instanceof CorruptData) {
 					continue;
 				}
-				JavaClass j2 = (JavaClass)next2;
+				JVMClass j2 = (JVMClass)next2;
 				if (j2.equals(j1)) {
 					return jcl;
 				}
@@ -237,14 +237,14 @@
 	}
 
 	
-	private JavaObject thisJavaObject = null;
+	private JVMObject thisJavaObject = null;
 	/**
 	 * Finds the JavaObject in the DTFJ Dump that corresponds with this
 	 * testcase.
 	 *  
 	 * @return The dead version of the test, or null.
 	 */
-	public JavaObject getThis()  {				
+	public JVMObject getThis()  {				
 		String testName = this.getClass().getName().replace('.', '/');
 		if (thisJavaObject == null) {
 			return thisJavaObject = getJavaObjectByClassname(testName);
@@ -253,8 +253,8 @@
 		return null;
 	}
 	
-	public JavaObject getJavaObjectByClassname(String className) {
-		JavaRuntime run = getJavaRuntime();
+	public JVMObject getJavaObjectByClassname(String className) {
+		JVMRuntime run = getJavaRuntime();
 		
 		for(Iterator heaps = run.getHeaps().iterator(); heaps.hasNext();) {
 			Object nextHeap = heaps.next(); 
@@ -263,7 +263,7 @@
 				continue;
 			}
 			
-			JavaHeap heap = (JavaHeap) nextHeap;
+			JVMHeap heap = (JVMHeap) nextHeap;
 			
 			for(Iterator objects = heap.getObjects().iterator(); objects.hasNext();) {
 				Object nextObject = objects.next();
@@ -272,7 +272,7 @@
 					continue;					
 				}
 				
-				JavaObject object = (JavaObject) nextObject;
+				JVMObject object = (JVMObject) nextObject;
 				
 				try {
 					if (className.equals(object.getJavaClass().getName())) {

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClassLoader_getJavaObject.java Wed Oct 21 10:29:55 2009
@@ -17,11 +17,11 @@
 
 import javax.tools.diagnostics.image.CorruptData;
 import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMClassLoader;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -57,7 +57,7 @@
 	{
 		boolean foundClassLoader = false;
 
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		Iterator classloaders = runtime.getJavaClassLoaders().iterator();
 
 		while (classloaders.hasNext()) {
@@ -67,10 +67,10 @@
 				break;
 			}
 
-			JavaClassLoader aJavaClassloader = (JavaClassLoader) nextClassloader;
-			JavaClass theJavaClass;
+			JVMClassLoader aJavaClassloader = (JVMClassLoader) nextClassloader;
+			JVMClass theJavaClass;
 			try {
-				JavaObject classLoaderObject = (aJavaClassloader).getObject();
+				JVMObject classLoaderObject = (aJavaClassloader).getObject();
 				
 				// The system class loader doesn't have an object.
 				if (classLoaderObject == null ) {
@@ -88,7 +88,7 @@
 						break;
 					}
 
-					JavaField theField = (JavaField) nextField;
+					JVMField theField = (JVMField) nextField;
 					String theFieldName = theField.getName();
 					if (theFieldName.equals("JavaClassLoader_getJavaObject")){
 						foundClassLoader = true;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaClass_getName.java Wed Oct 21 10:29:55 2009
@@ -17,10 +17,10 @@
 
 import javax.tools.diagnostics.image.CorruptData;
 import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -55,7 +55,7 @@
 	{
 		boolean foundClassName = false;
 
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 
 		Iterator heaps = runtime.getHeaps().iterator();
 
@@ -66,7 +66,7 @@
 				break;
 			}
 
-			JavaHeap aJavaHeap = (JavaHeap) nextHeap;
+			JVMHeap aJavaHeap = (JVMHeap) nextHeap;
 			Iterator objects = aJavaHeap.getObjects().iterator();
 
 			while (objects.hasNext()) {
@@ -76,9 +76,9 @@
 					break;
 				}
 
-				JavaObject aJavaObject = (JavaObject) nextObject;
+				JVMObject aJavaObject = (JVMObject) nextObject;
 				try {
-					JavaClass theJavaClass = aJavaObject.getJavaClass();
+					JVMClass theJavaClass = aJavaObject.getJavaClass();
 					String theClassName = (theJavaClass).getName();
 					if (TestObjectClassName.equals(theClassName)) {
 						System.out.println("theClassName "+theClassName);
@@ -95,7 +95,7 @@
 	}
 	
 	public void testUnicodeClassName() throws Exception {
-		JavaObject obj = getJavaObjectByClassname(unicodeClassname);
+		JVMObject obj = getJavaObjectByClassname(unicodeClassname);
 		
 		assertNotNull("Couldn't find object of instance " + unicodeClassname, obj);
 	}

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_equals.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -35,15 +35,15 @@
 	
 	String differentClassName = DifferentClass.class.getName().replace('.', '/');
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
 		return thisObject;		
 	}
 	
-	static JavaObject differentClassObject = null;
+	static JVMObject differentClassObject = null;
 	public void setUp() {
 		if (differentClassObject == null) {
 			differentClassObject = getJavaObjectByClassname(differentClassName);
@@ -53,64 +53,64 @@
 	}
 	
 	public void testToString() throws Exception {
-		JavaField fieldAField = getJavaField(getThis(), "fieldA");
+		JVMField fieldAField = getJavaField(getThis(), "fieldA");
 		String theString=fieldAField.toString();
 		assertNotNull(theString);
 		assertTrue(theString.length() >= 0 );
 	}
 
 	public void testHashCode() throws Exception {
-		JavaField fieldAField = getJavaField(getThis(), "fieldA");
-		JavaField fieldAField2 = getJavaField(getThis(), "fieldA");
+		JVMField fieldAField = getJavaField(getThis(), "fieldA");
+		JVMField fieldAField2 = getJavaField(getThis(), "fieldA");
 		
 		assertTrue(fieldAField.hashCode()==fieldAField2.hashCode());
 	}
 	
 	
 	public void testNullFalse() throws Exception {
-		JavaField fieldAField = getJavaField(getThis(), "fieldA");
+		JVMField fieldAField = getJavaField(getThis(), "fieldA");
 		
 		assertFalse(fieldAField.equals(null));
 	}
 	
 	public void testNullFalseStatic() throws Exception {
-		JavaField staticField = getJavaField(getThis(), "staticField");
+		JVMField staticField = getJavaField(getThis(), "staticField");
 		
 		assertFalse(staticField.equals(null));
 	}
 	
 	public void testDifferentFalse() throws Exception {
-		JavaField fieldAField = getJavaField(getThis(), "fieldA");
-		JavaField fieldBField = getJavaField(getThis(), "fieldB");
+		JVMField fieldAField = getJavaField(getThis(), "fieldA");
+		JVMField fieldBField = getJavaField(getThis(), "fieldB");
 		
 		assertFalse(fieldAField.equals(fieldBField));
 		assertFalse(fieldBField.equals(fieldAField));		
 	}
 	
 	public void testDifferentFalseStatic() throws Exception {
-		JavaField staticField = getJavaField(getThis(), "staticField");
-		JavaField fieldBField = getJavaField(getThis(), "fieldB");
+		JVMField staticField = getJavaField(getThis(), "staticField");
+		JVMField fieldBField = getJavaField(getThis(), "fieldB");
 		
 		assertFalse(staticField.equals(fieldBField));
 		assertFalse(fieldBField.equals(staticField));		
 	}
 	
 	public void testEqualsSelf() throws Exception {
-		JavaField fieldAField = getJavaField(getThis(), "fieldA");
+		JVMField fieldAField = getJavaField(getThis(), "fieldA");
 		assertTrue(fieldAField.equals(fieldAField));
 	}
 	
 	public void testNotEqualsDiffClass() throws Exception {
-		JavaField differentFieldAField = getJavaField(differentClassObject, "fieldA");
-		JavaField fieldAField = getJavaField(getThis(), "fieldA");
+		JVMField differentFieldAField = getJavaField(differentClassObject, "fieldA");
+		JVMField fieldAField = getJavaField(getThis(), "fieldA");
 		
 		assertFalse(fieldAField.equals(differentFieldAField));
 		assertFalse(differentFieldAField.equals(fieldAField));
 	}
 	
 	public void testNotEqualsDiffClassStatic() throws Exception {
-		JavaField differentStaticField = getJavaField(differentClassObject, "staticField");
-		JavaField staticField = getJavaField(getThis(), "staticField");
+		JVMField differentStaticField = getJavaField(differentClassObject, "staticField");
+		JVMField staticField = getJavaField(getThis(), "staticField");
 		
 		assertFalse(staticField.equals(differentStaticField));
 		assertFalse(differentStaticField.equals(staticField));

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_get.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -93,8 +93,8 @@
 	
 	WrongClass wrongObjectInstance = new WrongClass();
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -103,7 +103,7 @@
 
 	static String wrongClassName = WrongClass.class.getName().replace('.', '/');
 	
-	static JavaObject wrongClassObject = null;
+	static JVMObject wrongClassObject = null;
 	public void setUp() {
 		if (wrongClassObject == null) {
 			wrongClassObject = getJavaObjectByClassname(wrongClassName);
@@ -111,8 +111,8 @@
 	}
 	
 	public void testByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteField = getJavaField(thisJavaObject, "byteValue");
 		
 		Byte byteObj = (Byte) byteField.get(thisJavaObject);
 		
@@ -120,8 +120,8 @@
 	}
 	
 	public void testMaxByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteField = getJavaField(thisJavaObject, "maxByteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteField = getJavaField(thisJavaObject, "maxByteValue");
 		
 		Byte byteObj = (Byte) byteField.get(thisJavaObject);
 		
@@ -129,8 +129,8 @@
 	}
 	
 	public void testMinByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteField = getJavaField(thisJavaObject, "minByteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteField = getJavaField(thisJavaObject, "minByteValue");
 		
 		Byte byteObj = (Byte) byteField.get(thisJavaObject);
 		
@@ -138,8 +138,8 @@
 	}
 	
 	public void testShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortField = getJavaField(thisJavaObject, "shortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortField = getJavaField(thisJavaObject, "shortValue");
 		
 		Short shortObj = (Short) shortField.get(thisJavaObject);
 		
@@ -147,8 +147,8 @@
 	}
 	
 	public void testMaxShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortField = getJavaField(thisJavaObject, "maxShortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortField = getJavaField(thisJavaObject, "maxShortValue");
 		
 		Short shortObj = (Short) shortField.get(thisJavaObject);
 		
@@ -156,8 +156,8 @@
 	}
 	
 	public void testMinShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortField = getJavaField(thisJavaObject, "minShortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortField = getJavaField(thisJavaObject, "minShortValue");
 		
 		Short shortObj = (Short) shortField.get(thisJavaObject);
 		
@@ -165,8 +165,8 @@
 	}
 	
 	public void testCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charField = getJavaField(thisJavaObject, "charValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charField = getJavaField(thisJavaObject, "charValue");
 		
 		Character charObj = (Character) charField.get(thisJavaObject);
 		
@@ -174,8 +174,8 @@
 	}
 	
 	public void testMaxCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charField = getJavaField(thisJavaObject, "maxCharValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charField = getJavaField(thisJavaObject, "maxCharValue");
 		
 		Character charObj = (Character) charField.get(thisJavaObject);
 		
@@ -183,8 +183,8 @@
 	}
 	
 	public void testMinCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charField = getJavaField(thisJavaObject, "minCharValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charField = getJavaField(thisJavaObject, "minCharValue");
 		
 		Character charObj = (Character) charField.get(thisJavaObject);
 		
@@ -192,8 +192,8 @@
 	}
 	
 	public void testIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intField = getJavaField(thisJavaObject, "intValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intField = getJavaField(thisJavaObject, "intValue");
 		
 		Integer intObj = (Integer) intField.get(thisJavaObject);
 		
@@ -201,8 +201,8 @@
 	}
 	
 	public void testMaxIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intField = getJavaField(thisJavaObject, "maxIntValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intField = getJavaField(thisJavaObject, "maxIntValue");
 		
 		Integer intObj = (Integer) intField.get(thisJavaObject);
 		
@@ -210,8 +210,8 @@
 	}
 	
 	public void testMinIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intField = getJavaField(thisJavaObject, "minIntValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intField = getJavaField(thisJavaObject, "minIntValue");
 		
 		Integer intObj = (Integer) intField.get(thisJavaObject);
 		
@@ -219,8 +219,8 @@
 	}
 	
 	public void testFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatField = getJavaField(thisJavaObject, "floatValue");
 		
 		Float floatObj = (Float) floatField.get(thisJavaObject);
 		
@@ -228,8 +228,8 @@
 	}
 	
 	public void testMaxFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatField = getJavaField(thisJavaObject, "maxFloatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatField = getJavaField(thisJavaObject, "maxFloatValue");
 		
 		Float floatObj = (Float) floatField.get(thisJavaObject);
 		
@@ -237,8 +237,8 @@
 	}
 	
 	public void testMinFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatField = getJavaField(thisJavaObject, "minFloatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatField = getJavaField(thisJavaObject, "minFloatValue");
 		
 		Float floatObj = (Float) floatField.get(thisJavaObject);
 		
@@ -246,8 +246,8 @@
 	}
 	
 	public void testDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleField = getJavaField(thisJavaObject, "doubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleField = getJavaField(thisJavaObject, "doubleValue");
 		
 		Double doubleObj = (Double) doubleField.get(thisJavaObject);
 		
@@ -255,8 +255,8 @@
 	}
 	
 	public void testMaxDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleField = getJavaField(thisJavaObject, "maxDoubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleField = getJavaField(thisJavaObject, "maxDoubleValue");
 		
 		Double doubleObj = (Double) doubleField.get(thisJavaObject);
 		
@@ -264,8 +264,8 @@
 	}
 	
 	public void testMinDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleField = getJavaField(thisJavaObject, "minDoubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleField = getJavaField(thisJavaObject, "minDoubleValue");
 		
 		Double doubleObj = (Double) doubleField.get(thisJavaObject);
 		
@@ -273,38 +273,38 @@
 	}
 	
 	public void testStringValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField stringField = getJavaField(thisJavaObject, "stringValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField stringField = getJavaField(thisJavaObject, "stringValue");
 		
-		JavaObject stringObject = (JavaObject) stringField.get(thisJavaObject);
+		JVMObject stringObject = (JVMObject) stringField.get(thisJavaObject);
 		
 		assertEquals(String.class.getName().replace('.','/'), stringObject.getJavaClass().getName());		
 	}
 	
 	public void testObjectValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectField = getJavaField(thisJavaObject, "objectValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectField = getJavaField(thisJavaObject, "objectValue");
 		
-		JavaObject objectObject = (JavaObject) objectField.get(thisJavaObject);
+		JVMObject objectObject = (JVMObject) objectField.get(thisJavaObject);
 		
 		assertEquals(Object.class.getName().replace('.','/'), objectObject.getJavaClass().getName());		
 	}
 	
 	public void testNullValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectField = getJavaField(thisJavaObject, "nullValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectField = getJavaField(thisJavaObject, "nullValue");
 		
-		JavaObject objectObject = (JavaObject) objectField.get(thisJavaObject);
+		JVMObject objectObject = (JVMObject) objectField.get(thisJavaObject);
 		
 		assertNull(objectObject);		
 	}
 	
 	public void testNullObjectInstance() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectField = getJavaField(thisJavaObject, "objectValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectField = getJavaField(thisJavaObject, "objectValue");
 		
 		try{
-			JavaObject objectObject = (JavaObject) objectField.get(null);
+			JVMObject objectObject = (JVMObject) objectField.get(null);
 			fail("Didn't get expected NullPointerException");
 		}catch(NullPointerException e) {
 			// expected - should get NPE with no object when passed to instance JavaField
@@ -313,8 +313,8 @@
 	}
 	
 	public void testByteStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteField = getJavaField(thisJavaObject, "byteStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteField = getJavaField(thisJavaObject, "byteStaticValue");
 		
 		Byte byteObj = (Byte) byteField.get(null);
 		
@@ -322,8 +322,8 @@
 	}
 
 	public void testMaxByteStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteField = getJavaField(thisJavaObject, "maxByteStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteField = getJavaField(thisJavaObject, "maxByteStaticValue");
 		
 		Byte byteObj = (Byte) byteField.get(null);
 		
@@ -331,8 +331,8 @@
 	}
 
 	public void testMinByteStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField byteField = getJavaField(thisJavaObject, "minByteStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField byteField = getJavaField(thisJavaObject, "minByteStaticValue");
 		
 		Byte byteObj = (Byte) byteField.get(null);
 		
@@ -341,8 +341,8 @@
 
 	
 	public void testShortStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortField = getJavaField(thisJavaObject, "shortStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortField = getJavaField(thisJavaObject, "shortStaticValue");
 		
 		Short shortObj = (Short) shortField.get(null);
 		
@@ -350,8 +350,8 @@
 	}
 	
 	public void testMaxShortStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortField = getJavaField(thisJavaObject, "maxShortStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortField = getJavaField(thisJavaObject, "maxShortStaticValue");
 		
 		Short shortObj = (Short) shortField.get(null);
 		
@@ -359,8 +359,8 @@
 	}
 	
 	public void testMinShortStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortField = getJavaField(thisJavaObject, "minShortStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortField = getJavaField(thisJavaObject, "minShortStaticValue");
 		
 		Short shortObj = (Short) shortField.get(null);
 		
@@ -369,8 +369,8 @@
 
 	
 	public void testCharStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charField = getJavaField(thisJavaObject, "charStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charField = getJavaField(thisJavaObject, "charStaticValue");
 		
 		Character charObj = (Character) charField.get(null);
 		
@@ -378,8 +378,8 @@
 	}
 	
 	public void testMaxCharStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charField = getJavaField(thisJavaObject, "maxCharStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charField = getJavaField(thisJavaObject, "maxCharStaticValue");
 		
 		Character charObj = (Character) charField.get(null);
 		
@@ -387,8 +387,8 @@
 	}
 	
 	public void testMinCharStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charField = getJavaField(thisJavaObject, "minCharStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charField = getJavaField(thisJavaObject, "minCharStaticValue");
 		
 		Character charObj = (Character) charField.get(null);
 		
@@ -396,8 +396,8 @@
 	}
 	
 	public void testIntStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intField = getJavaField(thisJavaObject, "intStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intField = getJavaField(thisJavaObject, "intStaticValue");
 		
 		Integer intObj = (Integer) intField.get(null);
 		
@@ -405,8 +405,8 @@
 	}
 	
 	public void testMaxIntStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intField = getJavaField(thisJavaObject, "maxIntStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intField = getJavaField(thisJavaObject, "maxIntStaticValue");
 		
 		Integer intObj = (Integer) intField.get(null);
 		
@@ -414,8 +414,8 @@
 	}
 	
 	public void testMinIntStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intField = getJavaField(thisJavaObject, "minIntStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intField = getJavaField(thisJavaObject, "minIntStaticValue");
 		
 		Integer intObj = (Integer) intField.get(null);
 		
@@ -423,8 +423,8 @@
 	}
 	
 	public void testFloatStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatField = getJavaField(thisJavaObject, "floatStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatField = getJavaField(thisJavaObject, "floatStaticValue");
 		
 		Float floatObj = (Float) floatField.get(null);
 		
@@ -432,8 +432,8 @@
 	}
 	
 	public void testMaxFloatStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatField = getJavaField(thisJavaObject, "maxFloatStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatField = getJavaField(thisJavaObject, "maxFloatStaticValue");
 		
 		Float floatObj = (Float) floatField.get(null);
 		
@@ -441,8 +441,8 @@
 	}
 	
 	public void testMinFloatStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatField = getJavaField(thisJavaObject, "minFloatStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatField = getJavaField(thisJavaObject, "minFloatStaticValue");
 		
 		Float floatObj = (Float) floatField.get(null);
 		
@@ -450,8 +450,8 @@
 	}
 	
 	public void testDoubleStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleField = getJavaField(thisJavaObject, "doubleStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleField = getJavaField(thisJavaObject, "doubleStaticValue");
 		
 		Double doubleObj = (Double) doubleField.get(null);
 		
@@ -459,51 +459,51 @@
 	}
 	
 	public void testMaxDoubleStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleField = getJavaField(thisJavaObject, "maxDoubleStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleField = getJavaField(thisJavaObject, "maxDoubleStaticValue");
 		
 		Double doubleObj = (Double) doubleField.get(null);
 		
 		assertEquals(doubleObj.doubleValue(), maxDoubleStaticValue, 0.0);		
 	}
 	public void testMinDoubleStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleField = getJavaField(thisJavaObject, "minDoubleStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleField = getJavaField(thisJavaObject, "minDoubleStaticValue");
 		
 		Double doubleObj = (Double) doubleField.get(null);
 		
 		assertEquals(doubleObj.doubleValue(), minDoubleStaticValue, 0.0);		
 	}
 	public void testStringStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField stringField = getJavaField(thisJavaObject, "stringStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField stringField = getJavaField(thisJavaObject, "stringStaticValue");
 		
-		JavaObject stringObject = (JavaObject) stringField.get(null);
+		JVMObject stringObject = (JVMObject) stringField.get(null);
 		
 		assertEquals(String.class.getName().replace('.','/'), stringObject.getJavaClass().getName());		
 	}
 	
 	public void testObjectStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectField = getJavaField(thisJavaObject, "objectStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectField = getJavaField(thisJavaObject, "objectStaticValue");
 		
-		JavaObject objectObject = (JavaObject) objectField.get(null);
+		JVMObject objectObject = (JVMObject) objectField.get(null);
 		
 		assertEquals(Object.class.getName().replace('.','/'), objectObject.getJavaClass().getName());		
 	}
 	
 	public void testNullStaticValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectField = getJavaField(thisJavaObject, "nullStaticValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectField = getJavaField(thisJavaObject, "nullStaticValue");
 		
-		JavaObject objectObject = (JavaObject) objectField.get(null);
+		JVMObject objectObject = (JVMObject) objectField.get(null);
 		
 		assertNull(objectObject);		
 	}
 
 	public void testWrongByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectField = getJavaField(thisJavaObject, "byteValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectField = getJavaField(thisJavaObject, "byteValue");
 		
 		try{
 			Byte byteObj = (Byte) objectField.get(wrongClassObject);
@@ -515,11 +515,11 @@
 	}
 	
 	public void testWrongObjectValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectField = getJavaField(thisJavaObject, "objectValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectField = getJavaField(thisJavaObject, "objectValue");
 		
 		try{
-			JavaObject objectObj = (JavaObject) objectField.get(wrongClassObject);
+			JVMObject objectObj = (JVMObject) objectField.get(wrongClassObject);
 			fail("JavaField.get() should have thrown IllegalArgumentException as passed wrong object.");
 		}catch (IllegalArgumentException e) {
 			// expected

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getBoolean.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -39,8 +39,8 @@
 	int notBoolean = 23;
 	Object notBoolean2 = new Object();
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -48,9 +48,9 @@
 	}
 	
 	public void testIncompatibleClass() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField trueBooleanField = getJavaField(thisJavaObject, "trueBoolean");
-		JavaObject incompatibleClass = getJavaObjectByClassname(incompatibleClassName);
+		JVMObject thisJavaObject = getThis();
+		JVMField trueBooleanField = getJavaField(thisJavaObject, "trueBoolean");
+		JVMObject incompatibleClass = getJavaObjectByClassname(incompatibleClassName);
 		
 		assertNotNull("Couldn't find "+incompatibleClassName,incompatibleClass);
 		try{
@@ -63,8 +63,8 @@
 	
 	
 	public void testNullObjectInstanceField() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField trueBooleanField = getJavaField(thisJavaObject, "trueBoolean");
+		JVMObject thisJavaObject = getThis();
+		JVMField trueBooleanField = getJavaField(thisJavaObject, "trueBoolean");
 		
 		try{
 			boolean trueBooleanValue = trueBooleanField.getBoolean(null);
@@ -76,8 +76,8 @@
 	}
 
 	public void testNonNullObjectInstanceStaticField() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField trueBooleanField = getJavaField(thisJavaObject, "trueStaticBoolean");
+		JVMObject thisJavaObject = getThis();
+		JVMField trueBooleanField = getJavaField(thisJavaObject, "trueStaticBoolean");
 		
 		boolean trueBooleanValue = trueBooleanField.getBoolean(thisJavaObject);
 		
@@ -86,8 +86,8 @@
 	
 	
 	public void testTrueBoolean() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField trueBooleanField = getJavaField(thisJavaObject, "trueBoolean");
+		JVMObject thisJavaObject = getThis();
+		JVMField trueBooleanField = getJavaField(thisJavaObject, "trueBoolean");
 		
 		boolean trueBooleanValue = trueBooleanField.getBoolean(thisJavaObject);
 		
@@ -95,8 +95,8 @@
 	}
 	
 	public void testFalseBoolean() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField falseBooleanField = getJavaField(thisJavaObject, "falseBoolean");
+		JVMObject thisJavaObject = getThis();
+		JVMField falseBooleanField = getJavaField(thisJavaObject, "falseBoolean");
 		
 		boolean falseBooleanValue = falseBooleanField.getBoolean(thisJavaObject);
 		
@@ -104,8 +104,8 @@
 	}
 	
 	public void testTrueStaticBoolean() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField trueBooleanField = getJavaField(thisJavaObject, "trueStaticBoolean");
+		JVMObject thisJavaObject = getThis();
+		JVMField trueBooleanField = getJavaField(thisJavaObject, "trueStaticBoolean");
 		
 		boolean trueBooleanValue = trueBooleanField.getBoolean(null);
 		
@@ -113,8 +113,8 @@
 	}
 	
 	public void testFalseStaticBoolean() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField falseBooleanField = getJavaField(thisJavaObject, "falseStaticBoolean");
+		JVMObject thisJavaObject = getThis();
+		JVMField falseBooleanField = getJavaField(thisJavaObject, "falseStaticBoolean");
 		
 		boolean falseBooleanValue = falseBooleanField.getBoolean(null);
 		
@@ -122,8 +122,8 @@
 	}
 	
 	public void testNotBoolean() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField notBooleanField = getJavaField(thisJavaObject, "notBoolean");
+		JVMObject thisJavaObject = getThis();
+		JVMField notBooleanField = getJavaField(thisJavaObject, "notBoolean");
 		
 		try{
 			boolean notBooleanValue = notBooleanField.getBoolean(thisJavaObject);
@@ -135,8 +135,8 @@
 	}
 	
 	public void testNotBoolean2() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField notBooleanField = getJavaField(thisJavaObject, "notBoolean2");
+		JVMObject thisJavaObject = getThis();
+		JVMField notBooleanField = getJavaField(thisJavaObject, "notBoolean2");
 		
 		try{
 			boolean notBooleanValue = notBooleanField.getBoolean(thisJavaObject);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.tck.testsuite/src/main/java/org/apache/kato/tck/tests/javaruntime/TestJavaField_getByte.java Wed Oct 21 10:29:55 2009
@@ -13,8 +13,8 @@
  ******************************************************************************/
 package org.apache.kato.tck.tests.javaruntime;
 
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMField;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.tck.harness.TCKJavaRuntimeTestcase;
 
@@ -43,8 +43,8 @@
 	
 	
 	
-	static JavaObject thisObject = null;	
-	public JavaObject getThis() {
+	static JVMObject thisObject = null;	
+	public JVMObject getThis() {
 		if (thisObject == null) {
 			thisObject = super.getThis();
 		}	
@@ -52,8 +52,8 @@
 	}
 	
 	public void testMaxByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField maxByteField = getJavaField(thisJavaObject, "maxByte");
+		JVMObject thisJavaObject = getThis();
+		JVMField maxByteField = getJavaField(thisJavaObject, "maxByte");
 		
 		byte maxByteValue = maxByteField.getByte(thisJavaObject);
 		
@@ -61,8 +61,8 @@
 	}
 	
 	public void testMinByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minByteField = getJavaField(thisJavaObject, "minByte");
+		JVMObject thisJavaObject = getThis();
+		JVMField minByteField = getJavaField(thisJavaObject, "minByte");
 		
 		byte minByteValue = minByteField.getByte(thisJavaObject);
 		
@@ -71,8 +71,8 @@
 
 	
 	public void testStaticMinByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField minByteField = getJavaField(thisJavaObject, "staticMinByte");
+		JVMObject thisJavaObject = getThis();
+		JVMField minByteField = getJavaField(thisJavaObject, "staticMinByte");
 		
 		byte minByteValue = minByteField.getByte(null);
 		
@@ -80,8 +80,8 @@
 	}
 	
 	public void testZeroByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField zeroByteField = getJavaField(thisJavaObject, "zeroByte");
+		JVMObject thisJavaObject = getThis();
+		JVMField zeroByteField = getJavaField(thisJavaObject, "zeroByte");
 		
 		byte zeroByteValue = zeroByteField.getByte(thisJavaObject);
 		
@@ -89,8 +89,8 @@
 	}
 	
 	public void testNegByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField negByteField = getJavaField(thisJavaObject, "negByte");
+		JVMObject thisJavaObject = getThis();
+		JVMField negByteField = getJavaField(thisJavaObject, "negByte");
 		
 		byte negByteValue = negByteField.getByte(thisJavaObject);
 		
@@ -98,8 +98,8 @@
 	}	
 	
 	public void testPosByteValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField posByteField = getJavaField(thisJavaObject, "posByte");
+		JVMObject thisJavaObject = getThis();
+		JVMField posByteField = getJavaField(thisJavaObject, "posByte");
 		
 		byte posByteValue = posByteField.getByte(thisJavaObject);
 		
@@ -107,8 +107,8 @@
 	}
 	
 	public void testDoubleValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField doubleValueField = getJavaField(thisJavaObject, "doubleValue");
 
 		try{
 			byte aDoubleValue = doubleValueField.getByte(thisJavaObject);
@@ -119,8 +119,8 @@
 	}
 	
 	public void testFloatValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField floatValueField = getJavaField(thisJavaObject, "floatValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField floatValueField = getJavaField(thisJavaObject, "floatValue");
 
 		try{
 			byte aFloatValue = floatValueField.getByte(thisJavaObject);
@@ -131,8 +131,8 @@
 	}
 	
 	public void testLongValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField longValueField = getJavaField(thisJavaObject, "longValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField longValueField = getJavaField(thisJavaObject, "longValue");
 
 		try{
 			byte aLongValue = longValueField.getByte(thisJavaObject);
@@ -143,8 +143,8 @@
 	}
 	
 	public void testIntValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField intValueField = getJavaField(thisJavaObject, "intValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField intValueField = getJavaField(thisJavaObject, "intValue");
 
 		try{
 			byte aIntValue = intValueField.getByte(thisJavaObject);
@@ -155,8 +155,8 @@
 	}
 	
 	public void testCharValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField charValueField = getJavaField(thisJavaObject, "charValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField charValueField = getJavaField(thisJavaObject, "charValue");
 
 		try{
 			byte aCharValue = charValueField.getByte(thisJavaObject);
@@ -167,8 +167,8 @@
 	}
 	
 	public void testShortValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField shortValueField = getJavaField(thisJavaObject, "shortValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField shortValueField = getJavaField(thisJavaObject, "shortValue");
 
 		try{
 			byte aShortValue = shortValueField.getByte(thisJavaObject);
@@ -179,8 +179,8 @@
 	}
 	
 	public void testBooleanValue() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
+		JVMObject thisJavaObject = getThis();
+		JVMField booleanValueField = getJavaField(thisJavaObject, "booleanValue");
 		
 		try{
 			byte aBooleanValue = booleanValueField.getByte(thisJavaObject);
@@ -191,8 +191,8 @@
 	}
 	
 	public void testObjectReference() throws Exception {
-		JavaObject thisJavaObject = getThis();
-		JavaField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
+		JVMObject thisJavaObject = getThis();
+		JVMField objectReferenceField = getJavaField(thisJavaObject, "objectReference");
 		
 		try{
 			byte anObjectReference = objectReferenceField.getByte(thisJavaObject);



Mime
View raw message