[cp-patches] [PATCH/JDWP] Update for gnu.classpath.jdwp.util

[Keith Seitz]

Hi,

I've committed the following patches which updatee jdwp.util for the 
"official" VMIdManager API.

Keith

ChangeLog
2005-08-25  Keith Seitz  <address@hidden>

        * gnu/classpath/jdwp/util/Value.java (Value): Update for
        real VMIdManager API.
        * gnu/classpath/jdwp/util/Location.java (Location): Likewise.

Index: gnu/classpath/jdwp/util/Location.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/jdwp/util/Location.java,v
retrieving revision 1.1
diff -u -p -r1.1 Location.java
--- gnu/classpath/jdwp/util/Location.java       12 Aug 2005 22:55:51 -0000      
1.1
+++ gnu/classpath/jdwp/util/Location.java       25 Aug 2005 22:25:32 -0000
@@ -38,7 +38,7 @@ exception statement from your version. *
 
 package gnu.classpath.jdwp.util;
 
-import gnu.classpath.jdwp.Jdwp;
+import gnu.classpath.jdwp.VMIdManager;
 import gnu.classpath.jdwp.exception.JdwpException;
 import gnu.classpath.jdwp.id.ClassReferenceTypeId;
 import gnu.classpath.jdwp.id.ObjectId;
@@ -78,8 +78,8 @@ public class Location
   {
     this.tag = tag;
     this.crti = 
-      (ClassReferenceTypeId) Jdwp.getIdManager().getReferenceTypeId(clazz);
-    this.mid = Jdwp.getIdManager().getId(meth);
+      (ClassReferenceTypeId) 
VMIdManager.getDefault().getReferenceTypeId(clazz);
+    this.mid = VMIdManager.getDefault().getObjectId(meth);
     this.index = index;
   }
 
@@ -95,8 +95,8 @@ public class Location
   {
     this.tag = bb.get();
     this.crti = 
-      (ClassReferenceTypeId) Jdwp.getIdManager().readReferenceTypeId(bb);
-    this.mid = Jdwp.getIdManager().readId(bb);
+      (ClassReferenceTypeId) VMIdManager.getDefault().readReferenceTypeId(bb);
+    this.mid = VMIdManager.getDefault().readObjectId(bb);
     this.index = bb.getInt();
   }
 
Index: gnu/classpath/jdwp/util/Value.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/jdwp/util/Value.java,v
retrieving revision 1.2
diff -u -p -r1.2 Value.java
--- gnu/classpath/jdwp/util/Value.java  12 Aug 2005 22:34:57 -0000      1.2
+++ gnu/classpath/jdwp/util/Value.java  25 Aug 2005 22:25:32 -0000
@@ -38,8 +38,8 @@ exception statement from your version. *
 
 package gnu.classpath.jdwp.util;
 
-import gnu.classpath.jdwp.Jdwp;
 import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
 import gnu.classpath.jdwp.exception.InvalidFieldException;
 import gnu.classpath.jdwp.exception.JdwpException;
 import gnu.classpath.jdwp.exception.JdwpInternalErrorException;
@@ -182,7 +182,7 @@ public class Value
             else
               os.writeByte(JdwpConstants.Tag.OBJECT);
           }
-        ObjectId oid = Jdwp.getIdManager().getId(obj);
+        ObjectId oid = VMIdManager.getDefault().getObjectId(obj);
         oid.write(os);
       }
   }
@@ -244,7 +244,7 @@ public class Value
     else
       {
         // Field is an object
-        ObjectId oid = Jdwp.getIdManager().readId(bb);
+        ObjectId oid = VMIdManager.getDefault().readObjectId(bb);
         return oid.getObject();
       }
   }
@@ -291,7 +291,7 @@ public class Value
       case JdwpConstants.Tag.CLASS_LOADER:
       case JdwpConstants.Tag.CLASS_OBJECT:
         // All these cases are ObjectIds
-        ObjectId oid = Jdwp.getIdManager().readId(bb);
+        ObjectId oid = VMIdManager.getDefault().readObjectId(bb);
         return oid.getObject();
       default:
         throw new NotImplementedException("Tag " + tag