231396: refactoring AspectJ: simplifying resolvedmember hierarchy and removing unused test code.

1 files changed, 183 insertions, 0 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/TestUtils.java b/weaver/testsrc/org/aspectj/weaver/TestUtils.java
index 48bbe5b44..ca3bb4e6c 100644
--- a/weaver/testsrc/org/aspectj/weaver/TestUtils.java
+++ b/weaver/testsrc/org/aspectj/weaver/TestUtils.java
@@ -24,6 +24,189 @@ import org.aspectj.weaver.patterns.SimpleScope;
 public class TestUtils {
     private static final String[] ZERO_STRINGS = new String[0];
 
+    // For stringifying a delegate - extracted from AbstractReferenceTypeDelegate, not fixed up
+//    /**
+//     * Create the string representation for a delegate, allowing us to 
+//     * more easily compare delegate implementations.
+//     */
+//    public String stringifyDelegate() {
+//    	
+//    	StringBuffer result = new StringBuffer();
+//    	result.append("=== Delegate for "+getResolvedTypeX().getName()+"\n");
+//    	
+//    	result.append("isAspect?"+isAspect()+"\n");
+//    	result.append("isAnnotationStyleAspect?"+isAnnotationStyleAspect()+"\n");
+//    	result.append("isInterface?"+isInterface()+"\n");
+//    	result.append("isEnum?"+isEnum()+"\n");
+//    	result.append("isClass?"+isClass()+"\n");
+//    	result.append("-\n");
+//    	result.append("isAnnotation?"+isAnnotation()+"\n");
+//    	result.append("retentionPolicy="+getRetentionPolicy()+"\n");
+//    	result.append("canAnnotationTargetType?"+canAnnotationTargetType()+"\n");
+//    	AnnotationTargetKind[] kinds = getAnnotationTargetKinds();
+//    	if (kinds!=null && kinds.length>0) {
+//    		result.append("annotationTargetKinds:[");
+//    		for (int i = 0; i < kinds.length; i++) {
+//				AnnotationTargetKind kind = kinds[i];
+//				result.append(kind);
+//				if ((i+1)<kinds.length) result.append(" ");
+//			}
+//    		result.append("]\n");
+//    	}
+//    	result.append("isAnnotationWithRuntimeRetention?"+isAnnotationWithRuntimeRetention()+"\n");
+//    	result.append("-\n");
+//    	
+//    	result.append("isAnonymous?"+isAnonymous()+"\n");
+//    	result.append("isNested?"+isNested()+"\n");
+//    	result.append("-\n");
+//
+//    	result.append("isGeneric?"+isGeneric()+"\n");
+//    	result.append("declaredGenericSignature="+getDeclaredGenericSignature()+"\n");
+//    	result.append("-\n");
+//    	
+//    	AnnotationX[] axs = getAnnotations();
+//    	if (axs!=null && axs.length>0) {
+//    		result.append("getAnnotations() returns: "+axs.length+" annotations\n");
+//    		for (int i = 0; i < axs.length; i++) {
+//				AnnotationX annotationX = axs[i];
+//				result.append("  #"+i+") "+annotationX+"\n");
+//    		}
+//		} else {
+//			result.append("getAnnotations() returns nothing\n");
+//		}
+//    	ResolvedType[] axtypes = getAnnotationTypes();
+//    	if (axtypes!=null && axtypes.length>0) {
+//    		result.append("getAnnotationTypes() returns: "+axtypes.length+" annotations\n");
+//    		for (int i = 0; i < axtypes.length; i++) {
+//				ResolvedType annotation = axtypes[i];
+//				result.append("  #"+i+") "+annotation+":"+annotation.getClass()+"\n");
+//			}
+//    	} else {
+//			result.append("getAnnotationTypes() returns nothing\n");
+//		}
+//    	
+//    	result.append("isExposedToWeaver?"+isExposedToWeaver()+"\n");
+//    	result.append("getSuperclass?"+getSuperclass()+"\n");
+//    	result.append("getResolvedTypeX?"+getResolvedTypeX()+"\n");
+//    	result.append("--\n");
+//    	
+//    	ResolvedMember[] fields = getDeclaredFields();
+//    	if (fields!=null && fields.length>0) {
+//        	result.append("The fields: "+fields.length+"\n");
+//    		for (int i = 0; i < fields.length; i++) {
+//				ResolvedMember member = fields[i];
+//				result.append("f"+i+") "+member.toDebugString()+"\n");
+//			}
+//    	}
+//    	ResolvedMember[] methods = getDeclaredMethods();
+//    	if (methods!=null && methods.length>0) {
+//        	result.append("The methods: "+methods.length+"\n");
+//    		for (int i = 0; i < methods.length; i++) {
+//				ResolvedMember member = methods[i];
+//				result.append("m"+i+") "+member.toDebugString()+"\n");
+//			}
+//    	}
+//    	ResolvedType[] interfaces = getDeclaredInterfaces();
+//    	if (interfaces!=null && interfaces.length>0) {
+//        	result.append("The interfaces: "+interfaces.length+"\n");
+//    		for (int i = 0; i < interfaces.length; i++) {
+//    			ResolvedType member = interfaces[i];
+//				result.append("i"+i+") "+member+"\n");
+//			}
+//    	}
+//
+//    	result.append("getModifiers?"+getModifiers()+"\n");
+//    	
+//    	result.append("perclause="+getPerClause()+"\n");
+//    	
+//    	result.append("aj:weaverstate="+getWeaverState()+"\n");
+//    	
+//    	ResolvedMember[] pointcuts = getDeclaredPointcuts();
+//    	if (pointcuts!=null && pointcuts.length>0) {
+//    		result.append("The pointcuts: "+pointcuts.length+"\n");
+//    		
+//    		// Sort the damn things
+//        	List sortedSetOfPointcuts = new ArrayList();
+//        	for (int i = 0; i < pointcuts.length; i++) {sortedSetOfPointcuts.add(pointcuts[i]);}
+//        	Collections.sort(sortedSetOfPointcuts);
+//        	
+//        	int i =0;
+//        	for (Iterator iter = sortedSetOfPointcuts.iterator(); iter.hasNext();) {
+//				ResolvedMember member = (ResolvedMember) iter.next();
+//				result.append("p"+i+") "+member.toDebugString()+"\n");
+//				i++;
+//			}
+//    	}
+//    	
+//    	Collection declares = getDeclares();
+//    	if (declares.size()>0) {
+//    		result.append("The declares: "+declares.size()+"\n");
+//    		
+////    		// Sort the damn things
+////        	List sortedSetOfPointcuts = new ArrayList();
+////        	for (int i = 0; i < pointcuts.length; i++) {sortedSetOfPointcuts.add(pointcuts[i]);}
+////        	Collections.sort(sortedSetOfPointcuts);
+//        	
+//        	int i=0;
+//        	for (Iterator iter = declares.iterator(); iter.hasNext();) {
+//				Declare dec = (Declare) iter.next();
+//				result.append("d"+i+") "+dec.toString()+"\n");
+//				i++;
+//			}
+//    	}
+//    	
+//    	TypeVariable[] tv = getTypeVariables();
+//    	if (tv!=null && tv.length>0) {
+//        	result.append("The type variables: "+tv.length+"\n");
+//    		for (int i = 0; i < tv.length; i++) {
+//				result.append("tv"+i+") "+tv[i]+"\n");
+//			}
+//    	}
+//    	
+//    	Collection tmungers = getTypeMungers();
+//    	if (tmungers.size()>0) {
+//    		List sorted = new ArrayList();
+//    		sorted.addAll(tmungers);
+//    		Collections.sort(sorted,new Comparator() {
+//    			public int compare(Object arg0, Object arg1) {
+//    				 return arg0.toString().compareTo(arg1.toString());
+//    			}
+//    		});
+//    		result.append("The type mungers: "+tmungers.size()+"\n");
+//    		int i=0;
+//        	for (Iterator iter = sorted.iterator(); iter.hasNext();) {
+//				ConcreteTypeMunger mun = (ConcreteTypeMunger) iter.next();
+//				result.append("tm"+i+") "+mun.toString()+"\n");
+//				i++;
+//			}
+//    	}
+//
+//    	result.append("doesNotExposeShadowMungers?"+doesNotExposeShadowMungers()+"\n");
+//    	
+//    	Collection pas = getPrivilegedAccesses();
+//    	if (pas!=null && pas.size()>0) {
+////    		List sorted = new ArrayList();
+////    		sorted.addAll(tmungers);
+////    		Collections.sort(sorted,new Comparator() {
+////    			public int compare(Object arg0, Object arg1) {
+////    				 return arg0.toString().compareTo(arg1.toString());
+////    			}
+////    		});
+//    		result.append("The privileged accesses: "+pas.size()+"\n");
+//    		int i=0;
+//        	for (Iterator iter = pas.iterator(); iter.hasNext();) {
+//				ResolvedMember mun = (ResolvedMember) iter.next();
+//				result.append("tm"+i+") "+mun.toDebugString()+"\n");
+//				i++;
+//			}
+//    	}
+//
+////    	public Collection getPrivilegedAccesses();
+////      public boolean hasAnnotation(UnresolvedType ofType);	
+//    	result.append("===");
+//    	return result.toString();
+//    }
+    
     /**
      * Build a member from a string representation:
      * <blockquote><pre>