diff options
| author | acolyer <acolyer> | 2005-09-06 11:00:26 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-09-06 11:00:26 +0000 |
| commit | 752a7b4b45d02495ca1610d1a941d4feafc80bae (patch) | |
| tree | 11185fcb663bf975c2dd930f30c5b72fb3105943 /weaver/testsrc | |
| parent | 9a7dfa5ff13d55a2934e877a7684944920efc224 (diff) | |
| download | aspectj-752a7b4b45d02495ca1610d1a941d4feafc80bae.tar.gz aspectj-752a7b4b45d02495ca1610d1a941d4feafc80bae.zip | |
fix for pr108818, changed the signature of concretize and concretize1 to pass in the actual declaring type of the member owning the pointcut reference.
Diffstat (limited to 'weaver/testsrc')
4 files changed, 4 insertions, 4 deletions
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java index 7a2a6f0e6..5509c32b0 100644 --- a/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java +++ b/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java @@ -80,7 +80,7 @@ public class PatternWeaveTestCase extends WeaveTestCase { { Pointcut sp = Pointcut.fromString(pointcutSource); Pointcut rp = sp.resolve(new SimpleScope(world, FormalBinding.NONE)); - Pointcut cp = rp.concretize(ResolvedType.MISSING, 0); + Pointcut cp = rp.concretize(ResolvedType.MISSING, ResolvedType.MISSING, 0); final List l = new ArrayList(); BcelAdvice p = new BcelAdvice(null, cp, null, 0, -1, -1, null, null) { diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java index 5a78845cc..c3a84b977 100644 --- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java +++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java @@ -267,7 +267,7 @@ public abstract class WeaveTestCase extends TestCase { public Pointcut makeConcretePointcut(String s) { - return makeResolvedPointcut(s).concretize(null, 0); + return makeResolvedPointcut(s).concretize(null, null, 0); } public Pointcut makeResolvedPointcut(String s) { diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/PointcutTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/PointcutTestCase.java index 37c0266c1..3a4477f9c 100644 --- a/weaver/testsrc/org/aspectj/weaver/patterns/PointcutTestCase.java +++ b/weaver/testsrc/org/aspectj/weaver/patterns/PointcutTestCase.java @@ -57,7 +57,7 @@ public class PointcutTestCase extends TestCase { protected void resolveBindingsFromRTTI() {} - protected Pointcut concretize1(ResolvedType inAspect, IntMap bindings) { + protected Pointcut concretize1(ResolvedType inAspect, ResolvedType declaringType, IntMap bindings) { return null; } diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java index b0a0fb259..92283c5e6 100644 --- a/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java +++ b/weaver/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java @@ -100,7 +100,7 @@ public class WithinTestCase extends TestCase { pointcut0.resolveBindings(scope, bindingTable); Pointcut pointcut1 = pointcut0; - return pointcut1.concretize1(null, new IntMap()); + return pointcut1.concretize1(null, null, new IntMap()); } |