From 996048158846d1a81bd7c363ba0ad2759abb051a Mon Sep 17 00:00:00 2001 From: kseitz Date: Sat, 28 Apr 2007 01:02:10 +0000 Subject: [PATCH] * classpath/lib/gnu/classpath/jdwp/event/filters/ LocationOnlyFilter.class: Regenerated; * classpath/lib/gnu/classpath/jdwp/util/Location.class: Regenerated. * gnu/classpath/jdwp/VMMethod.java * classpath/lib/gnu/classpath/jdwp/VMMethod.class: Regenerated. * gnu/classpath/jdwp/VMMethod.h: Regenerated. * gnu/classpath/jdwp/util/Location.h: Regenerated. * gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java (matches): Use Location.equals to determine equality. * gnu/classpath/jdwp/VMMethod.java (equals): New method. * gnu/classpath/jdwp/util/Location.java (equals): New method. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124249 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 12 ++++++++++++ libjava/classpath/ChangeLog | 9 +++++++++ .../jdwp/event/filters/LocationOnlyFilter.java | 18 +++++++----------- .../classpath/gnu/classpath/jdwp/util/Location.java | 14 +++++++++++++- .../classpath/lib/gnu/classpath/jdwp/VMMethod.class | Bin 1983 -> 2165 bytes .../jdwp/event/filters/LocationOnlyFilter.class | Bin 889 -> 1109 bytes .../lib/gnu/classpath/jdwp/util/Location.class | Bin 2633 -> 2867 bytes libjava/gnu/classpath/jdwp/VMMethod.h | 1 + libjava/gnu/classpath/jdwp/VMMethod.java | 13 ++++++++++++- libjava/gnu/classpath/jdwp/util/Location.h | 1 + 10 files changed, 55 insertions(+), 13 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 67c1389..eac885a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +2007-04-27 Keith Seitz + + * classpath/lib/gnu/classpath/jdwp/event/filters/ + LocationOnlyFilter.class: Regenerated; + * classpath/lib/gnu/classpath/jdwp/util/Location.class: + Regenerated. + * gnu/classpath/jdwp/VMMethod.java + * classpath/lib/gnu/classpath/jdwp/VMMethod.class: + Regenerated. + * gnu/classpath/jdwp/VMMethod.h: Regenerated. + * gnu/classpath/jdwp/util/Location.h: Regenerated. + 2007-04-27 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/CairoGraphics2D.h: Regenerate. diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 4877b1d..e9ad54b 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,12 @@ +2007-04-27 Keith Seitz + + * gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java + (matches): Use Location.equals to determine equality. + * gnu/classpath/jdwp/VMMethod.java (equals): + New method. + * gnu/classpath/jdwp/util/Location.java (equals): + New method. + 2007-03-16 Francis Kung * gnu/java/awt/peer/gtk/CairoGraphics2D.java diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java index 7190317..a312537 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.java @@ -1,5 +1,5 @@ /* LocationOnlyFilter.java -- filter on location - Copyright (C) 2005, 2006 Free Software Foundation + Copyright (C) 2005, 2006, 2007 Free Software Foundation This file is part of GNU Classpath. @@ -49,13 +49,6 @@ import gnu.classpath.jdwp.util.Location; * May be used with breakpoint, field access, field modification, step, * and exception event kinds. * - * This "filter" is not really a filter. It is simply a way to communicate - * location information for supported events in a generic way to ease - * the burden of special casing several things in - * EventReqeustCommandSet.executeSet. - * - * Consequently, this "filter" always matches any event. - * * @author Keith Seitz (keiths@redhat.com) */ public class LocationOnlyFilter @@ -90,9 +83,12 @@ public class LocationOnlyFilter * * @param event the Event to scrutinize */ - public boolean matches (Event event) + public boolean matches(Event event) { - // This filter always matches. See comments in class javadoc. - return true; + Location loc = (Location) event.getParameter(Event.EVENT_LOCATION); + if (loc != null) + return (getLocation().equals(loc)); + + return false; } } diff --git a/libjava/classpath/gnu/classpath/jdwp/util/Location.java b/libjava/classpath/gnu/classpath/jdwp/util/Location.java index 89e81e5..ff045a5 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/Location.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/Location.java @@ -1,5 +1,5 @@ /* Location.java -- class to read/write JDWP locations - Copyright (C) 2005, 2006 Free Software Foundation + Copyright (C) 2005, 2006, 2007 Free Software Foundation This file is part of GNU Classpath. @@ -153,4 +153,16 @@ public class Location { return method.toString () + "." + index; } + + public boolean equals(Object obj) + { + if (obj instanceof Location) + { + Location l = (Location) obj; + return (getMethod().equals(l.getMethod()) + && getIndex() == l.getIndex()); + } + + return false; + } } diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/VMMethod.class b/libjava/classpath/lib/gnu/classpath/jdwp/VMMethod.class index 25cc9e0c40f01646da859d537c04531f03020604..e19c61b51095dab5ccf36377c193b0a91314d928 100644 GIT binary patch delta 217 zcmdnb|5bqN)W2Q(7#J7~8FDsq*|FNOr52VZ<`gqBh-&y`C6*=X=OpH(>-#5Vr6!kH zYeq3LFy|*_F)|2YN-{Dq=1z8F^}$vW6K5fhw37#DSy`P(1^~Rt9#4?F>8&I~Zgbb~8u-MHC>W hFi0{;0eL|47}9}eGXm8JFk}M7n1Jjopg0plHUM}bE71S| delta 36 scmew=u%Dmn)W2Q(7#J7~8PYd$*|ARUV0B~U-h7@_n~9Zyfr%jv0PFJ#M*si- diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/filters/LocationOnlyFilter.class index 1e8d19b24e629556d2d5fda4ca924e151177facb..a76fdfdcfcc47abddfd00469433c970c6e36e8ff 100644 GIT binary patch delta 295 zcmZ9GJxfAy7{!0j-%#)EN>N%_q?T5`+!AYSie4b-ZLDbdD;GgD$gJ-XcW!JGqQ#*h zni?8|K0+U&C3>o@<>5K!@H?E(=zDzh_3QBos8Nk!gtbs48Qx0vVe>n2suT^Z|)N{7h%yO z&9qCNqDP6c5DhM_Z2R)3;(tL{Fn7)dLu}!&9ln_zISA8{Y^RPPqN}GW(E+p1S0qBc)F6k5@gZN}H(Q>pq7O{o_gt%jz3ez5zxw BG(i9W delta 123 zcmcc0@smy9)W2Q(7#J7~85G$Wm>3z1Co?jNOrFaqztQz{tP^)WyWI21GK507*8W7z0BBgD8*`gUAADaUc(*LY6@eD9^|s I59TQV0Ag|yNdN!< diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/Location.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/Location.class index 593418c29b7d32489ac53434dd94f96154841382..ed85dd09e7de795ecb4c576dff13d80aa2e8d402 100644 GIT binary patch delta 284 zcmX>pvRO>v)W2Q(7#J7~8T!~6m>3xpCSPO}p4`jIyV2koTMS!jVQFGcF(ZShhEG;v zS)zVUVqUtwe^ORza*4HO6c+;{LkkZ>Dnl9BJXEF!^dF?=6`;=J>tSoDofe@&ki9r}hN-?kj$@vWI3=0`}7#0Efiy1V5v=+lM q1`(i)0>o?vQ3f#}4`>TRCqoy|W*#91IfibaAQO<&1C(H5=mh{4{X5$L delta 50 zcmV-20L}li7ReM4%Ko~(0000n0D}hr0s#OZlhFYalZ^!pu`uQalXM3*0SB|I2loO6 I00062f|f)Me*gdg diff --git a/libjava/gnu/classpath/jdwp/VMMethod.h b/libjava/gnu/classpath/jdwp/VMMethod.h index f1bf3d7..00f4d87 100644 --- a/libjava/gnu/classpath/jdwp/VMMethod.h +++ b/libjava/gnu/classpath/jdwp/VMMethod.h @@ -49,6 +49,7 @@ public: virtual ::java::lang::String * toString(); virtual void writeId(::java::io::DataOutputStream *); static ::gnu::classpath::jdwp::VMMethod * readId(::java::lang::Class *, ::java::nio::ByteBuffer *); + virtual jboolean equals(::java::lang::Object *); static const jint SIZE = 8; private: ::java::lang::Class * __attribute__((aligned(__alignof__( ::java::lang::Object)))) _class; diff --git a/libjava/gnu/classpath/jdwp/VMMethod.java b/libjava/gnu/classpath/jdwp/VMMethod.java index d345bc1..6a2b04e 100644 --- a/libjava/gnu/classpath/jdwp/VMMethod.java +++ b/libjava/gnu/classpath/jdwp/VMMethod.java @@ -1,5 +1,5 @@ /* VMMethod.java -- a method in a virtual machine - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -175,4 +175,15 @@ public class VMMethod { return VMVirtualMachine.getClassMethod(klass, bb.getLong()); } + + public boolean equals(Object obj) + { + if (obj instanceof VMMethod) + { + VMMethod m = (VMMethod) obj; + return (getId() == m.getId()); + } + + return false; + } } diff --git a/libjava/gnu/classpath/jdwp/util/Location.h b/libjava/gnu/classpath/jdwp/util/Location.h index 4b74274..2e87105 100644 --- a/libjava/gnu/classpath/jdwp/util/Location.h +++ b/libjava/gnu/classpath/jdwp/util/Location.h @@ -43,6 +43,7 @@ public: virtual ::gnu::classpath::jdwp::VMMethod * getMethod(); virtual jlong getIndex(); virtual ::java::lang::String * toString(); + virtual jboolean equals(::java::lang::Object *); private: ::gnu::classpath::jdwp::VMMethod * __attribute__((aligned(__alignof__( ::java::lang::Object)))) method; jlong index; -- 2.7.4