Here are three more JDWP events. Can someone please review and commit these along with the other classpath changes submitted earlier today.

Thanks,
Kyle

ChangeLog:

2006-06-09  Kyle Galloway <[EMAIL PROTECTED]>

   * gnu/classpath/jdwp/event/MethodEntryEvent.java: New File
   * gnu/classpath/jdwp/event/MethodExitEvent.java: New File
   * gnu/classpath/jdwp/event/SingleStepEvent.java: New File
Index: gnu/classpath/jdwp/event/MethodEntryEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/MethodEntryEvent.java
diff -N gnu/classpath/jdwp/event/MethodEntryEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/MethodEntryEvent.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,113 @@
+/* MethodEntryEvent.java -- n event specifying that a method has been invoked
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 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
+ 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.event;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+
+/**
+ * Notification from the VM that that a method has been invoked
+ * 
+ * @author Kyle Galloway ([EMAIL PROTECTED])
+ */
+public class MethodEntryEvent
+    extends Event
+{
+  // The thread where the event occurred
+  Thread _thread;
+
+  // the location where the event occurred
+  Location _location;
+
+  //object instance
+  Object _instance;
+
+  /**
+   * Constructs a new <code>MethodEntryEvent</code>
+   * 
+   * @param thread the thread where the exception occurred
+   * @param location the location single stepped to
+   */
+  public MethodEntryEvent(Thread thread, Location location, Object instance)
+  {
+    super(JdwpConstants.EventKind.METHOD_ENTRY);
+    _thread = thread;
+    _location = location;
+    _instance = instance;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Valid types are
+   * thread and location
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or null
+   */
+  public Object getParameter(int type)
+  {
+    if (type == EVENT_THREAD)
+      return _thread;
+    else if (type == EVENT_LOCATION)
+      return _location;
+    else if (type == EVENT_INSTANCE)
+      return _instance;
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   */
+  protected void _writeData(DataOutputStream outStream) throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+    ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+
+    tid.write(outStream);
+    _location.write(outStream);
+  }
+
+}
Index: gnu/classpath/jdwp/event/MethodExitEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/MethodExitEvent.java
diff -N gnu/classpath/jdwp/event/MethodExitEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/MethodExitEvent.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,110 @@
+/* MethodExitEvent.java -- n event specifying that a method has returned
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 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
+ 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.event;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * Notification from the VM that that a method has returned
+ * 
+ * @author Kyle Galloway ([EMAIL PROTECTED])
+ */
+public class MethodExitEvent
+    extends Event
+{
+  // The thread where the event occurred
+  Thread _thread;
+
+  // the location where the event occurred
+  Location _location;
+
+  // object instance
+  Object _instance;
+
+  /**
+   * Constructs a new <code>MethodExitEvent</code>
+   * 
+   * @param thread the thread where the exception occurred
+   * @param location the location single stepped to
+   */
+  public MethodExitEvent(Thread thread, Location location, Object instance)
+  {
+    super(JdwpConstants.EventKind.METHOD_EXIT);
+    _thread = thread;
+    _location = location;
+    _instance = instance;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Valid types are
+   * thread and location
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or null
+   */
+  public Object getParameter(int type)
+  {
+    if (type == EVENT_THREAD)
+      return _thread;
+    else if (type == EVENT_LOCATION)
+      return _location;
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   */
+  protected void _writeData(DataOutputStream outStream) throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+    ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+
+    tid.write(outStream);
+    _location.write(outStream);
+  }
+}
Index: gnu/classpath/jdwp/event/SingleStepEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/SingleStepEvent.java
diff -N gnu/classpath/jdwp/event/SingleStepEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/SingleStepEvent.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,113 @@
+/* SingleStepEvent.java -- an event specifying that a single step has
+ compleated
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 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
+ 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.event;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+
+/**
+ * Notification from the VM that a single step has compleated including the
+ * thread and location stepped to
+ * 
+ * @author Kyle Galloway ([EMAIL PROTECTED])
+ */
+public class SingleStepEvent
+    extends Event
+{
+  // the thread where the event occurred
+  Thread _thread;
+
+  // the location where the event occurred
+  Location _location;
+
+  //object instance
+  Object _instance;
+
+  /**
+   * Constructs a new <code>SingleStepEvent</code>
+   * 
+   * @param thread the thread where the exception occurred
+   * @param location the location single stepped to
+   */
+  public SingleStepEvent(Thread thread, Location location, Object instance)
+  {
+    super(JdwpConstants.EventKind.SINGLE_STEP);
+    _thread = thread;
+    _location = location;
+    _instance = instance;
+  }
+
+  /**
+   * Returns a specific filtering parameter for this event. Valid types are
+   * thread and location
+   * 
+   * @param type the type of parameter desired
+   * @returns the desired parameter or null
+   */
+  public Object getParameter(int type)
+  {
+    if (type == EVENT_THREAD)
+      return _thread;
+    else if (type == EVENT_LOCATION)
+      return _location;
+
+    return null;
+  }
+
+  /**
+   * Writes the event to the given stream
+   * 
+   * @param outStream the output stream to write the event to
+   */
+  protected void _writeData(DataOutputStream outStream) throws IOException
+  {
+    VMIdManager idm = VMIdManager.getDefault();
+    ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+
+    tid.write(outStream);
+    _location.write(outStream);
+  }
+
+}

Reply via email to