From 22856b8f2a463df5d4fabbe7f2758f4c3069b81c Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Thu, 25 Aug 2005 22:09:48 +0000 Subject: * gnu/classpath/jdwp/processor/CommandSet.java (CommandSet): Make an abstract class. Add protected variables for VMIdManager and VMVirtualMachine. (runCommand): Make abstract. * gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java (ArrayReferenceCommandSet): Derive from CommandSet instead of implementing it. Remove private hooks to ID manager and VM. Update all VMIdManager and EventManager API calls. * gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java (ArrayTypeCommandSet): Likewise. * gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java (ClassLoaderReferenceCommandSet): Likewise. * gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java (ClassObjectReferenceCommandSet): Likewise. * gnu/classpath/jdwp/processor/ClassTypeCommandSet.java (ClassTypeCommandSet): Likewise. * gnu/classpath/jdwp/processor/EventRequestCommandSet.java (EventRequestCommandSet): Likewise. * gnu/classpath/jdwp/processor/FieldCommandSet.java (FieldCommandSet): Likewise. * gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java (InterfaceTypeCommandSet): Likewise. * gnu/classpath/jdwp/processor/MethodCommandSet.java (MethodCommandSet): Likewise. * gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java (ObjectReferenceCommandSet): Likewise. * gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java (ReferenceTypeCommandSet): Likewise. * gnu/classpath/jdwp/processor/StackFrameCommandSet.java (StackFrameCommandSet): Likewise. * gnu/classpath/jdwp/processor/StringReferenceCommandSet.java (StringReferenceCommandSet): Likewise. * gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java (ThreadGroupReferenceCommandSet.java): Likewise. * gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java (ThreadReferenceCommandSet): Likewise. * gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java (VirtualMachineCommandSet): Likewise. * gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java (executeStatus): Fix constant name. * gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java (executeDisposeObjects): Don't do anything yet -- this is unimplemented. --- gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java') diff --git a/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java b/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java index ffe709b83..247021662 100644 --- a/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java +++ b/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java @@ -40,13 +40,11 @@ exception statement from your version. */ package gnu.classpath.jdwp.processor; -import gnu.classpath.jdwp.Jdwp; import gnu.classpath.jdwp.JdwpConstants; import gnu.classpath.jdwp.exception.InvalidObjectException; import gnu.classpath.jdwp.exception.JdwpException; import gnu.classpath.jdwp.exception.JdwpInternalErrorException; import gnu.classpath.jdwp.exception.NotImplementedException; -import gnu.classpath.jdwp.id.IdManager; import gnu.classpath.jdwp.id.ObjectId; import gnu.classpath.jdwp.util.Value; @@ -60,11 +58,9 @@ import java.nio.ByteBuffer; * * @author Aaron Luchko */ -public class ArrayReferenceCommandSet implements CommandSet +public class ArrayReferenceCommandSet + extends CommandSet { - // Manages all the different ids that are assigned by jdwp - private final IdManager idMan = Jdwp.getIdManager(); - public boolean runCommand(ByteBuffer bb, DataOutputStream os, byte command) throws JdwpException { @@ -98,7 +94,7 @@ public class ArrayReferenceCommandSet implements CommandSet private void executeLength(ByteBuffer bb, DataOutputStream os) throws InvalidObjectException, IOException { - ObjectId oid = idMan.readId(bb); + ObjectId oid = idMan.readObjectId(bb); Object array = oid.getObject(); os.writeInt(Array.getLength(array)); } @@ -106,7 +102,7 @@ public class ArrayReferenceCommandSet implements CommandSet private void executeGetValues(ByteBuffer bb, DataOutputStream os) throws JdwpException, IOException { - ObjectId oid = idMan.readId(bb); + ObjectId oid = idMan.readObjectId(bb); Object array = oid.getObject(); int first = bb.getInt(); int length = bb.getInt(); @@ -164,7 +160,7 @@ public class ArrayReferenceCommandSet implements CommandSet private void executeSetValues(ByteBuffer bb, DataOutputStream os) throws IOException, JdwpException { - ObjectId oid = idMan.readId(bb); + ObjectId oid = idMan.readObjectId(bb); Object array = oid.getObject(); int first = bb.getInt(); int length = bb.getInt(); -- cgit v1.2.1