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 [2/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.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaHeapImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaHeapImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaHeapImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaHeapImpl.java Wed Oct 21 10:29:55 2009
@@ -21,8 +21,8 @@
 
 import javax.tools.diagnostics.image.ImageAddressSpace;
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.common.BasicType;
 import org.apache.kato.common.IteratorBackedList;
@@ -74,7 +74,7 @@
 		Iterator iter = new Iterator(){
 			
 			int latestRecord=0;
-			private JavaObject nextObject=null;
+			private JVMObject nextObject=null;
 			
 			@Override
 			public boolean hasNext() {
@@ -146,7 +146,7 @@
 	 * @return
 	 */
 	@Override
-	public JavaObject getObjectByID(Long ID) {
+	public JVMObject getObjectByID(Long ID) {
 		if (ID.longValue() == 0L) {
 			return null;
 		}
@@ -192,7 +192,7 @@
 
 	final static private String primitiveArrayClassNames[] = {"[Z","[C","[F","[D","[B","[S","[I","[J"};
 	
-	private JavaClass[] primitiveArrayClasses = new JavaClass[8];
+	private JVMClass[] primitiveArrayClasses = new JVMClass[8];
 	
 	/**
 	 * Gets the primitive array of the passed basic type.
@@ -201,12 +201,12 @@
 	 * @param type a value from 4 to 11
 	 * @return JavaClassImpl of a primitive array
 	 */
-	public JavaClass getPrimitiveArrayClass(short type) {
+	public JVMClass getPrimitiveArrayClass(short type) {
 		if (type <4 || type > 11) {
 			throw new IllegalArgumentException("Passed invalid basic type id "+type);
 		}
 		
-		JavaClass clazz = primitiveArrayClasses[type-4];
+		JVMClass clazz = primitiveArrayClasses[type-4];
 		
 		if(clazz == null) {
 			IJavaClass viewClass = view.getPrimitiveArrayClass(type);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectArrayImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectArrayImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectArrayImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectArrayImpl.java Wed Oct 21 10:29:55 2009
@@ -21,9 +21,9 @@
 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;
 
 import org.apache.kato.hprof.datalayer.IGCObjectArrayHeapDumpRecord;
 
@@ -33,7 +33,7 @@
  * 
  *
  */
-public class JavaObjectArrayImpl implements JavaObject {
+public class JavaObjectArrayImpl implements JVMObject {
 	private IJavaHeapInternal heap;
 	private IGCObjectArrayHeapDumpRecord record;
 
@@ -67,11 +67,11 @@
 		if (!dst.getClass().isArray()) {
 			throw new IllegalArgumentException("Destination array must be an array, not "+dst.getClass().getName());			
 		}
-		if(dst.getClass().getComponentType() != JavaObject.class) {
+		if(dst.getClass().getComponentType() != JVMObject.class) {
 			throw new IllegalArgumentException("Destination array wrong type - must be JavaObject array");
 		}
 		
-		JavaObject[] array = (JavaObject[]) dst;
+		JVMObject[] array = (JVMObject[]) dst;
 		checkArrayBounds(dstStart, array.length, length);
 		
 		for (int i=0; i < length; i++) {
@@ -97,7 +97,7 @@
 	}
 
 	@Override
-	public JavaHeap getHeap() throws CorruptDataException, DataUnavailable {
+	public JVMHeap getHeap() throws CorruptDataException, DataUnavailable {
 		return heap;
 	}
 
@@ -107,7 +107,7 @@
 	}
 
 	@Override
-	public JavaClass getJavaClass() throws CorruptDataException {
+	public JVMClass getJavaClass() throws CorruptDataException {
 		return heap.getJavaClassByID(record.getArrayClassObjectID());
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectInstanceImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectInstanceImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectInstanceImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaObjectInstanceImpl.java Wed Oct 21 10:29:55 2009
@@ -20,12 +20,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.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.hprof.datalayer.IGCInstanceHeapDumpRecord;
 
-final class JavaObjectInstanceImpl implements JavaObject {
+final class JavaObjectInstanceImpl implements JVMObject {
 	/**
 	 * 
 	 */
@@ -58,7 +58,7 @@
 	}
 
 	@Override
-	public JavaHeap getHeap()
+	public JVMHeap getHeap()
 			throws CorruptDataException,
 			DataUnavailable {
 		return heap;

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveArrayImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveArrayImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveArrayImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveArrayImpl.java Wed Oct 21 10:29:55 2009
@@ -21,15 +21,15 @@
 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;
 
 import org.apache.kato.common.BasicType;
 import org.apache.kato.hprof.datalayer.IGCPrimitiveArrayHeapDumpRecord;
 import org.apache.kato.hprof.image.CorruptDataImpl;
 
-public class JavaPrimitiveArrayImpl implements JavaObject {
+public class JavaPrimitiveArrayImpl implements JVMObject {
 	private IJavaHeapInternal heap;
 	private IGCPrimitiveArrayHeapDumpRecord record;
 
@@ -187,7 +187,7 @@
 	}
 
 	@Override
-	public JavaHeap getHeap() throws CorruptDataException, DataUnavailable {
+	public JVMHeap getHeap() throws CorruptDataException, DataUnavailable {
 		return heap;
 	}
 
@@ -197,7 +197,7 @@
 	}
 
 	@Override
-	public JavaClass getJavaClass() throws CorruptDataException {
+	public JVMClass getJavaClass() throws CorruptDataException {
 		return heap.getPrimitiveArrayClass(record.getElementType());
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveClassImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveClassImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveClassImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaPrimitiveClassImpl.java Wed Oct 21 10:29:55 2009
@@ -18,9 +18,9 @@
 
 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.hprof.image.ImagePointerImpl;
 
@@ -30,24 +30,24 @@
  * 
  *
  */
-public class JavaPrimitiveClassImpl implements JavaClass {
+public class JavaPrimitiveClassImpl implements JVMClass {
 	private String name;
 	private ImagePointer id;
-	private JavaClassLoader loader;
+	private JVMClassLoader loader;
 	
-	public JavaPrimitiveClassImpl(String name, ImagePointer id, JavaClassLoader loader) {
+	public JavaPrimitiveClassImpl(String name, ImagePointer id, JVMClassLoader loader) {
 		this.name = name;
 		this.id = id;
 		this.loader = loader;
 	}
 	
 	@Override
-	public JavaClassLoader getClassLoader() throws CorruptDataException {
+	public JVMClassLoader getClassLoader() throws CorruptDataException {
 		return loader;
 	}
 
 	@Override
-	public JavaClass getComponentType() throws CorruptDataException {
+	public JVMClass getComponentType() throws CorruptDataException {
 		throw new IllegalArgumentException("Primitive class is not an array. There is no component type");
 	}
 
@@ -92,7 +92,7 @@
 	 * Primitive type have no superclass - not even java/lang/Object.
 	 */
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		return null;
 	}
 
@@ -102,7 +102,7 @@
 	}
 
 	@Override
-	public JavaClass getSuperclass() throws CorruptDataException {
+	public JVMClass getSuperclass() throws CorruptDataException {
 		return null;		
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaRuntimeImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaRuntimeImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaRuntimeImpl.java Wed Oct 21 10:29:55 2009
@@ -24,16 +24,16 @@
 import javax.tools.diagnostics.image.ImageAddressSpace;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.MemoryAccessException;
-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.JavaVMInitArgs;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+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.hprof.HProfView;
 import org.apache.kato.hprof.IJavaThread;
 import org.apache.kato.hprof.image.CorruptDataImpl;
 
-public class JavaRuntimeImpl implements JavaRuntime {
+public class JavaRuntimeImpl implements JVMRuntime {
 
 	private HProfView view=null;
 	public JavaRuntimeImpl(HProfView view, ImageAddressSpace addressSpace) {
@@ -94,7 +94,7 @@
 	}
 
 	@Override
-	public JavaVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
+	public JVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
 			CorruptDataException {
 			throw new DataUnavailable();
 			
@@ -121,10 +121,10 @@
 	 * 
 	 */
 	@Override
-	public JavaObject getObjectAtAddress(ImagePointer address)
+	public JVMObject getObjectAtAddress(ImagePointer address)
 			throws CorruptDataException, IllegalArgumentException,
 			MemoryAccessException, DataUnavailable {
-		JavaObject obj = heap.getObjectByID(address.getAddress());
+		JVMObject obj = heap.getObjectByID(address.getAddress());
 		
 		if (obj == null) {
 			throw new IllegalArgumentException("Couldn't retrieve object @"+
@@ -178,7 +178,7 @@
 	
 
 
-	JavaHeap getHeap() {
+	JVMHeap getHeap() {
 		return heap;
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaStackFrameImpl.java Wed Oct 21 10:29:55 2009
@@ -7,11 +7,11 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.DiagnosticException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaLocation;
-import javax.tools.diagnostics.runtime.java.JavaMethod;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+import javax.tools.diagnostics.runtime.java.JVMClass;
+import javax.tools.diagnostics.runtime.java.JVMLocation;
+import javax.tools.diagnostics.runtime.java.JVMMethod;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
 import org.apache.kato.hprof.IJavaStackFrame;
 import org.apache.kato.hprof.image.ImagePointerImpl;
@@ -20,7 +20,7 @@
  * 	A stack frame, wraps a {@link IJavaHeapInternal}.
  *
  */
-public class JavaStackFrameImpl implements JavaStackFrame {
+public class JavaStackFrameImpl implements JVMStackFrame {
 	private IJavaStackFrame frame;
 	private IJavaHeapInternal heap;
 	
@@ -46,9 +46,9 @@
 		return null;
 	}
 
-	private JavaLocation location = new JavaLocationImpl();
+	private JVMLocation location = new JavaLocationImpl();
 	@Override
-	public JavaLocation getLocation() throws CorruptDataException {
+	public JVMLocation getLocation() throws CorruptDataException {
 		return location;
 	}
 
@@ -57,7 +57,7 @@
 	 * There is a 1:1 relationship with JavaStackFrames. 
 	 *
 	 */
-	private class JavaLocationImpl implements JavaLocation {
+	private class JavaLocationImpl implements JVMLocation {
 		
 		/**
 		 * For testing equality.
@@ -104,7 +104,7 @@
 		private JavaMethodImpl method = new JavaMethodImpl();
 		
 		@Override
-		public JavaMethod getMethod() throws CorruptDataException {
+		public JVMMethod getMethod() throws CorruptDataException {
 			return method;
 		}
 		
@@ -131,7 +131,7 @@
 	 *  A dummy method. 
 	 *
 	 */
-	private class JavaMethodImpl implements JavaMethod {
+	private class JavaMethodImpl implements JVMMethod {
 
 		/**
 		 * HProf has no bytecode sections.
@@ -153,7 +153,7 @@
 		}
 
 		@Override
-		public JavaClass getDeclaringClass() throws CorruptDataException,
+		public JVMClass getDeclaringClass() throws CorruptDataException,
 				DataUnavailable {			
 			return heap.getJavaClassByID(frame.getMethodClass().getClassObjectID());
 		}
@@ -213,8 +213,8 @@
 		}
 
 		@Override
-		public List<JavaVariable> getVariables()  {
-			return new LinkedList<JavaVariable>();
+		public List<JVMVariable> getVariables()  {
+			return new LinkedList<JVMVariable>();
 		}
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaSyntheticPrimitiveArrayImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaSyntheticPrimitiveArrayImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaSyntheticPrimitiveArrayImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaSyntheticPrimitiveArrayImpl.java Wed Oct 21 10:29:55 2009
@@ -18,9 +18,9 @@
 
 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;
 
 
 /**
@@ -28,7 +28,7 @@
  * to represent them. 
  *
  */
-public class JavaSyntheticPrimitiveArrayImpl implements JavaClass {
+public class JavaSyntheticPrimitiveArrayImpl implements JVMClass {
 	private JavaPrimitiveClassImpl componentType;
 	private String name;
 	private JavaClassLoaderImpl loader;
@@ -39,11 +39,11 @@
 		this.loader = loader; 
 	}
 
-	public JavaClassLoader getClassLoader() throws CorruptDataException {
+	public JVMClassLoader getClassLoader() throws CorruptDataException {
 		return loader;
 	}
 
-	public JavaClass getComponentType() throws CorruptDataException {
+	public JVMClass getComponentType() throws CorruptDataException {
 		return componentType;
 	}
 
@@ -75,7 +75,7 @@
 		return name;
 	}
 
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		return null;
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaThreadImpl.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaThreadImpl.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaThreadImpl.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/main/java/org/apache/kato/hprof/java/JavaThreadImpl.java Wed Oct 21 10:29:55 2009
@@ -21,8 +21,8 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImagePointer;
 import javax.tools.diagnostics.image.ImageThread;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaThread;
+import javax.tools.diagnostics.runtime.java.JVMObject;
+import javax.tools.diagnostics.runtime.java.JVMThread;
 
 import org.apache.kato.hprof.IJavaStack;
 import org.apache.kato.hprof.IJavaStackFrame;
@@ -32,7 +32,7 @@
  * Implements a JavaThread by wrapping a IJavaThread from HprofView.
  *
  */
-public class JavaThreadImpl implements JavaThread {
+public class JavaThreadImpl implements JVMThread {
 	private IJavaHeapInternal heap;
 	private IJavaThread thread;
 	
@@ -71,7 +71,7 @@
 	}
 
 	@Override
-	public JavaObject getObject() throws CorruptDataException {
+	public JVMObject getObject() throws CorruptDataException {
 		return heap.getObjectByID(thread.getThreadObjectID());
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaHeapImplTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaHeapImplTest.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaHeapImplTest.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaHeapImplTest.java Wed Oct 21 10:29:55 2009
@@ -18,7 +18,7 @@
 import java.util.List;
 
 import javax.tools.diagnostics.image.ImagePointer;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 import org.apache.kato.hprof.image.ImagePointerImpl;
 
@@ -52,12 +52,12 @@
 		return null;
 	}
 
-	HashMap<Long,JavaObject> objectIDMap = new HashMap<Long,JavaObject>();
-	public void setObjectByID(Long id, JavaObject obj) {
+	HashMap<Long,JVMObject> objectIDMap = new HashMap<Long,JVMObject>();
+	public void setObjectByID(Long id, JVMObject obj) {
 		objectIDMap.put(id, obj);
 	}
 	@Override
-	public JavaObject getObjectByID(Long element) {
+	public JVMObject getObjectByID(Long element) {
 		return objectIDMap.get(element);
 	}
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaPrimitiveClassImplTest.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaPrimitiveClassImplTest.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaPrimitiveClassImplTest.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/org/apache/kato/hprof/java/JavaPrimitiveClassImplTest.java Wed Oct 21 10:29:55 2009
@@ -15,7 +15,7 @@
 
 import java.util.Iterator;
 
-import javax.tools.diagnostics.runtime.java.JavaClass;
+import javax.tools.diagnostics.runtime.java.JVMClass;
 
 import junit.framework.TestCase;
 
@@ -60,7 +60,7 @@
 	
 	public void getComponentType() throws Exception {
 		try{
-			JavaClass clazz = instance.getComponentType();
+			JVMClass clazz = instance.getComponentType();
 			
 			fail("Expected IllegalArgumentException from getComponentType(), got " + clazz);
 		}catch(IllegalArgumentException e) {

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/AbstractHProfTestCase.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/AbstractHProfTestCase.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/AbstractHProfTestCase.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/AbstractHProfTestCase.java Wed Oct 21 10:29:55 2009
@@ -21,8 +21,8 @@
 import javax.tools.diagnostics.image.Image;
 import javax.tools.diagnostics.image.ImageAddressSpace;
 import javax.tools.diagnostics.image.ImageProcess;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 import junit.framework.TestCase;
 
@@ -91,21 +91,21 @@
 		
 	}
 
-	protected JavaRuntime getJavaRuntime() throws IOException {
+	protected JVMRuntime getJavaRuntime() throws IOException {
 		
-		return (JavaRuntime) getCurrentProcess().getRuntimes().get(0); 
+		return (JVMRuntime) getCurrentProcess().getRuntimes().get(0); 
 	}
-protected JavaRuntime getPopulatedJavaRuntime() throws IOException {
+protected JVMRuntime getPopulatedJavaRuntime() throws IOException {
 		
-		return (JavaRuntime) getCurrentProcess().getRuntimes().get(0); 
+		return (JVMRuntime) getCurrentProcess().getRuntimes().get(0); 
 	}
 
-protected JavaHeap getPopulatedJavaHeap() throws IOException {
+protected JVMHeap getPopulatedJavaHeap() throws IOException {
 	Image populated=getPopulatedImage();
 	ImageAddressSpace space=(ImageAddressSpace)populated.getAddressSpaces().get(0);
 	ImageProcess process=space.getCurrentProcess();
-	JavaRuntime rt=(JavaRuntime) process.getRuntimes().get(0);
-	return (JavaHeap) rt.getHeaps().get(0);
+	JVMRuntime rt=(JVMRuntime) process.getRuntimes().get(0);
+	return (JVMHeap) rt.getHeaps().get(0);
 	 
 }
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/TestImageProcess.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/TestImageProcess.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/TestImageProcess.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/image/TestImageProcess.java Wed Oct 21 10:29:55 2009
@@ -21,7 +21,7 @@
 import javax.tools.diagnostics.image.DataUnavailable;
 import javax.tools.diagnostics.image.ImageAddressSpace;
 import javax.tools.diagnostics.image.ImageProcess;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
+import javax.tools.diagnostics.runtime.java.JVMRuntime;
 
 
 
@@ -155,7 +155,7 @@
 		while (runtimes.hasNext()) {
 			Object obj = runtimes.next();
 			count++;
-			assertTrue(obj instanceof JavaRuntime);
+			assertTrue(obj instanceof JVMRuntime);
 		}
 		
 		assertEquals(1, count);

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaHeap.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaHeap.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaHeap.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaHeap.java Wed Oct 21 10:29:55 2009
@@ -17,8 +17,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JVMHeap;
+import javax.tools.diagnostics.runtime.java.JVMObject;
 
 
 import test.apache.kato.hprof.image.AbstractHProfTestCase;
@@ -28,7 +28,7 @@
 	
 	public void testGetName() throws IOException {
 		
-		JavaHeap heap=getPopulatedJavaHeap();
+		JVMHeap heap=getPopulatedJavaHeap();
 		String name=heap.getName();
 		assertNotNull(name);
 		
@@ -36,14 +36,14 @@
 	
 	public void testGetSectionsReturns() throws IOException {
 		
-		JavaHeap heap=getPopulatedJavaHeap();
+		JVMHeap heap=getPopulatedJavaHeap();
 		List i=heap.getSections();
 		assertNotNull(i);
 		
 	}
 	public void testGetSectionsIsEmpty() throws IOException {
 		
-		JavaHeap heap=getPopulatedJavaHeap();
+		JVMHeap heap=getPopulatedJavaHeap();
 		Iterator i=heap.getSections().iterator();
 		assertFalse("expected empty iterator",i.hasNext());
 		
@@ -51,12 +51,12 @@
 	
 	public void testGetObjectsReturns() throws Exception {
 		
-		JavaHeap heap=getPopulatedJavaHeap();
+		JVMHeap heap=getPopulatedJavaHeap();
 		Iterator i=heap.getObjects().iterator();
 		
 		int count=0;
 		while (i.hasNext()) {
-			JavaObject obj = (JavaObject)i.next();
+			JVMObject obj = (JVMObject)i.next();
 			count++;
 		}
 		

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaRuntime.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaRuntime.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaRuntime.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.hprof.api/src/test/java/test/apache/kato/hprof/java/TestJavaRuntime.java Wed Oct 21 10:29:55 2009
@@ -22,9 +22,9 @@
 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 test.apache.kato.hprof.image.AbstractHProfTestCase;
@@ -33,32 +33,32 @@
 
 	public void testGetFullVersion() throws IOException, CorruptDataException {
 
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		assertNotNull(runtime.getFullVersion());
 
 	}
 	public void testGetVersion() throws IOException, CorruptDataException {
 
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		assertNotNull(runtime.getVersion());
 
 	}
 
 
 	public void testEqualsPasses() throws IOException {
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		assertTrue(runtime.equals(runtime));
 
 	}
 	public void testEqualsFails() throws IOException {
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		assertFalse(runtime.equals(new MockJavaRuntime()));
 
 	}
 
 	public void testGetMonitors() throws IOException {
 
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		List l=runtime.getMonitors();
 
 		int count=l.size();
@@ -67,7 +67,7 @@
 	}
 
 	public void testGetJVM() throws IOException, DataUnavailable, CorruptDataException {
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 
 		ImagePointer pointer=(ImagePointer) runtime.getJavaVM();
 		assertNull(pointer);
@@ -75,7 +75,7 @@
 	}
 
 	public void testGetVMArguments() throws CorruptDataException, IOException {
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		try {
 			runtime.getJavaVMInitArgs();
 			fail("expected DataUnavailable exception");
@@ -86,25 +86,25 @@
 	}
 
 	public void testGetCompiledMethodsReturns() throws IOException {
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		List i=runtime.getCompiledMethods();
 		assertNotNull(i);
 
 	}
 	public void testGetCompiledMethodsIteratorIsEmpty() throws IOException {
-		JavaRuntime runtime=getJavaRuntime();
+		JVMRuntime runtime=getJavaRuntime();
 		Iterator i=runtime.getCompiledMethods().iterator();
 		assertFalse("compiled methods iterator is not empty",i.hasNext());
 
 	}
 
 	public void testGetHeapIteratorReturns() throws IOException {
-		JavaRuntime runtime=getPopulatedJavaRuntime();
+		JVMRuntime runtime=getPopulatedJavaRuntime();
 		List i=runtime.getHeaps();
 		assertNotNull(i);
 
 	}
-	private final class MockJavaRuntime implements JavaRuntime {
+	private final class MockJavaRuntime implements JVMRuntime {
 		@Override
 		public List getCompiledMethods() {
 
@@ -136,7 +136,7 @@
 		}
 
 		@Override
-		public JavaVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
+		public JVMInitArgs getJavaVMInitArgs() throws DataUnavailable,
 		CorruptDataException {
 
 			return null;
@@ -149,7 +149,7 @@
 		}
 
 		@Override
-		public JavaObject getObjectAtAddress(ImagePointer address)
+		public JVMObject getObjectAtAddress(ImagePointer address)
 		throws CorruptDataException, IllegalArgumentException,
 		MemoryAccessException, DataUnavailable {
 

Modified: incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/KatoReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/KatoReader.java?rev=827952&r1=827951&r2=827952&view=diff
==============================================================================
--- incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/KatoReader.java (original)
+++ incubator/kato/branches/experimental/thirdview/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/KatoReader.java Wed Oct 21 10:29:55 2009
@@ -33,18 +33,18 @@
 import javax.tools.diagnostics.image.ImageAddressSpace;
 import javax.tools.diagnostics.image.ImageProcess;
 import javax.tools.diagnostics.image.MemoryAccessException;
-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.JavaLocation;
-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.JavaRuntime;
-import javax.tools.diagnostics.runtime.java.JavaStackFrame;
-import javax.tools.diagnostics.runtime.java.JavaThread;
-import javax.tools.diagnostics.runtime.java.JavaVariable;
+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.JVMLocation;
+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.JVMRuntime;
+import javax.tools.diagnostics.runtime.java.JVMStackFrame;
+import javax.tools.diagnostics.runtime.java.JVMThread;
+import javax.tools.diagnostics.runtime.java.JVMVariable;
 
 
 /**
@@ -82,7 +82,7 @@
  * 
  */
 public class KatoReader implements CacherProvider{
-	private HashMap<Long, JavaClass> classes;
+	private HashMap<Long, JVMClass> classes;
 	//	Image is actually an 'image' of the core at crash time.
 	//	Since it's the basis of every query, I'm saving it over queries
 	private Image image = null;
@@ -94,9 +94,9 @@
 	public static final int FLAG_REPLY_PACKET = 0x80;
 
 	private int LAST_ID = 1;
-	private HashMap<Integer, JavaMethod> intToMethod;
-	private HashMap<JavaMethod, Integer> methodToInt;
-	private Vector<JavaField> fieldList;
+	private HashMap<Integer, JVMMethod> intToMethod;
+	private HashMap<JVMMethod, Integer> methodToInt;
+	private Vector<JVMField> fieldList;
 	private JDILogger logr;
 	public static final int ERROR_NONE = 0;
 	public static final int ERROR_INVALID_OBJECT = 20;
@@ -110,8 +110,8 @@
 	
 	public static final int INVALID_EVENT_TYPE = 102;
 	
-	private HashMap<Long, JavaObject> objectMap;
-	private HashMap<Long, JavaMonitor> monitorMap;
+	private HashMap<Long, JVMObject> objectMap;
+	private HashMap<Long, JVMMonitor> monitorMap;
 
 	public static final int COMMANDSET_VIRTUAL_MACHINE = 1;
 	public static final int COMMANDSET_REFERENCE_TYPE = 2;
@@ -219,7 +219,7 @@
 	 * @throws Exception	Exception passed up if underlying Kato calls fail
 	 */
 
-	private boolean getValueFromField(Vector<Byte> vctr, JavaObject jObject, JavaField jField) throws Exception{
+	private boolean getValueFromField(Vector<Byte> vctr, JVMObject jObject, JVMField jField) throws Exception{
 		logr.log(JDILogger.LEVEL_VERYVERBOSE, "  " + jField.getName() + "("+jField.getSignature()+")");   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 		byte signature = (byte)jField.getSignature().charAt(0);
 		if (jField.getSignature().equals("Ljava/lang/String;")){ //$NON-NLS-1$
@@ -229,15 +229,15 @@
 		switch (signature){
 			case '[':
 				try{
-					if(jField.get(jObject) instanceof JavaObject){
-						JavaObject jOut = (JavaObject)jField.get(jObject);
+					if(jField.get(jObject) instanceof JVMObject){
+						JVMObject jOut = (JVMObject)jField.get(jObject);
 						if (!objectMap.containsKey(jOut.getID().getAddress())){
 							objectMap.put(jOut.getID().getAddress(), jOut);
 						}
 						logr.log(JDILogger.LEVEL_VERYVERBOSE, "  ARRAY: " + jOut.getID().getAddress()); //$NON-NLS-1$
 						addLongToVector(vctr, jOut.getID().getAddress());
 
-					}else if (jField.get(jObject) instanceof JavaClass){
+					}else if (jField.get(jObject) instanceof JVMClass){
 						logr.logError(JDILogger.LEVEL_VERYVERBOSE, "  ARRAY: Actually a class?!"); //$NON-NLS-1$
 						addLongToVector(vctr, 0);
 					}else{
@@ -258,7 +258,7 @@
 			{
 				try{
 					//Add the string to the lookup table
-					JavaObject jOut = (JavaObject)jField.get(jObject);
+					JVMObject jOut = (JVMObject)jField.get(jObject);
 					vctrs.put(jOut.getID().getAddress(), jField.getString(jObject));
 				}
 				catch(NullPointerException exxy){}
@@ -277,8 +277,8 @@
 			case 'c':
 			{
 				try{
-					if(jField.get(jObject) instanceof JavaObject){
-						JavaObject jOut = (JavaObject)jField.get(jObject);
+					if(jField.get(jObject) instanceof JVMObject){
+						JVMObject jOut = (JVMObject)jField.get(jObject);
 						addLongToVector(vctr, jOut.getID().getAddress());
 						if (!objectMap.containsKey(jOut.getID().getAddress())){
 							objectMap.put(jOut.getID().getAddress(), jOut);
@@ -480,7 +480,7 @@
 	 * @param methodID	Address of the method as stored in the vector
 	 * @return The Kato JavaMethod
 	 */
-	private JavaMethod getMethod(long methodID){
+	private JVMMethod getMethod(long methodID){
 		if (intToMethod == null){
 			buildMethods();
 		}
@@ -493,7 +493,7 @@
 	 * @param fieldID	Address of a given field as stored in the vector
 	 * @return The Kato JavaField
 	 */
-	private JavaField getField(long fieldID){
+	private JVMField getField(long fieldID){
 		if (fieldList == null){
 			fieldList = buildFields();
 		}
@@ -501,8 +501,8 @@
 
 	}
 	
-	private HashMap<Long, JavaMonitor> buildMonitors(){
-		HashMap<Long, JavaMonitor> monitors = new HashMap<Long, JavaMonitor>();
+	private HashMap<Long, JVMMonitor> buildMonitors(){
+		HashMap<Long, JVMMonitor> monitors = new HashMap<Long, JVMMonitor>();
 		Iterator asIt = image.getAddressSpaces( ).iterator();
 		while ( asIt.hasNext( ) )
 		{
@@ -514,9 +514,9 @@
 				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
-					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
-					List<JavaMonitor> jms = javaRT.getMonitors();
-					for (JavaMonitor jm: jms){
+					JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
+					List<JVMMonitor> jms = javaRT.getMonitors();
+					for (JVMMonitor jm: jms){
 						monitors.put(jm.getObject().getID().getAddress(), jm);
 					}
 				}
@@ -529,15 +529,15 @@
 	 * Build the field vector by going through all the classes
 	 * @return A vector containing a list of JDIJavaFields
 	 */
-	private Vector<JavaField> buildFields(){
-		Vector<JavaField> fieldList = new Vector<JavaField>();
-		Iterator<JavaClass> jClasses = classes.values().iterator();
+	private Vector<JVMField> buildFields(){
+		Vector<JVMField> fieldList = new Vector<JVMField>();
+		Iterator<JVMClass> jClasses = classes.values().iterator();
 		logr.log(JDILogger.LEVEL_VERYVERBOSE, "Building field list..."); //$NON-NLS-1$
 		while(jClasses.hasNext()){
-			JavaClass jClass = jClasses.next();
+			JVMClass jClass = jClasses.next();
 			Iterator jFields = jClass.getDeclaredFields().iterator();
 			while(jFields.hasNext()){
-				JavaField jField = (JavaField)jFields.next();
+				JVMField jField = (JVMField)jFields.next();
 				try{
 					fieldList.add(jField);
 
@@ -559,15 +559,15 @@
 	 * Generate a list of fowards and backwards int to JavaMethod list.
 	 */
 	private void buildMethods(){
-		intToMethod = new HashMap<Integer, JavaMethod>();
-		methodToInt = new HashMap<JavaMethod, Integer>();
-		Iterator<JavaClass> jClasses = classes.values().iterator();
+		intToMethod = new HashMap<Integer, JVMMethod>();
+		methodToInt = new HashMap<JVMMethod, Integer>();
+		Iterator<JVMClass> jClasses = classes.values().iterator();
 		logr.log(JDILogger.LEVEL_VERYVERBOSE, "Building method list..."); //$NON-NLS-1$
 		while(jClasses.hasNext()){
-			JavaClass jClass = jClasses.next();
+			JVMClass jClass = jClasses.next();
 			Iterator jMethods = jClass.getDeclaredMethods().iterator();
 			while(jMethods.hasNext()){
-				JavaMethod jMethod = (JavaMethod)jMethods.next();
+				JVMMethod jMethod = (JVMMethod)jMethods.next();
 				try{
 					int index = intToMethod.size();
 					intToMethod.put(index, jMethod);
@@ -592,7 +592,7 @@
 	 * @return A unique ID for this method
 	 */
 
-	private long getMethodId(long refType, JavaMethod jMethod){
+	private long getMethodId(long refType, JVMMethod jMethod){
 		int id = methodToInt.get(jMethod);
 		if (id < 0 || id > methodToInt.size()){
 			logr.logError(JDILogger.LEVEL_VERBOSE, "  Could not find method in list"); //$NON-NLS-1$
@@ -608,7 +608,7 @@
 	 * @return A unique ID for this field
 	 */
 
-	private long getFieldId(long refType, JavaField jField){
+	private long getFieldId(long refType, JVMField jField){
 		int id = fieldList.indexOf(jField);
 		if (id < 0 || id > fieldList.size()){
 			logr.logError(JDILogger.LEVEL_VERBOSE, "  Could not find field in list"); //$NON-NLS-1$
@@ -628,8 +628,8 @@
 	 */
 	private boolean getFieldFromObject(Vector<Byte> vctr, long objectID, long fieldID) throws Exception{
 
-		JavaField jField = getField(fieldID);
-		JavaObject jObject = getObject(objectID);
+		JVMField jField = getField(fieldID);
+		JVMObject jObject = getObject(objectID);
 		if (jField != null && jObject != null){
 			return getValueFromField(vctr, jObject, jField);
 		}
@@ -650,9 +650,9 @@
 	 */
 	private boolean getFieldFromClass(Vector<Byte> vctr, long refType, long fieldID) throws Exception{
 
-		JavaClass javaClass = getClass(refType);
+		JVMClass javaClass = getClass(refType);
 		if (javaClass != null){
-			JavaField jField = getField(fieldID);
+			JVMField jField = getField(fieldID);
 			if (jField != null){
 				return getValueFromField(vctr, javaClass.getObject(), jField);
 			}
@@ -670,9 +670,9 @@
 	 * Build a hashmap using the JavaClass address as a unique ID and key
 	 * @return A hashmap containing all the classes and addresses
 	 */
-	private HashMap<Long, JavaClass> buildClasses() {
+	private HashMap<Long, JVMClass> buildClasses() {
 		logr.log(JDILogger.LEVEL_VERYVERBOSE, "Building class list"); //$NON-NLS-1$
-		HashMap<Long, JavaClass> classes = new HashMap<Long, JavaClass>();
+		HashMap<Long, JVMClass> classes = new HashMap<Long, JVMClass>();
 		Iterator asIt = image.getAddressSpaces( ).iterator();
 		while ( asIt.hasNext( ) )
 		{
@@ -684,15 +684,15 @@
 				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
-					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+					JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 					Iterator classLoaders = javaRT.getJavaClassLoaders().iterator();
 					while (classLoaders.hasNext()){
 
-						JavaClassLoader javaCL = (JavaClassLoader)classLoaders.next();
+						JVMClassLoader javaCL = (JVMClassLoader)classLoaders.next();
 						Iterator javaClasses = javaCL.getDefinedClasses().iterator();
 
 						while (javaClasses.hasNext()){
-							JavaClass javaClass = (JavaClass)javaClasses.next();
+							JVMClass javaClass = (JVMClass)javaClasses.next();
 
 							classes.put(javaClass.getID().getAddress(), javaClass);
 
@@ -719,7 +719,7 @@
 	 * @return String or null if there were problems.
 	 * @throws IllegalArgumentException thrown if JavaObject not java/lang/String
 	 */
-	public static String javaObjectToString(JavaObject object)
+	public static String javaObjectToString(JVMObject object)
 			throws IllegalArgumentException {
 
 		if (object == null) {
@@ -727,7 +727,7 @@
 		}
 
 		String className = null;
-		JavaClass stringClass = null;
+		JVMClass stringClass = null;
 
 		try {
 			stringClass = object.getJavaClass();
@@ -745,7 +745,7 @@
 
 		int offset = 0, count = 0;
 		char[] value = null;
-		JavaObject valueArray = null;
+		JVMObject valueArray = null;
 		boolean gotValue = false, gotOffset = false, gotCount = false;
 
 		// Get all fields, pick out interesting ones.
@@ -756,7 +756,7 @@
 				continue;
 			}
 
-			JavaField field = (JavaField) fobj;
+			JVMField field = (JVMField) fobj;
 			try {
 				String fieldName = field.getName();
 
@@ -767,7 +767,7 @@
 					count = field.getInt(object);
 					gotCount = true;
 				} else if (fieldName.equals("value")) {
-					valueArray = (JavaObject) field.get(object);
+					valueArray = (JVMObject) field.get(object);
 					gotValue = true;
 				}
 
@@ -1020,7 +1020,7 @@
 		if (classes == null){
 			buildClasses();
 		}
-		JavaClass jClass = getClass(classID);
+		JVMClass jClass = getClass(classID);
 		if (jClass != null){
 			if (Modifier.isInterface(jClass.getModifiers())){
 				return true;
@@ -1035,11 +1035,11 @@
 	 * @return The Kato JavaClass
 	 * @throws CorruptDataException
 	 */
-	private JavaClass getClass(long classID){
+	private JVMClass getClass(long classID){
 		if (classes == null){
 			classes = buildClasses();
 		}
-		JavaClass jcl = classes.get(classID);
+		JVMClass jcl = classes.get(classID);
 		if (jcl == null){
 			/** 
 			 * Attemp to get directly, useful for system class loader which isn't covered
@@ -1085,20 +1085,20 @@
 				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
-					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+					JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 					Iterator thds = javaRT.getThreads().iterator();
 					while(thds.hasNext()){
 						Object tmpobj = thds.next();
 						if (tmpobj instanceof CorruptData){
 							//ignore this thread 
 						}else{
-							JavaThread thd = (JavaThread) tmpobj;
+							JVMThread thd = (JVMThread) tmpobj;
 							Iterator frames = thd.getStackFrames().iterator();
 							while(frames.hasNext()){
-								JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
-								JavaLocation jLocation = jStackFrame.getLocation();
-								JavaMethod jMethod = jLocation.getMethod();
-								JavaClass jClass = jMethod.getDeclaringClass();
+								JVMStackFrame jStackFrame = (JVMStackFrame)frames.next();
+								JVMLocation jLocation = jStackFrame.getLocation();
+								JVMMethod jMethod = jLocation.getMethod();
+								JVMClass jClass = jMethod.getDeclaringClass();
 
 
 								if (getMethodId(refType, jMethod) == methodID && jClass.getID().getAddress() == refType){
@@ -1143,20 +1143,20 @@
 				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
-					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+					JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 					Iterator thds = javaRT.getThreads().iterator();
 					while(thds.hasNext()){
 						Object tmpobj = thds.next();
 						if (tmpobj instanceof CorruptData){
 							//ignore this thread 
 						}else{
-							JavaThread thd = (JavaThread) tmpobj;
+							JVMThread thd = (JVMThread) tmpobj;
 							Iterator frames = thd.getStackFrames().iterator();
 							while(frames.hasNext()){
-								JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
-								JavaLocation jLocation = jStackFrame.getLocation();
-								JavaMethod jMethod = jLocation.getMethod();
-								JavaClass jClass = jMethod.getDeclaringClass();
+								JVMStackFrame jStackFrame = (JVMStackFrame)frames.next();
+								JVMLocation jLocation = jStackFrame.getLocation();
+								JVMMethod jMethod = jLocation.getMethod();
+								JVMClass jClass = jMethod.getDeclaringClass();
 
 
 								if (getMethodId(refType, jMethod) == methodID && jClass.getID().getAddress() == refType){
@@ -1200,7 +1200,7 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						//Since there doesn't seem to be a matching Kato call to get
 						//the information for JDWP, lets call NOT_IMPLEMENTED, but really
 						//attach some information back
@@ -1245,9 +1245,9 @@
 			}
 			logr.log(JDILogger.LEVEL_VERBOSE, "ClassesBySignature(" + signature + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 			int count = 0;
-			Iterator <JavaClass> javaClasses = classes.values().iterator();
+			Iterator <JVMClass> javaClasses = classes.values().iterator();
 			while (javaClasses.hasNext()){
-				JavaClass javaClass = javaClasses.next();
+				JVMClass javaClass = javaClasses.next();
 				String searched = javaClass.getName();
 
 				if (searched.equals(signature)){
@@ -1311,9 +1311,9 @@
 			logr.log(JDILogger.LEVEL_VERBOSE, "AllClasses()"); //$NON-NLS-1$
 			Vector<Byte> vctr = new Vector<Byte>();
 			int count = 0;
-			Iterator <JavaClass> classList = classes.values().iterator();
+			Iterator <JVMClass> classList = classes.values().iterator();
 			while(classList.hasNext()){
-				JavaClass javaClass = (JavaClass)classList.next();
+				JVMClass javaClass = (JVMClass)classList.next();
 				long typeID = javaClass.getID().getAddress();
 				String signature;
 
@@ -1356,7 +1356,7 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						Vector<Byte> vctr = new Vector<Byte>();
 						int count = 0;
@@ -1366,7 +1366,7 @@
 								//ignore this thread 
 							}else{
 								count++;
-								JavaThread thd = (JavaThread)tmpobj;
+								JVMThread thd = (JVMThread)tmpobj;
 								long hash = thd.getObject().getID().getAddress();
 								logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread hash " + thd.getName() + " is " + hash); //$NON-NLS-1$ //$NON-NLS-2$
 								addLongToVector(vctr, hash);
@@ -1509,7 +1509,7 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Signature(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			JavaClass javaClass = getClass(refType);
+			JVMClass javaClass = getClass(refType);
 			if (javaClass != null){
 				if (javaClass.isArray()){
 					logr.log(JDILogger.LEVEL_VERYVERBOSE, "" + javaClass.getName() + ""); //$NON-NLS-1$ //$NON-NLS-2$
@@ -1530,7 +1530,7 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "ClassLoader(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			JavaClass javaClass = getClass(refType);
+			JVMClass javaClass = getClass(refType);
 			if (javaClass != null){
 				Vector<Byte> vctr = new Vector<Byte>();
 				addLongToVector(vctr, javaClass.getClassLoader().getObject().getID().getAddress());
@@ -1548,7 +1548,7 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Modifiers(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			JavaClass javaClass = getClass(refType);
+			JVMClass javaClass = getClass(refType);
 			if (javaClass != null){
 				Vector<Byte> vctr = new Vector<Byte>();
 				addIntToVectorFront(vctr,javaClass.getModifiers());
@@ -1564,14 +1564,14 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Fields(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			JavaClass javaClass = getClass(refType);
+			JVMClass javaClass = getClass(refType);
 			if (javaClass != null){
 				Iterator javaFields = javaClass.getDeclaredFields().iterator();
 				logr.log(JDILogger.LEVEL_VERYVERBOSE, javaClass.getName() + ":"); //$NON-NLS-1$
 				Vector<Byte> vctr = new Vector<Byte>();
 				int count = 0;
 				while (javaFields.hasNext()){
-					JavaField jField = (JavaField)javaFields.next();
+					JVMField jField = (JVMField)javaFields.next();
 
 					long fieldID = getFieldId(refType, jField);
 					String name = jField.getName();
@@ -1598,14 +1598,14 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Methods(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			JavaClass javaClass = getClass(refType);
+			JVMClass javaClass = getClass(refType);
 			if (javaClass != null){
 				Iterator javaMethods = javaClass.getDeclaredMethods().iterator();
 				logr.log(JDILogger.LEVEL_VERYVERBOSE, javaClass.getName() + ":"); //$NON-NLS-1$
 				Vector<Byte> vctr = new Vector<Byte>();
 				int count = 0;
 				while (javaMethods.hasNext()){
-					JavaMethod jMethod = (JavaMethod)javaMethods.next();
+					JVMMethod jMethod = (JVMMethod)javaMethods.next();
 					long methodID = getMethodId(refType, jMethod);
 					String name = jMethod.getName();
 					String signature = jMethod.getSignature();
@@ -1663,20 +1663,20 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								Iterator frames = thd.getStackFrames().iterator();
 								while(frames.hasNext()){
-									JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
-									JavaLocation jLocation = jStackFrame.getLocation();
-									JavaMethod jMethod = jLocation.getMethod();
-									JavaClass jClass = jMethod.getDeclaringClass();
+									JVMStackFrame jStackFrame = (JVMStackFrame)frames.next();
+									JVMLocation jLocation = jStackFrame.getLocation();
+									JVMMethod jMethod = jLocation.getMethod();
+									JVMClass jClass = jMethod.getDeclaringClass();
 
 
 									if (jClass.getID().getAddress() == refType){
@@ -1709,7 +1709,7 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Interfaces(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			JavaClass javaClass = getClass(refType);
+			JVMClass javaClass = getClass(refType);
 			if (javaClass != null){
 				Iterator javaInterfaces = javaClass.getInterfaces().iterator();
 				logr.log(JDILogger.LEVEL_VERYVERBOSE, javaClass.getName() + ":"); //$NON-NLS-1$
@@ -1717,7 +1717,7 @@
 				int count = 0;
 				while (javaInterfaces.hasNext()){
 					String iFaceName = (String)javaInterfaces.next();
-				JavaClass jClass = javaClass.getClassLoader().findClass(iFaceName);
+				JVMClass jClass = javaClass.getClassLoader().findClass(iFaceName);
 					long interfaceID;
 					if (jClass == null){
 						interfaceID = 0;
@@ -1775,10 +1775,10 @@
 			long refType = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Superclass(" + refType + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 
-			JavaClass javaClass = getClass(refType);
+			JVMClass javaClass = getClass(refType);
 			if (javaClass != null){
 				try{
-					JavaClass jSuperClass = javaClass.getSuperclass();
+					JVMClass jSuperClass = javaClass.getSuperclass();
 					addLongToVector(vctr, jSuperClass.getID().getAddress());
 					logr.log(JDILogger.LEVEL_VERYVERBOSE, "  " + jSuperClass.getID().getAddress()); //$NON-NLS-1$
 					ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
@@ -1830,20 +1830,20 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								Iterator frames = thd.getStackFrames().iterator();
 								while(frames.hasNext()){
-									JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
-									JavaLocation jLocation = jStackFrame.getLocation();
-									JavaMethod jMethod = jLocation.getMethod();
-									JavaClass jClass = jMethod.getDeclaringClass();
+									JVMStackFrame jStackFrame = (JVMStackFrame)frames.next();
+									JVMLocation jLocation = jStackFrame.getLocation();
+									JVMMethod jMethod = jLocation.getMethod();
+									JVMClass jClass = jMethod.getDeclaringClass();
 
 									if (getMethodId(refType, jMethod) == methodID && jClass.getID().getAddress() == refType){
 										int line = -1;
@@ -1937,20 +1937,20 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								Iterator frames = thd.getStackFrames().iterator();
 								while(frames.hasNext()){
-									JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
-									JavaLocation jLocation = jStackFrame.getLocation();
-									JavaMethod jMethod = jLocation.getMethod();
-									JavaClass jClass = jMethod.getDeclaringClass();
+									JVMStackFrame jStackFrame = (JVMStackFrame)frames.next();
+									JVMLocation jLocation = jStackFrame.getLocation();
+									JVMMethod jMethod = jLocation.getMethod();
+									JVMClass jClass = jMethod.getDeclaringClass();
 									
 									
 									if (getMethodId(refType, jMethod) == methodID && jClass.getID().getAddress() == refType){
@@ -1971,7 +1971,7 @@
 												continue;
 											}
 
-											JavaVariable var = (JavaVariable) nextVar;
+											JVMVariable var = (JVMVariable) nextVar;
 											
 											addLongToVector(vctr, var.getStart());
 											addStringToVector(vctr, var.getName());
@@ -2106,8 +2106,8 @@
 	 * Create a hash map that stores objects for quick retrieval later
 	 * @return A hashmap of objects
 	 */
-	private HashMap<Long, JavaObject> generateObjectHashmap(){
-		HashMap<Long, JavaObject> objectMap = new HashMap<Long, JavaObject>();
+	private HashMap<Long, JVMObject> generateObjectHashmap(){
+		HashMap<Long, JVMObject> objectMap = new HashMap<Long, JVMObject>();
 		return objectMap;
 	}
 
@@ -2117,11 +2117,11 @@
 	 * @param objectID The unique ID of the object
 	 * @return The Kato JavaObject
 	 */
-	private JavaObject getObject(long objectID){
+	private JVMObject getObject(long objectID){
 		if (objectMap == null){
 			this.objectMap = generateObjectHashmap();
 		}
-		JavaObject tmpObj = objectMap.get(objectID);
+		JVMObject tmpObj = objectMap.get(objectID);
 		if (tmpObj == null){
 			//Last ditch attempt to try and get object
 			//Sometimes an object is really a class.
@@ -2148,7 +2148,7 @@
 	 * @param objectID The unique ID for that object
 	 * @return
 	 */
-	private JavaObject getSlowObject(long objectID){
+	private JVMObject getSlowObject(long objectID){
 		
 		
 		Iterator asIt = image.getAddressSpaces( ).iterator();
@@ -2162,9 +2162,9 @@
 				Iterator runTimesIt = process.getRuntimes( ).iterator();
 				while ( runTimesIt.hasNext( ) )
 				{
-					JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+					JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 					try {
-						JavaObject jObject = javaRT.getObjectAtAddress(as.getPointer(objectID));
+						JVMObject jObject = javaRT.getObjectAtAddress(as.getPointer(objectID));
 						if (jObject != null){
 							return jObject;
 						}
@@ -2184,10 +2184,10 @@
 					Iterator heapList = javaRT.getHeaps().iterator();
 
 					while (heapList.hasNext()){
-						JavaHeap heap = (JavaHeap) heapList.next();
+						JVMHeap heap = (JVMHeap) heapList.next();
 						Iterator objectList = heap.getObjects().iterator();
 						while (objectList.hasNext()){
-							JavaObject jObject = (JavaObject)objectList.next();
+							JVMObject jObject = (JVMObject)objectList.next();
 							if (jObject.getID().getAddress() == objectID){
 								return jObject;
 							}
@@ -2206,10 +2206,10 @@
 	 * @return The Kato JavaClass result
 	 * @throws Exception
 	 */
-	private JavaClass findClassByName(String name) throws Exception{
-		Iterator<JavaClass> jClasses = classes.values().iterator();
+	private JVMClass findClassByName(String name) throws Exception{
+		Iterator<JVMClass> jClasses = classes.values().iterator();
 		while(jClasses.hasNext()){
-			JavaClass jClass = jClasses.next();
+			JVMClass jClass = jClasses.next();
 			if (name.equalsIgnoreCase(jClass.getName())){
 				return jClass;
 			}
@@ -2234,18 +2234,18 @@
 			logr.log(JDILogger.LEVEL_VERBOSE, "ObjectReference.ReferenceType(" + object + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 			//Search inside hashmap first
 			if (objectMap.containsKey(object)){
-				JavaObject jObject = getObject(object);
+				JVMObject jObject = getObject(object);
 				if (jObject != null){
 					try{
 						int refTypeTag = 1;
 
-						JavaClass jClass = jObject.getJavaClass();
+						JVMClass jClass = jObject.getJavaClass();
 						if (jClass == null){
 
 							Vector<Byte> vctr = new Vector<Byte>();
 							vctr.add((byte)1);
 							logr.logError(JDILogger.LEVEL_VERYVERBOSE, "  Cannot get class type, returning object instead"); //$NON-NLS-1$
-							JavaClass jOutClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
+							JVMClass jOutClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
 
 							addLongToVector(vctr, jOutClass.getID().getAddress());
 							ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
@@ -2279,7 +2279,7 @@
 						logr.logError(JDILogger.LEVEL_VERBOSE, "  Corrupt data!"); //$NON-NLS-1$
 						Vector<Byte> vctr = new Vector<Byte>();
 						vctr.add((byte)1);
-						JavaClass jClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
+						JVMClass jClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
 
 						addLongToVector(vctr, jClass.getID().getAddress());
 						ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
@@ -2291,7 +2291,7 @@
 				}
 			}else{
 
-				JavaClass javaClass = getClass(object);
+				JVMClass javaClass = getClass(object);
 				if (javaClass != null){
 					int refTypeTag = 1;
 					long typeID = javaClass.getID().getAddress();
@@ -2304,7 +2304,7 @@
 					return rpckt;
 				}
 				
-				JavaObject jObject = getObject(object);
+				JVMObject jObject = getObject(object);
 				if (jObject != null){
 					
 					// This is a copy from above, could be made into a method
@@ -2313,13 +2313,13 @@
 					try{
 						int refTypeTag = 1;
 
-						JavaClass jClass = jObject.getJavaClass();
+						JVMClass jClass = jObject.getJavaClass();
 						if (jClass == null){
 							
 							 logr.log(JDILogger.LEVEL_VERYVERBOSE, "Found the object the slow route");
 							Vector<Byte> vctr = new Vector<Byte>();
 							vctr.add((byte)1);
-							JavaClass jOutClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
+							JVMClass jOutClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
 
 							addLongToVector(vctr, jOutClass.getID().getAddress());
 							ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
@@ -2352,7 +2352,7 @@
 						logr.logError(JDILogger.LEVEL_VERBOSE, "  Corrupt data!"); //$NON-NLS-1$
 						Vector<Byte> vctr = new Vector<Byte>();
 						vctr.add((byte)1);
-						JavaClass jClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
+						JVMClass jClass = findClassByName("java/lang/Object"); //$NON-NLS-1$
 
 						addLongToVector(vctr, jClass.getID().getAddress());
 						ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
@@ -2404,10 +2404,10 @@
 			byte[] inData = cpckt.getByteData();
 			long object = createLongFromBytes(inData, 0, 8);
 			Vector<Byte> vctr = new Vector<Byte>();
-			JavaMonitor jm = null;
+			JVMMonitor jm = null;
 			logr.log(JDILogger.LEVEL_VERBOSE,"ObjectReference.MonitorInfo("+object+")");
 			if ((jm = monitorMap.get(objectMap))!= null){
-				JavaThread owningThread = jm.getOwner();
+				JVMThread owningThread = jm.getOwner();
 				
 				if (owningThread != null){
 					addLongToVector(vctr, owningThread.getJNIEnv().getAddress());
@@ -2416,7 +2416,7 @@
 				}
 				addIntToVector(vctr, 1);
 				addIntToVector(vctr, jm.getEnterWaiters().size());
-				for (JavaThread thr : jm.getEnterWaiters()){
+				for (JVMThread thr : jm.getEnterWaiters()){
 					addLongToVector(vctr, thr.getJNIEnv().getAddress());
 				}
 				logr.log(JDILogger.LEVEL_VERYVERBOSE,"  "+jm.getEnterWaiters().size()+" waiting and owner is "+owningThread);
@@ -2440,10 +2440,10 @@
 			Vector<Byte> vctr = new Vector<Byte>();
 			logr.log(JDILogger.LEVEL_VERBOSE, "ObjectReference.InvokeMethod(" + object + "," + thread + ","+clazz+","+method+","+arguments+",...)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 			if (!isClass(object)){
-				JavaObject jObject = getObject(object);
+				JVMObject jObject = getObject(object);
 				if (jObject != null){
 					//
-					JavaClass jClass = jObject.getJavaClass();
+					JVMClass jClass = jObject.getJavaClass();
 					logr.log(JDILogger.LEVEL_VERYVERBOSE, "  object: " + jClass.getName() + ">>" + jObject.getJavaClass().getName()); //$NON-NLS-1$ //$NON-NLS-2$
 					vctr.add((byte)'s');
 					this.vctrs.put(jObject.getID().getAddress(), jObject.getJavaClass().getName());
@@ -2453,7 +2453,7 @@
 
 			}else{
 
-				JavaClass javaClass = getClass(clazz);
+				JVMClass javaClass = getClass(clazz);
 				if (javaClass != null){
 					logr.log(JDILogger.LEVEL_VERYVERBOSE, "  class: " + javaClass.getName()); //$NON-NLS-1$
 
@@ -2481,7 +2481,7 @@
 		}else if (cpckt.getCommand() == 7){
 			byte [] inData = cpckt.getByteData();
 			long object = createLongFromBytes(inData, 0, 8);
-			JavaObject obj = getObject(object);
+			JVMObject obj = getObject(object);
 			logr.log(JDILogger.LEVEL_VERBOSE, "ObjectReference.DisableCollection(" + object + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 			if (obj != null){
 				ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
@@ -2497,7 +2497,7 @@
 			byte [] inData = cpckt.getByteData();
 			long object = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "ObjectReference.IsCollected(" + object + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-			JavaObject obj = getObject(object);
+			JVMObject obj = getObject(object);
 			if (obj != null){
 				Vector<Byte> vctr = new Vector<Byte>();
 				vctr.add((byte) 0);
@@ -2538,12 +2538,12 @@
 				return rpckt;
 			}else{
 				// This catches cases where we have not occupied vctrs with a string reference (added to support name labels on arrays of objects)
-				JavaObject obj = getObject(stringObject);
+				JVMObject obj = getObject(stringObject);
 				if (obj != null) {
-					for (JavaField field : obj.getJavaClass()
+					for (JVMField field : obj.getJavaClass()
 							.getDeclaredFields()) {
 						if (field.getSignature().equals("[C")) {
-							JavaObject stringObj = (JavaObject) field.get(obj);
+							JVMObject stringObj = (JVMObject) field.get(obj);
 							char charArray[] = new char[stringObj
 									.getArraySize()];
 							
@@ -2593,7 +2593,7 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 
 						int count = 0;
@@ -2603,7 +2603,7 @@
 								//ignore this thread 
 							}else{
 								count++;
-								JavaThread thd = (JavaThread)tmpobj;
+								JVMThread thd = (JVMThread)tmpobj;
 								if (thread == thd.getObject().getID().getAddress()){
 									Vector<Byte> vctr = new Vector<Byte>();
 									addStringToVector(vctr, thd.getName());
@@ -2642,7 +2642,7 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						Vector<Byte> vctr = new Vector<Byte>();
 						while(thds.hasNext()){
@@ -2650,49 +2650,49 @@
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == thread){
 									int threadStatus = 1;
 
 									logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread Status: "+thd.getState()); //$NON-NLS-1$
 									logr.log(JDILogger.LEVEL_VERYVERBOSE, "  Thread Name: " + thd.getName()); //$NON-NLS-1$
-									if ((thd.getState() & JavaThread.STATE_TERMINATED) > 0){
+									if ((thd.getState() & JVMThread.STATE_TERMINATED) > 0){
 										threadStatus = 0;
 										logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is terminated"); //$NON-NLS-1$
-									}else if ((thd.getState() & JavaThread.STATE_SLEEPING) > 0){
+									}else if ((thd.getState() & JVMThread.STATE_SLEEPING) > 0){
 										threadStatus = 2;
 										logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is sleeping"); //$NON-NLS-1$
-									}else if ((thd.getState() & JavaThread.STATE_IN_OBJECT_WAIT) > 0 || (thd.getState() & JavaThread.STATE_WAITING) > 0 || (thd.getState() & JavaThread.STATE_WAITING_INDEFINITELY) > 0 || (thd.getState() & JavaThread.STATE_WAITING_WITH_TIMEOUT) > 0){
+									}else if ((thd.getState() & JVMThread.STATE_IN_OBJECT_WAIT) > 0 || (thd.getState() & JVMThread.STATE_WAITING) > 0 || (thd.getState() & JVMThread.STATE_WAITING_INDEFINITELY) > 0 || (thd.getState() & JVMThread.STATE_WAITING_WITH_TIMEOUT) > 0){
 										threadStatus = 4;
 										logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is waiting"); //$NON-NLS-1$
-									}else if ((thd.getState() & JavaThread.STATE_BLOCKED_ON_MONITOR_ENTER) > 0){
+									}else if ((thd.getState() & JVMThread.STATE_BLOCKED_ON_MONITOR_ENTER) > 0){
 										threadStatus = 3;
 										logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is monitor"); //$NON-NLS-1$
 									}else{
 										threadStatus = 1;
 										logr.log(JDILogger.LEVEL_VERBOSE, "Thread is other (running)"); //$NON-NLS-1$
-										if ((thd.getState() & JavaThread.STATE_ALIVE) > 0){
+										if ((thd.getState() & JVMThread.STATE_ALIVE) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is alive"); //$NON-NLS-1$
 										}
-										if ((thd.getState() & JavaThread.STATE_IN_NATIVE) > 0){
+										if ((thd.getState() & JVMThread.STATE_IN_NATIVE) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is in native"); //$NON-NLS-1$
 										}
-										if ((thd.getState() & JavaThread.STATE_PARKED) > 0){
+										if ((thd.getState() & JVMThread.STATE_PARKED) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is parked"); //$NON-NLS-1$
 										}
-										if ((thd.getState() & JavaThread.STATE_INTERRUPTED) > 0){
+										if ((thd.getState() & JVMThread.STATE_INTERRUPTED) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is interrupted"); //$NON-NLS-1$
 										}
-										if ((thd.getState() & JavaThread.STATE_VENDOR_1) > 0){
+										if ((thd.getState() & JVMThread.STATE_VENDOR_1) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is vendor 1"); //$NON-NLS-1$
 										}
-										if ((thd.getState() & JavaThread.STATE_VENDOR_3) > 0){
+										if ((thd.getState() & JVMThread.STATE_VENDOR_3) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is vendor 2"); //$NON-NLS-1$
 										}
-										if ((thd.getState() & JavaThread.STATE_VENDOR_2) > 0){
+										if ((thd.getState() & JVMThread.STATE_VENDOR_2) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is vendor 3"); //$NON-NLS-1$
 										}
-										if ((thd.getState() & JavaThread.STATE_RUNNABLE) > 0){
+										if ((thd.getState() & JVMThread.STATE_RUNNABLE) > 0){
 											logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread is runnable"); //$NON-NLS-1$
 										}
 
@@ -2756,14 +2756,14 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == thread){
 									int currentFrame = 0;
 									int count = 0;
@@ -2774,14 +2774,14 @@
 										count2++;
 										if (length > 0){
 											if (currentFrame >= startFrame && currentFrame <= startFrame + length){
-												JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
+												JVMStackFrame jStackFrame = (JVMStackFrame)frames.next();
 												addLongToVector(vctr, jStackFrame.getBasePointer().getAddress());
 
-												JavaLocation jLoc = jStackFrame.getLocation();
+												JVMLocation jLoc = jStackFrame.getLocation();
 
-												JavaMethod jMethod = jLoc.getMethod();
+												JVMMethod jMethod = jLoc.getMethod();
 
-												JavaClass jClass = jMethod.getDeclaringClass();
+												JVMClass jClass = jMethod.getDeclaringClass();
 
 												if (jClass.isArray()){
 													vctr.add((byte)3);
@@ -2808,14 +2808,14 @@
 											}
 										}else{
 											if (currentFrame >= startFrame){
-												JavaStackFrame jStackFrame = (JavaStackFrame)frames.next();
+												JVMStackFrame jStackFrame = (JVMStackFrame)frames.next();
 												addLongToVector(vctr, jStackFrame.getBasePointer().getAddress());
 
-												JavaLocation jLoc = jStackFrame.getLocation();
+												JVMLocation jLoc = jStackFrame.getLocation();
 
-												JavaMethod jMethod = jLoc.getMethod();
+												JVMMethod jMethod = jLoc.getMethod();
 
-												JavaClass jClass = jMethod.getDeclaringClass();
+												JVMClass jClass = jMethod.getDeclaringClass();
 												if (jClass.isArray()){
 													vctr.add((byte)3);
 												}else if(isInterface(jClass.getID().getAddress())){
@@ -2881,14 +2881,14 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == thread){
 									int count = 0;
 									Iterator frames = thd.getStackFrames().iterator();
@@ -2917,9 +2917,9 @@
 			byte[] inData = cpckt.getByteData();
 			long threadID = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Thread.OwnedMonitors(" + threadID + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-			List<JavaObject> ownedMonitors = new ArrayList<JavaObject>();
-			for (JavaMonitor jm : monitorMap.values()){
-				JavaThread thr;
+			List<JVMObject> ownedMonitors = new ArrayList<JVMObject>();
+			for (JVMMonitor jm : monitorMap.values()){
+				JVMThread thr;
 				if ((thr = jm.getOwner())!= null){
 					if (thr.getJNIEnv().getAddress() == threadID){
 						ownedMonitors.add(jm.getObject());
@@ -2928,7 +2928,7 @@
 			}
 			Vector<Byte> vctr = new Vector<Byte>();
 			addIntToVector(vctr, ownedMonitors.size());
-			for (JavaObject obj: ownedMonitors){
+			for (JVMObject obj: ownedMonitors){
 				vctr.add((byte)TAG_OBJECT);
 				addLongToVector(vctr, obj.getID().getAddress());
 				logr.log(JDILogger.LEVEL_VERYVERBOSE, "  Owns "+obj.getID().getAddress()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -2941,9 +2941,9 @@
 			byte[] inData = cpckt.getByteData();
 			long threadID = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERBOSE, "Thread.CurrentContendedMonitors(" + threadID + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-			JavaMonitor contended = null;
-			for (JavaMonitor jm : monitorMap.values()){
-				for (JavaThread thr: jm.getEnterWaiters()){
+			JVMMonitor contended = null;
+			for (JVMMonitor jm : monitorMap.values()){
+				for (JVMThread thr: jm.getEnterWaiters()){
 					if (thr.getJNIEnv().getAddress() == threadID){
 						contended = jm;
 					}
@@ -2982,7 +2982,7 @@
 			byte [] inData = cpckt.getByteData();
 			long arrayObject = createLongFromBytes(inData, 0, 8);
 			logr.log(JDILogger.LEVEL_VERYVERBOSE, "ArrayReference.Length("+arrayObject+")"); //$NON-NLS-1$ //$NON-NLS-2$
-			JavaObject jObject = getObject(arrayObject);
+			JVMObject jObject = getObject(arrayObject);
 			if (jObject != null){
 				ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
 				Vector<Byte> vctr = new Vector<Byte>();
@@ -3003,7 +3003,7 @@
 			int firstIndex = createIntFromBytes(inData, 8, 4);
 			int length = createIntFromBytes(inData, 12, 4);
 			logr.log(JDILogger.LEVEL_VERYVERBOSE, "ArrayReference.GetValues("+arrayObject+","+firstIndex+","+length+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-			JavaObject jObject = getObject(arrayObject);
+			JVMObject jObject = getObject(arrayObject);
 			if (jObject != null){
 				if (!jObject.isArray()){
 					logr.logError(JDILogger.LEVEL_VERYVERBOSE, "  Not actually an array"); //$NON-NLS-1$
@@ -3152,7 +3152,7 @@
 
 
 				} else{
-					JavaObject []jObjs = new JavaObject[length];
+					JVMObject []jObjs = new JVMObject[length];
 					jObject.arraycopy(firstIndex, jObjs, 0, length);
 
 					logr.log(JDILogger.LEVEL_VERYVERBOSE, "  got " + jObjs.length + "objects"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -3272,19 +3272,19 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == threadID){
 									Iterator frames = thd.getStackFrames().iterator();
 
 									while(frames.hasNext()){
-										JavaStackFrame jFrame = (JavaStackFrame)frames.next();
+										JVMStackFrame jFrame = (JVMStackFrame)frames.next();
 										if (jFrame.getBasePointer().getAddress() == frameID){
 //											vctr.add((byte)'L');
 //											addLongToVector(vctr,jFrame.getLocation().getMethod().getDeclaringClass().getID().getAddress());
@@ -3300,8 +3300,8 @@
 												case TAG_ARRAY:
 													long arrayAddress = 0L;
 													vctr.add((byte)TAG_ARRAY);
-													if (value instanceof JavaObject) {
-														JavaObject obj = (JavaObject) value;														
+													if (value instanceof JVMObject) {
+														JVMObject obj = (JVMObject) value;														
 														if (obj.isArray()) {
 															arrayAddress = obj.getID().getAddress();																																															
 														}
@@ -3332,8 +3332,8 @@
 													long objectAddress = 0L;
 													byte typeTag = (byte)TAG_OBJECT;
 													
-													if (value instanceof JavaObject) {
-														JavaObject obj = (JavaObject) value;														
+													if (value instanceof JVMObject) {
+														JVMObject obj = (JVMObject) value;														
 														objectAddress = obj.getID().getAddress();		
 														if (obj != null){
 															if (obj.getJavaClass().getName().equals("java/lang/String")){
@@ -3412,8 +3412,8 @@
 												case TAG_STRING:
 													String stringVal= "";
 													vctr.add((byte)TAG_STRING);
-													if (value instanceof JavaObject) {
-														stringVal = javaObjectToString( (JavaObject) value);
+													if (value instanceof JVMObject) {
+														stringVal = javaObjectToString( (JVMObject) value);
 													}
 													logr.log(JDILogger.LEVEL_VERBOSE, "  " +jFrame.getLocation() + " string in slot=" + slot + " value=\""+stringVal+"\"");
 													addStringToVector(vctr, stringVal);													
@@ -3458,19 +3458,19 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						while(thds.hasNext()){
 							Object tmpobj = thds.next();
 							if (tmpobj instanceof CorruptData){
 								//ignore this thread 
 							}else{
-								JavaThread thd = (JavaThread) tmpobj;
+								JVMThread thd = (JVMThread) tmpobj;
 								if (thd.getObject().getID().getAddress() == threadID){
 									Iterator frames = thd.getStackFrames().iterator();
 
 									while(frames.hasNext()){
-										JavaStackFrame jFrame = (JavaStackFrame)frames.next();
+										JVMStackFrame jFrame = (JVMStackFrame)frames.next();
 										if (jFrame.getBasePointer().getAddress() == frameID){
 											Vector<Byte> vctr = new Vector<Byte>();
 											ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
@@ -3480,8 +3480,8 @@
 											} else {
 												Object value = jFrame.getVariable(0);
 												long objectAddress = 0;
-												if (value != null  && value instanceof JavaObject) {
-													JavaObject obj = (JavaObject) value;														
+												if (value != null  && value instanceof JVMObject) {
+													JVMObject obj = (JVMObject) value;														
 													objectAddress = obj.getID().getAddress();																																															
 												}
 												vctr.add((byte)TAG_OBJECT);
@@ -3509,7 +3509,7 @@
 
 	}
 	
-	private byte getRefTypeTag(JavaClass jcl){
+	private byte getRefTypeTag(JVMClass jcl){
 		byte refTypeTag = 1;
 		try {
 			if (jcl.isArray()){
@@ -3531,9 +3531,9 @@
 			logr.log(JDILogger.LEVEL_VERBOSE, "VisibleClasses(" + classLoaderID + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			int count = 0;
 			Vector<Byte> vctr = new Vector<Byte>();
-			Vector<JavaClassLoader> jcls = new Vector<JavaClassLoader>();
-			for (JavaClass jc: classes.values()){
-				JavaObject obj;
+			Vector<JVMClassLoader> jcls = new Vector<JVMClassLoader>();
+			for (JVMClass jc: classes.values()){
+				JVMObject obj;
 				if ((obj = jc.getClassLoader().getObject()) != null){
 					if (obj.getID().getAddress() == classLoaderID){
 						jcls.add(jc.getClassLoader());
@@ -3547,8 +3547,8 @@
 				}
 			}
 			
-			for (JavaClass jc: classes.values()){
-				for (JavaClassLoader jcl : jcls){
+			for (JVMClass jc: classes.values()){
+				for (JVMClassLoader jcl : jcls){
 					if (jc.getClassLoader() == jcl){
 						vctr.add(getRefTypeTag(jc));
 						addLongToVector(vctr, jc.getID().getAddress());
@@ -3592,7 +3592,7 @@
 					Iterator runTimesIt = process.getRuntimes( ).iterator();
 					while ( runTimesIt.hasNext( ) )
 					{
-						JavaRuntime javaRT = (JavaRuntime) runTimesIt.next( );
+						JVMRuntime javaRT = (JVMRuntime) runTimesIt.next( );
 						Iterator thds = javaRT.getThreads().iterator();
 						Vector<Byte> vctr = new Vector<Byte>();
 						int count = 0;
@@ -3602,7 +3602,7 @@
 								//ignore this thread 
 							}else{
 								count++;
-								JavaThread thd = (JavaThread)tmpobj;
+								JVMThread thd = (JVMThread)tmpobj;
 								long hash = thd.getObject().getID().getAddress();
 								logr.log(JDILogger.LEVEL_VERYVERBOSE, "Thread hash " + thd.getName() + " is " + hash + " id is "+thd.getObject().getID()) ; //$NON-NLS-1$ //$NON-NLS-2$
 								addLongToVector(vctr, hash);



Mime
View raw message