diff options
| author | Andy Clement <aclement@gopivotal.com> | 2014-10-06 17:35:51 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2014-10-06 17:35:51 -0700 |
| commit | c8e951296c5f95e82d4c7c3f8eb9b0a647014e20 (patch) | |
| tree | 2eaed5b80ad735e4c91e424098e35e221f4fea44 /weaver5 | |
| parent | 102173fc11fc6648ed8f2283d3c5ad535e412c73 (diff) | |
| download | aspectj-c8e951296c5f95e82d4c7c3f8eb9b0a647014e20.tar.gz aspectj-c8e951296c5f95e82d4c7c3f8eb9b0a647014e20.zip | |
Fix 436653: conditional aspect activation plus various polish
Modified test expectation system so it is possible to say
the test cares about one particular message and the rest
do not matter (prefix message string with '*') - crude but
quick.
Polished many places to exploit generics
Upgraded all the tests to work on Java8 - some serious changes
regarding ajdoc on Java8. Hopefully it has stayed backwards
compatible with earlier JDK versions (e.g. if using AspectJ 1.8.3+
with a JDK less than 8) but no explicit testing done for this.
Diffstat (limited to 'weaver5')
| -rw-r--r-- | weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java index 2782bddb5..e9606790a 100644 --- a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java +++ b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java @@ -92,6 +92,14 @@ public class Java15ReflectionBasedReferenceTypeDelegate extends ReflectionBasedR } return annotations; } + + @Override + public boolean hasAnnotations() { + if (annotations == null) { + annotations = annotationFinder.getAnnotations(getBaseClass(), getWorld()); + } + return annotations.length != 0; + } @Override public boolean hasAnnotation(UnresolvedType ofType) { |