I've made changes to fix problems with the patch and the changelog.
This patch contains only the changes related to the change in Event.
Requesting approval and a commit.
Kyle
ChangeLog:
2006-06-09 Kyle Galloway <[EMAIL PROTECTED]>
* gnu/classpath/jdwp/event/Event.java: Added constants for
type
(getParameter): changed parameter type from Class to int
* gnu/classpath/jdwp/event/BreakpointEvent.java (getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/ClassPrepareEventEvent.java (getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/ThreadEndEvent.java (getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/ThreadStartEvent.java (getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/VmDeathEvent.java (getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/VmInitEvent.java (getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/ClassMatchFilter.java (matches):
changed from Class type to constants
* gnu/classpath/jdwp/event/ClassOnlyFilter.java (matches):
changed from Class type to constants
* gnu/classpath/jdwp/event/InstanceOnlyFilter.java (matches):
changed from Class type to constants
* gnu/classpath/jdwp/event/ThreadOnlyFilter.java (matches):
changed from Class type to constants
Index: gnu/classpath/jdwp/event/BreakpointEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java,v
retrieving revision 1.1
diff -u -r1.1 BreakpointEvent.java
--- gnu/classpath/jdwp/event/BreakpointEvent.java 15 Mar 2006 22:55:54 -0000 1.1
+++ gnu/classpath/jdwp/event/BreakpointEvent.java 12 Jun 2006 14:01:52 -0000
@@ -83,11 +83,11 @@
* @param type the type of parameter desired
* @returns the desired parameter or null
*/
- public Object getParameter(Class type)
+ public Object getParameter(int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
- else if (type == Location.class)
+ else if (type == EVENT_LOCATION)
return _location;
return null;
Index: gnu/classpath/jdwp/event/ClassPrepareEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java,v
retrieving revision 1.1
diff -u -r1.1 ClassPrepareEvent.java
--- gnu/classpath/jdwp/event/ClassPrepareEvent.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/ClassPrepareEvent.java 12 Jun 2006 14:01:52 -0000
@@ -116,11 +116,11 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
- else if (type == ReferenceTypeId.class)
+ else if (type == EVENT_CLASS)
return _class;
return null;
Index: gnu/classpath/jdwp/event/Event.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/Event.java,v
retrieving revision 1.1
diff -u -r1.1 Event.java
--- gnu/classpath/jdwp/event/Event.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/Event.java 12 Jun 2006 14:01:52 -0000
@@ -54,6 +54,41 @@
*/
public abstract class Event
{
+ /**
+ * The class of the object in which the event occurred
+ */
+ public static final int EVENT_CLASS = 1;
+
+ /**
+ * The thread where the event occurred
+ */
+ public static final int EVENT_THREAD = 2;
+
+ /**
+ * The location where an event occurred
+ */
+ public static final int EVENT_LOCATION = 3;
+
+ /**
+ * The instance of the class where the event occurred
+ */
+ public static final int EVENT_INSTANCE = 4;
+
+ /**
+ * The field acted on by an event
+ */
+ public static final int EVENT_FIELD = 5;
+
+ /**
+ * The class of the exception for ExceptionEvent
+ */
+ public static final int EVENT_EXCEPTION_CLASS = 6;
+
+ /**
+ * Whether this exception was caught (only valid for ExceptionEvents)
+ */
+ public static final int EVENT_EXCEPTION_CAUGHT = 7;
+
// The kind of event represented by this event
private byte _eventKind;
@@ -97,7 +132,7 @@
* @returns the parameter (not the ID) or <code>null</code> if none is
* is defined for this event
*/
- public abstract Object getParameter (Class type);
+ public abstract Object getParameter (int type);
/**
* Converts this event into to a JDWP packet
Index: gnu/classpath/jdwp/event/ThreadEndEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java,v
retrieving revision 1.1
diff -u -r1.1 ThreadEndEvent.java
--- gnu/classpath/jdwp/event/ThreadEndEvent.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/ThreadEndEvent.java 12 Jun 2006 14:01:52 -0000
@@ -81,9 +81,9 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
return null;
Index: gnu/classpath/jdwp/event/ThreadStartEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ThreadStartEvent.java,v
retrieving revision 1.2
diff -u -r1.2 ThreadStartEvent.java
--- gnu/classpath/jdwp/event/ThreadStartEvent.java 9 Mar 2006 23:18:29 -0000 1.2
+++ gnu/classpath/jdwp/event/ThreadStartEvent.java 12 Jun 2006 14:01:52 -0000
@@ -86,9 +86,9 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
return null;
Index: gnu/classpath/jdwp/event/VmDeathEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java,v
retrieving revision 1.2
diff -u -r1.2 VmDeathEvent.java
--- gnu/classpath/jdwp/event/VmDeathEvent.java 9 Mar 2006 23:18:29 -0000 1.2
+++ gnu/classpath/jdwp/event/VmDeathEvent.java 12 Jun 2006 14:01:52 -0000
@@ -67,7 +67,7 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
return null;
}
Index: gnu/classpath/jdwp/event/VmInitEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/VmInitEvent.java,v
retrieving revision 1.1
diff -u -r1.1 VmInitEvent.java
--- gnu/classpath/jdwp/event/VmInitEvent.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/VmInitEvent.java 12 Jun 2006 14:01:52 -0000
@@ -76,7 +76,7 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
return null;
}
Index: gnu/classpath/jdwp/event/filters/ClassMatchFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java,v
retrieving revision 1.3
diff -u -r1.3 ClassMatchFilter.java
--- gnu/classpath/jdwp/event/filters/ClassMatchFilter.java 9 Mar 2006 19:49:59 -0000 1.3
+++ gnu/classpath/jdwp/event/filters/ClassMatchFilter.java 12 Jun 2006 14:01:52 -0000
@@ -41,7 +41,6 @@
import gnu.classpath.jdwp.event.Event;
import gnu.classpath.jdwp.exception.InvalidStringException;
-import gnu.classpath.jdwp.id.ReferenceTypeId;
/**
* An event filter which includes events matching a
@@ -91,7 +90,7 @@
*/
public boolean matches (Event event)
{
- Object type = event.getParameter (ReferenceTypeId.class);
+ Object type = event.getParameter (Event.EVENT_CLASS);
if (type != null)
{
Class eventClass = (Class) type;
Index: gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java,v
retrieving revision 1.1
diff -u -r1.1 ClassOnlyFilter.java
--- gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java 26 Aug 2005 21:52:28 -0000 1.1
+++ gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java 12 Jun 2006 14:01:52 -0000
@@ -87,7 +87,7 @@
*/
public boolean matches (Event event)
{
- Object type = event.getParameter (ReferenceTypeId.class);
+ Object type = event.getParameter (Event.EVENT_CLASS);
if (type != null)
{
try
Index: gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java,v
retrieving revision 1.1
diff -u -r1.1 InstanceOnlyFilter.java
--- gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java 26 Aug 2005 21:52:28 -0000 1.1
+++ gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java 12 Jun 2006 14:01:52 -0000
@@ -89,7 +89,7 @@
*/
public boolean matches (Event event)
{
- Object eventInstance = event.getParameter (ObjectId.class);
+ Object eventInstance = event.getParameter (Event.EVENT_INSTANCE);
if (eventInstance != null)
{
Object myInstance = _instance.getReference().get ();
Index: gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java,v
retrieving revision 1.3
diff -u -r1.3 ThreadOnlyFilter.java
--- gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java 9 Mar 2006 19:49:59 -0000 1.3
+++ gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java 12 Jun 2006 14:01:52 -0000
@@ -88,7 +88,7 @@
*/
public boolean matches (Event event)
{
- Object thread = event.getParameter (ThreadId.class);
+ Object thread = event.getParameter (Event.EVENT_THREAD);
if (thread != null)
{
Thread eventThread = (Thread) thread;
