From ad1f3d7a3424b7b3ee6d4ae0e51288035fffe07a Mon Sep 17 00:00:00 2001
From: Keith Seitz <kseitz@gcc.gnu.org>
Date: Tue, 14 Jun 2005 00:28:08 +0000
Subject: [PATCH] ArrayId.java: New file.

        * gnu/classpath/jdwp/id/ArrayId.java: New file.
        * gnu/classpath/jdwp/id/ArrayReferenceTypeId.java: New file.
        * gnu/classpath/jdwp/id/ClassLoaderId.java: New file.
        * gnu/classpath/jdwp/id/ClassObjectId.java: New file.
        * gnu/classpath/jdwp/id/ClassReferenceTypeId.java: New file.
        * gnu/classpath/jdwp/id/InterfaceReferenceTypeId.java: New file.
        * gnu/classpath/jdwp/id/JdwpId.java: New file.
        * gnu/classpath/jdwp/id/ObjectId.java: New file.
        * gnu/classpath/jdwp/id/ReferenceTypeId.java: New file.
        * gnu/classpath/jdwp/id/StringId.java: New file.
        * gnu/classpath/jdwp/id/ThreadGroupId.java: New file.
        * gnu/classpath/jdwp/id/ThreadId.java: New file.

From-SVN: r100913
---
 libjava/gnu/classpath/jdwp/id/ArrayId.java    |  62 +++++++++
 .../jdwp/id/ArrayReferenceTypeId.java         |  59 ++++++++
 .../gnu/classpath/jdwp/id/ClassLoaderId.java  |  64 +++++++++
 .../gnu/classpath/jdwp/id/ClassObjectId.java  |  64 +++++++++
 .../jdwp/id/ClassReferenceTypeId.java         |  59 ++++++++
 .../jdwp/id/InterfaceReferenceTypeId.java     |  59 ++++++++
 libjava/gnu/classpath/jdwp/id/JdwpId.java     | 127 ++++++++++++++++++
 libjava/gnu/classpath/jdwp/id/ObjectId.java   |  99 ++++++++++++++
 .../classpath/jdwp/id/ReferenceTypeId.java    |  81 +++++++++++
 libjava/gnu/classpath/jdwp/id/StringId.java   |  64 +++++++++
 .../gnu/classpath/jdwp/id/ThreadGroupId.java  |  64 +++++++++
 libjava/gnu/classpath/jdwp/id/ThreadId.java   |  64 +++++++++
 12 files changed, 866 insertions(+)
 create mode 100644 libjava/gnu/classpath/jdwp/id/ArrayId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ArrayReferenceTypeId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ClassLoaderId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ClassObjectId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ClassReferenceTypeId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/JdwpId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ObjectId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ReferenceTypeId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/StringId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ThreadGroupId.java
 create mode 100644 libjava/gnu/classpath/jdwp/id/ThreadId.java

diff --git a/libjava/gnu/classpath/jdwp/id/ArrayId.java b/libjava/gnu/classpath/jdwp/id/ArrayId.java
new file mode 100644
index 000000000000..bd95b84e5e54
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ArrayId.java
@@ -0,0 +1,62 @@
+/* ArrayId.java -- array object IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A class which represents a JDWP array id
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ArrayId
+  extends ObjectId
+{
+  // Arrays are handled a little differently than other IDs
+  //public static final Class typeClass = UNDEFINED
+
+  /**
+   * Constructs a new <code>ArrayId</code>
+   */
+  public ArrayId ()
+  {
+    super (JdwpConstants.Tag.ARRAY);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ArrayReferenceTypeId.java b/libjava/gnu/classpath/jdwp/id/ArrayReferenceTypeId.java
new file mode 100644
index 000000000000..23cf4e80f6f3
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ArrayReferenceTypeId.java
@@ -0,0 +1,59 @@
+/* ArrayReferenceTypeId.java -- array reference type ids
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A reference type ID representing java arrays
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ArrayReferenceTypeId
+  extends ReferenceTypeId
+{
+  /**
+   * Constructs a new <code>ArrayReferenceTypeId</code>
+   */
+  public ArrayReferenceTypeId ()
+  {
+    super (JdwpConstants.TypeTag.ARRAY);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ClassLoaderId.java b/libjava/gnu/classpath/jdwp/id/ClassLoaderId.java
new file mode 100644
index 000000000000..1f2b1e468ed2
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ClassLoaderId.java
@@ -0,0 +1,64 @@
+/* ClassLoaderId.java -- class loader IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A class which represents a JDWP thread id
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ClassLoaderId
+  extends ObjectId
+{
+  /**
+   * The object class that this id represents
+   */
+  public static final Class typeClass = ClassLoader.class;
+
+  /**
+   * Constructs a new <code>ClassLoaderId</code>
+   */
+  public ClassLoaderId ()
+  {
+    super (JdwpConstants.Tag.CLASS_LOADER);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ClassObjectId.java b/libjava/gnu/classpath/jdwp/id/ClassObjectId.java
new file mode 100644
index 000000000000..cb756fdf166e
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ClassObjectId.java
@@ -0,0 +1,64 @@
+/* ClassObjectId.java -- class object IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A class which represents a JDWP class object id
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ClassObjectId
+  extends ObjectId
+{
+  /**
+   * The object class that this id represents
+   */
+  public static final Class typeClass = Class.class;
+
+  /**
+   * Constructs a new <code>ClassObjectId</code>
+   */
+  public ClassObjectId ()
+  {
+    super (JdwpConstants.Tag.CLASS_OBJECT);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ClassReferenceTypeId.java b/libjava/gnu/classpath/jdwp/id/ClassReferenceTypeId.java
new file mode 100644
index 000000000000..4f96802a4b09
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ClassReferenceTypeId.java
@@ -0,0 +1,59 @@
+/* ClassReferenceTypeId.java -- class reference type ids
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A reference type ID representing java classes
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ClassReferenceTypeId
+  extends ReferenceTypeId
+{
+  /**
+   * Constructs a new <code>ClassReferenceTypeId</code>
+   */
+  public ClassReferenceTypeId ()
+  {
+    super (JdwpConstants.TypeTag.CLASS);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.java b/libjava/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.java
new file mode 100644
index 000000000000..95d5a489699b
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/InterfaceReferenceTypeId.java
@@ -0,0 +1,59 @@
+/* InterfaceReferenceTypeId.java -- interface reference type ids
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A reference type ID representing java interfaces
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class InterfaceReferenceTypeId
+  extends ReferenceTypeId
+{
+  /**
+   * Constructs a new <code>InterfaceReferenceTypeId</code>
+   */
+  public InterfaceReferenceTypeId ()
+  {
+    super (JdwpConstants.TypeTag.INTERFACE);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/JdwpId.java b/libjava/gnu/classpath/jdwp/id/JdwpId.java
new file mode 100644
index 000000000000..81b6d2659858
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/JdwpId.java
@@ -0,0 +1,127 @@
+/* JdwpId.java -- base class for all object ID types
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * A baseclass for all object types reported to the debugger
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public abstract class JdwpId
+{
+  /**
+   * ID assigned to this object
+   */
+  protected long _id;
+
+  /**
+   * Tag of ID's type (see {@link gnu.classpath.jdwp.JdwpConstants.Tag})
+   * for object-like IDs or the type tag (see {@link
+   * gnu.classpath.JdwpConstants.TypeTag}) for reference type IDs.
+   */
+  private byte _tag;
+
+  /**
+   * Constructs an empty <code>JdwpId</code>
+   */
+  public JdwpId (byte tag)
+  {
+    _tag = tag;
+  }
+
+  /**
+   * Sets the id for this object reference
+   */
+  void setId (long id)
+  {
+    _id = id;
+  }
+
+  /**
+   * Returns the id for this object reference
+   */
+  public long getId ()
+  {
+    return _id;
+  }
+
+  /**
+   * Compares two object ids for equality. Two object ids
+   * are equal if they point to the same type and contain to
+   * the same id number. (NOTE: This is a much stricter check
+   * than is necessary: all <code>JdwpId</code>s have unique
+   * ids.)
+   */
+  public boolean equals (JdwpId id)
+  {
+    return ((id.getClass () == getClass ()) && (id.getId () == getId ()));
+  }
+
+  /**
+   * Returns size of this type (used by IDSizes)
+   */
+  public abstract int size ();
+
+  /**
+   * Writes the contents of this type to the <code>DataOutputStream</code>
+   * @param  outStream    the <code>DataOutputStream</code> to use
+   * @throws IOException  when an error occurs on the <code>OutputStream</code>
+   */
+  public abstract void write (DataOutputStream outStream)
+    throws IOException;
+
+  /**
+   * Writes the contents of this type to the output stream, preceded
+   * by a one-byte tag for tagged object IDs or type tag for
+   * reference type IDs.
+   *
+   * @param  outStream    the <code>DataOutputStream</code> to use
+   * @throws IOException  when an error occurs on the <code>OutputStream</code>
+   */
+  public void writeTagged (DataOutputStream outStream)
+    throws IOException
+  {
+    outStream.writeByte (_tag);
+    write (outStream);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ObjectId.java b/libjava/gnu/classpath/jdwp/id/ObjectId.java
new file mode 100644
index 000000000000..6bd399fe2e78
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ObjectId.java
@@ -0,0 +1,99 @@
+/* ObjectId.java -- object IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * A class which represents a JDWP object id for an object
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ObjectId
+  extends JdwpId
+{
+  /**
+   * The object class that this id represents
+   */
+  public static final Class typeClass = Object.class;
+
+  /**
+   * Constructs a new <code>ObjectId</code>
+   */
+  public ObjectId ()
+  {
+    super (JdwpConstants.Tag.OBJECT);
+  }
+
+  /**
+   * Constructs a new <code>ObjectId</code> of the
+   * given type.
+   *
+   * @param  tag  the tag of this type of object ID
+   */
+  public ObjectId (byte tag)
+  {
+    super (tag);
+  }
+
+  /**
+   * Returns the size of this id type
+   */
+  public int size ()
+  {
+    return 8;
+  }
+
+  /**
+   * Writes the id to the stream
+   *
+   * @param outStream  the stream to which to write
+   * @throws IOException  when an error occurs on the <code>OutputStream</code>
+   */
+  public void write (DataOutputStream outStream)
+    throws IOException
+  {
+    // All we need to do is write out our id as an 8-byte integer
+    outStream.writeLong (_id);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ReferenceTypeId.java b/libjava/gnu/classpath/jdwp/id/ReferenceTypeId.java
new file mode 100644
index 000000000000..63f38af04f18
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ReferenceTypeId.java
@@ -0,0 +1,81 @@
+/* ReferenceTypeId.java -- a base class for all reference type IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Base class for reference type IDs. This class usurps
+ * <code>JdwpId</code>'s tag member for its own use (type tag).
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ReferenceTypeId
+  extends JdwpId
+{
+  /**
+   * Constructor used by {Array,Interface,Class}ReferenceTypeId
+   */
+  public ReferenceTypeId (byte tag)
+  {
+    super (tag);
+  }
+
+  /**
+   * Returns the size of this ID type
+   */
+  public int size ()
+  {
+    return 8;
+  }
+
+  /**
+   * Outputs the reference type ID to the given output stream
+   *
+   * @param  outStream    the stream to which to write the data
+   * @throws IOException  for errors writing to the stream
+   */
+  public void write (DataOutputStream outStream)
+    throws IOException
+  {
+    outStream.writeLong (_id);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/StringId.java b/libjava/gnu/classpath/jdwp/id/StringId.java
new file mode 100644
index 000000000000..9e5b7ce8b646
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/StringId.java
@@ -0,0 +1,64 @@
+/* StringId.java -- string IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A class which represents a JDWP string id
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class StringId
+  extends ObjectId
+{
+  /**
+   * The object class that this id represents
+   */
+  public static final Class typeClass = String.class;
+
+  /**
+   * Constructs a new <code>StringId</code>
+   */
+  public StringId ()
+  {
+    super (JdwpConstants.Tag.STRING);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ThreadGroupId.java b/libjava/gnu/classpath/jdwp/id/ThreadGroupId.java
new file mode 100644
index 000000000000..80e8ac5001ea
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ThreadGroupId.java
@@ -0,0 +1,64 @@
+/* ThreadGroupId.java -- thread group IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A class which represents a JDWP thread group id
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ThreadGroupId
+  extends ObjectId
+{
+  /**
+   * The object class that this id represents
+   */
+  public static final Class typeClass = ThreadGroup.class;
+
+  /**
+   * Constructs a new <code>ThreadGroupId</code>
+   */
+  public ThreadGroupId ()
+  {
+    super (JdwpConstants.Tag.THREAD_GROUP);
+  }
+}
diff --git a/libjava/gnu/classpath/jdwp/id/ThreadId.java b/libjava/gnu/classpath/jdwp/id/ThreadId.java
new file mode 100644
index 000000000000..9a719bec9fcb
--- /dev/null
+++ b/libjava/gnu/classpath/jdwp/id/ThreadId.java
@@ -0,0 +1,64 @@
+/* ThreadId.java -- thread IDs
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.id;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * A class which represents a JDWP thread id
+ *
+ * @author Keith Seitz  <keiths@redhat.com>
+ */
+public class ThreadId
+  extends ObjectId
+{
+  /**
+   * The object class that this id represents
+   */
+  public static final Class typeClass = Thread.class;
+
+  /**
+   * Constructs a new <code>ThreadId</code>
+   */
+  public ThreadId ()
+  {
+    super (JdwpConstants.Tag.THREAD);
+  }
+}
-- 
GitLab