* gnu/classpath/jdwp/util/Value.java (Value): Update for

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

3 files changed, 15 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 95c8a1964..a6d7f8b62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-25  Keith Seitz  <keiths@redhat.com>
 
+	* gnu/classpath/jdwp/util/Value.java (Value): Update for
+	real VMIdManager API.
+	* gnu/classpath/jdwp/util/Location.java (Location): Likewise.
+
+2005-08-25  Keith Seitz  <keiths@redhat.com>
+
 	* gnu/classpath/jdwp/processor/EventRequestCommandSet.java
 	(executeSet): Use constants for case values.
 	Fix "typo": It is really ThreadOnlyFilter.
diff --git a/gnu/classpath/jdwp/util/Location.java b/gnu/classpath/jdwp/util/Location.java
index 1c13c5eb6..d7a2855ce 100644
--- a/gnu/classpath/jdwp/util/Location.java
+++ b/gnu/classpath/jdwp/util/Location.java
@@ -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();
   }
 
diff --git a/gnu/classpath/jdwp/util/Value.java b/gnu/classpath/jdwp/util/Value.java
index a4bd9b946..759b2a99c 100644
--- a/gnu/classpath/jdwp/util/Value.java
+++ b/gnu/classpath/jdwp/util/Value.java
@@ -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