commit-classpath
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Ev...


From: Keith Seitz
Subject: [commit-cp] classpath ChangeLog gnu/classpath/jdwp/event/Ev...
Date: Mon, 12 Jun 2006 19:43:26 +0000

CVSROOT:        /sources/classpath
Module name:    classpath
Changes by:     Keith Seitz <keiths>    06/06/12 19:43:26

Modified files:
        .              : ChangeLog 
        gnu/classpath/jdwp/event: Event.java BreakpointEvent.java 
                                  ClassPrepareEvent.java 
                                  ThreadEndEvent.java 
                                  ThreadStartEvent.java 
                                  VmDeathEvent.java VmInitEvent.java 
        gnu/classpath/jdwp/event/filters: ClassMatchFilter.java 
                                          ClassOnlyFilter.java 
                                          InstanceOnlyFilter.java 
                                          ThreadOnlyFilter.java 

Log message:
                From Kyle Galloway  <address@hidden>:
                * 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):
                Likewise.
                * gnu/classpath/jdwp/event/ThreadEndEvent.java (getParameter):
                Likewise.
                * gnu/classpath/jdwp/event/ThreadStartEvent.java (getParameter):
                Likewise.
                * gnu/classpath/jdwp/event/VmDeathEvent.java (getParameter):
                Likewise.
                * gnu/classpath/jdwp/event/VmInitEvent.java (getParameter):
                Likewise.
                * gnu/classpath/jdwp/event/ClassMatchFilter.java (matches):
                Likewise.
                * gnu/classpath/jdwp/event/ClassOnlyFilter.java (matches):
                Likewise.
                * gnu/classpath/jdwp/event/InstanceOnlyFilter.java (matches):
                Likewise.
                * gnu/classpath/jdwp/event/ThreadOnlyFilter.java (matches):
                Likewise.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7784&r2=1.7785
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/Event.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/ThreadStartEvent.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/VmInitEvent.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java?cvsroot=classpath&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7784
retrieving revision 1.7785
diff -u -b -r1.7784 -r1.7785
--- ChangeLog   12 Jun 2006 18:58:30 -0000      1.7784
+++ ChangeLog   12 Jun 2006 19:43:25 -0000      1.7785
@@ -1,3 +1,30 @@
+2006-06-12  Keith Seitz  <address@hidden>
+
+       From Kyle Galloway  <address@hidden>:
+       * 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):
+       Likewise.
+       * gnu/classpath/jdwp/event/ThreadEndEvent.java (getParameter):
+       Likewise.
+       * gnu/classpath/jdwp/event/ThreadStartEvent.java (getParameter):
+       Likewise.
+       * gnu/classpath/jdwp/event/VmDeathEvent.java (getParameter):
+       Likewise.
+       * gnu/classpath/jdwp/event/VmInitEvent.java (getParameter):
+       Likewise.
+       * gnu/classpath/jdwp/event/ClassMatchFilter.java (matches):
+       Likewise.
+       * gnu/classpath/jdwp/event/ClassOnlyFilter.java (matches):
+       Likewise.
+       * gnu/classpath/jdwp/event/InstanceOnlyFilter.java (matches):
+       Likewise.
+       * gnu/classpath/jdwp/event/ThreadOnlyFilter.java (matches):
+       Likewise.
+
 2006-06-12  Lillian Angel  <address@hidden>
 
        * tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java

Index: gnu/classpath/jdwp/event/Event.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/Event.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/Event.java 30 Aug 2005 00:51:10 -0000      1.1
+++ gnu/classpath/jdwp/event/Event.java 12 Jun 2006 19:43:26 -0000      1.2
@@ -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/BreakpointEvent.java
===================================================================
RCS file: 
/sources/classpath/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/BreakpointEvent.java       15 Mar 2006 22:55:54 
-0000      1.1
+++ gnu/classpath/jdwp/event/BreakpointEvent.java       12 Jun 2006 19:43:26 
-0000      1.2
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/ClassPrepareEvent.java     30 Aug 2005 00:51:10 
-0000      1.1
+++ gnu/classpath/jdwp/event/ClassPrepareEvent.java     12 Jun 2006 19:43:26 
-0000      1.2
@@ -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/ThreadEndEvent.java
===================================================================
RCS file: 
/sources/classpath/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/ThreadEndEvent.java        30 Aug 2005 00:51:10 
-0000      1.1
+++ gnu/classpath/jdwp/event/ThreadEndEvent.java        12 Jun 2006 19:43:26 
-0000      1.2
@@ -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
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/classpath/jdwp/event/ThreadStartEvent.java      9 Mar 2006 23:18:29 
-0000       1.2
+++ gnu/classpath/jdwp/event/ThreadStartEvent.java      12 Jun 2006 19:43:26 
-0000      1.3
@@ -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
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/classpath/jdwp/event/VmDeathEvent.java  9 Mar 2006 23:18:29 -0000       
1.2
+++ gnu/classpath/jdwp/event/VmDeathEvent.java  12 Jun 2006 19:43:26 -0000      
1.3
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/classpath/jdwp/event/VmInitEvent.java   30 Aug 2005 00:51:10 -0000      
1.1
+++ gnu/classpath/jdwp/event/VmInitEvent.java   12 Jun 2006 19:43:26 -0000      
1.2
@@ -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
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 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 
19:43:26 -0000      1.4
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 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 
19:43:26 -0000      1.2
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 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 
19:43:26 -0000      1.2
@@ -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
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 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 
19:43:26 -0000      1.4
@@ -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;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]