diff options
| author | acolyer <acolyer> | 2005-11-27 18:45:06 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-11-27 18:45:06 +0000 |
| commit | c3bef72dcac14398332abde6dfd5498eec24b042 (patch) | |
| tree | 929eb53c4ea125601e466cb0a9b996753604db60 /weaver5/java5-src | |
| parent | 3ce492be631f9f598bbf9d1e045e4d9637885bf1 (diff) | |
| download | aspectj-c3bef72dcac14398332abde6dfd5498eec24b042.tar.gz aspectj-c3bef72dcac14398332abde6dfd5498eec24b042.zip | |
updated tests and fix for pr116229
Diffstat (limited to 'weaver5/java5-src')
| -rw-r--r-- | weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java | 4 | ||||
| -rw-r--r-- | weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java index 31de59c62..40985bd26 100644 --- a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java +++ b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java @@ -51,7 +51,7 @@ public class Java15AnnotationFinder implements AnnotationFinder { */ public Object getAnnotation(ResolvedType annotationType, Object onObject) { try { - Class annotationClass = Class.forName(annotationType.getName(),false,classLoader); + Class<? extends Annotation> annotationClass = (Class<? extends Annotation>) Class.forName(annotationType.getName(),false,classLoader); if (onObject.getClass().isAnnotationPresent(annotationClass)) { return onObject.getClass().getAnnotation(annotationClass); } @@ -63,7 +63,7 @@ public class Java15AnnotationFinder implements AnnotationFinder { public Object getAnnotationFromClass(ResolvedType annotationType, Class aClass) { try { - Class annotationClass = Class.forName(annotationType.getName(),false,classLoader); + Class<? extends Annotation> annotationClass = (Class<? extends Annotation>) Class.forName(annotationType.getName(),false,classLoader); if (aClass.isAnnotationPresent(annotationClass)) { return aClass.getAnnotation(annotationClass); } diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java index a26fc6252..9d6e99cb8 100644 --- a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java +++ b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java @@ -50,7 +50,7 @@ import org.aspectj.weaver.tools.PointcutParser; public class Java15ReflectionBasedReferenceTypeDelegate extends ReflectionBasedReferenceTypeDelegate { - private AjType myType; + private AjType<?> myType; private ResolvedType[] annotations; private ResolvedMember[] pointcuts; private ResolvedMember[] methods; @@ -241,7 +241,7 @@ public class Java15ReflectionBasedReferenceTypeDelegate extends if (pointcuts == null) { Pointcut[] pcs = this.myType.getDeclaredPointcuts(); pointcuts = new ResolvedMember[pcs.length]; - PointcutParser parser = new PointcutParser(); + PointcutParser parser = PointcutParser.getPointcutParserSupportingAllPrimitivesAndUsingSpecifiedClassloaderForResolution(classLoader); for (int i = 0; i < pcs.length; i++) { AjType<?>[] ptypes = pcs[i].getParameterTypes(); String[] pnames = pcs[i].getParameterNames(); |