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

[Keith Seitz]

CVSROOT:        /sources/classpath
Module name:    classpath
Changes by:     Keith Seitz <keiths>    06/06/12 20:39:16

Modified files:
        .              : ChangeLog 
        gnu/classpath/jdwp/event/filters: ExceptionOnlyFilter.java 

Log message:
                From Kyle Galloway  <address@hidden>:
                * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
                (forCaught): Removed unused/unnecessary method.
                (forUncaught): Likewise.
                (matches): Implement.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7786&r2=1.7787
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java?cvsroot=classpath&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7786
retrieving revision 1.7787
diff -u -b -r1.7786 -r1.7787
--- ChangeLog   12 Jun 2006 19:59:43 -0000      1.7786
+++ ChangeLog   12 Jun 2006 20:39:15 -0000      1.7787
@@ -1,6 +1,14 @@
 2006-06-12  Keith Seitz  <address@hidden>
 
        From Kyle Galloway  <address@hidden>:
+       * gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
+       (forCaught): Removed unused/unnecessary method.
+       (forUncaught): Likewise.
+       (matches): Implement.
+
+2006-06-12  Keith Seitz  <address@hidden>
+
+       From Kyle Galloway  <address@hidden>:
        * gnu/classpath/jdwp/event/ExceptionEvent.java: New file.
 
 2006-06-12  Keith Seitz  <address@hidden>

Index: gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java
===================================================================
RCS file: 
/sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java   9 Mar 2006 
23:18:29 -0000       1.2
+++ gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java   12 Jun 2006 
20:39:16 -0000      1.3
@@ -1,5 +1,5 @@
-/* ExceptionOnlyFilter.java -- 
-   Copyright (C) 2005 Free Software Foundation
+/* ExceptionOnlyFilter.java -- filter for excetions by caught/uncaught and type
+   Copyright (C) 2005, 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -88,34 +88,29 @@
     return _refId;
   }
 
+  
   /**
-   * Report caught exceptions?
+   * Does the given event match the filter?
    *
-   * @return whether to report caught exceptions
+   * @param event  the <code>Event</code> to scrutinize
    */
-  public boolean forCaught ()
+  public boolean matches(Event event)
   {
-    return _caught;
-  }
+    boolean classMatch;
 
-  /**
-   * Report uncaught exceptions?
-   *
-   * @return whether to report uncaught exceptions
-   */
-  public boolean forUncaught ()
+    try
   {
-    return _uncaught;
+       Class klass = (Class) event.getParameter(Event.EVENT_EXCEPTION_CLASS);
+        classMatch = klass == _refId.getType();
   }
-
-  /**
-   * Does the given event match the filter?
-   *
-   * @param event  the <code>Event</code> to scrutinize
-   */
-  public boolean matches (Event event)
+    catch (InvalidClassException ex)
   {
-    // FIXME
-    throw new RuntimeException ("ExceptionOnlyFilter.matches not implemented");
+        classMatch = false;
+      }
+    
+    Boolean caught
+      = (Boolean) event.getParameter(Event.EVENT_EXCEPTION_CAUGHT);
+
+    return classMatch && (caught.booleanValue()) ? _caught : _uncaught;
   }
 }