major refactoring - writeup to follow...

diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java
index 12d21159188fce8e6fe511b65d76153077ffded3..4a51e98da7bcef568bae63e85e671e874037c930 100644 (file)
--- a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java
+++ b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java
@@ -26,7 +26,6 @@ import org.aspectj.apache.bcel.classfile.LocalVariable;
 import org.aspectj.apache.bcel.classfile.LocalVariableTable;
 import org.aspectj.apache.bcel.util.NonCachingClassLoaderRepository;
 import org.aspectj.apache.bcel.util.Repository;
-import org.aspectj.apache.bcel.util.ClassLoaderRepository;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.World;
@@ -104,7 +103,7 @@ public class Java15AnnotationFinder implements AnnotationFinder, ArgNameFinder {
                // memory.
                try {
                        JavaClass jc = bcelRepository.loadClass(onMember.getDeclaringClass());
-                       org.aspectj.apache.bcel.classfile.annotation.Annotation[] anns = new org.aspectj.apache.bcel.classfile.annotation.Annotation[0];
+                       org.aspectj.apache.bcel.classfile.annotation.AnnotationGen[] anns = new org.aspectj.apache.bcel.classfile.annotation.AnnotationGen[0];
                        if (onMember instanceof Method) {
                                org.aspectj.apache.bcel.classfile.Method bcelMethod = jc.getMethod((Method)onMember);
                                anns = bcelMethod.getAnnotations();
@@ -117,7 +116,7 @@ public class Java15AnnotationFinder implements AnnotationFinder, ArgNameFinder {
                        }
                        // the answer is cached and we don't want to hold on to memory
                        bcelRepository.clear();
-                       if (anns == null) anns = new org.aspectj.apache.bcel.classfile.annotation.Annotation[0];
+                       if (anns == null) anns = new org.aspectj.apache.bcel.classfile.annotation.AnnotationGen[0];
                        // convert to our Annotation type
                        Set<ResolvedType> annSet = new HashSet<ResolvedType>();
                        for (int i = 0; i < anns.length; i++) {
@@ -144,7 +143,7 @@ public class Java15AnnotationFinder implements AnnotationFinder, ArgNameFinder {
                // memory.
                try {
                        JavaClass jc = bcelRepository.loadClass(forClass);
-                       org.aspectj.apache.bcel.classfile.annotation.Annotation[] anns =jc.getAnnotations();
+                       org.aspectj.apache.bcel.classfile.annotation.AnnotationGen[] anns =jc.getAnnotations();
                        bcelRepository.clear();
                        if (anns == null) return new ResolvedType[0];
                        ResolvedType[] ret = new ResolvedType[anns.length];