Added support for clients to extend the ASM relationships in order to add

new relationships (such as the example in the sandbox that adds additional
declared-parents relationships).  There is no structural change to the compiler
or weaver.  The AsmRelationshipProvider is now accessed by getDefault()
instead of statically, and its instance can be reset to be a subtype.

4 files changed, 29 insertions, 14 deletions

diff --git a/weaver/src/org/aspectj/weaver/AsmRelationshipProvider.java b/weaver/src/org/aspectj/weaver/AsmRelationshipProvider.java
index 176fbad00..2d65bc14d 100644
--- a/weaver/src/org/aspectj/weaver/AsmRelationshipProvider.java
+++ b/weaver/src/org/aspectj/weaver/AsmRelationshipProvider.java
@@ -13,6 +13,7 @@
 
 package org.aspectj.weaver;
 
+import java.util.*;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -28,6 +29,8 @@ import org.aspectj.weaver.bcel.BcelAdvice;
 
 public class AsmRelationshipProvider {
 	
+    protected static AsmRelationshipProvider INSTANCE = new AsmRelationshipProvider();
+    
 	public static final String ADVISES = "advises";
 	public static final String ADVISED_BY = "advised by";
 	public static final String DECLARES_ON = "declares on";
@@ -36,8 +39,8 @@ public class AsmRelationshipProvider {
 	public static final String MATCHES_DECLARE = "matches declare";
 	public static final String INTER_TYPE_DECLARES = "declared on";
 	public static final String INTER_TYPE_DECLARED_BY = "aspect declarations";
-
-	public static void checkerMunger(IHierarchy model, Shadow shadow, Checker checker) {
+	
+	public void checkerMunger(IHierarchy model, Shadow shadow, Checker checker) {
 		if (shadow.getSourceLocation() == null || checker.getSourceLocation() == null) return;
 		
 		String sourceHandle = ProgramElement.createHandleIdentifier(
@@ -65,7 +68,7 @@ public class AsmRelationshipProvider {
 	}
 
     // For ITDs
-	public static void addRelationship(
+	public void addRelationship(
 		ResolvedTypeX onType,
 		ResolvedTypeMunger munger,
 		ResolvedTypeX originatingAspect) {
@@ -102,7 +105,7 @@ public class AsmRelationshipProvider {
 		}
 	}
 	
-	public static void addDeclareParentsRelationship(ISourceLocation decp,ResolvedTypeX targetType) {
+	public void addDeclareParentsRelationship(ISourceLocation decp,ResolvedTypeX targetType, List newParents) {
 
 		String sourceHandle = ProgramElement.createHandleIdentifier(decp.getSourceFile(),decp.getLine(),decp.getColumn());
 		
@@ -125,7 +128,7 @@ public class AsmRelationshipProvider {
 		
 	}
 	
-	public static void adviceMunger(IHierarchy model, Shadow shadow, ShadowMunger munger) {
+	public void adviceMunger(IHierarchy model, Shadow shadow, ShadowMunger munger) {
 		if (munger instanceof Advice) {
 			Advice advice = (Advice)munger;
 			
@@ -168,7 +171,7 @@ public class AsmRelationshipProvider {
 		}
 	}
 
-	private static IProgramElement getNode(IHierarchy model, Shadow shadow) {
+	private IProgramElement getNode(IHierarchy model, Shadow shadow) {
 		Member enclosingMember = shadow.getEnclosingCodeSignature();
 		
 		IProgramElement enclosingNode = lookupMember(model, enclosingMember);
@@ -189,13 +192,13 @@ public class AsmRelationshipProvider {
 		}
 	}
 	
-	private static boolean sourceLinesMatch(ISourceLocation loc1,ISourceLocation loc2) {
+	private boolean sourceLinesMatch(ISourceLocation loc1,ISourceLocation loc2) {
 		if (loc1.getLine()!=loc2.getLine()) return false;
 		return true;
 	}
 	
 	
-	private static IProgramElement findOrCreateCodeNode(IProgramElement enclosingNode, Member shadowSig, Shadow shadow)
+	private IProgramElement findOrCreateCodeNode(IProgramElement enclosingNode, Member shadowSig, Shadow shadow)
 	{
 		for (Iterator it = enclosingNode.getChildren().iterator(); it.hasNext(); ) {
 			IProgramElement node = (IProgramElement)it.next();
@@ -224,14 +227,14 @@ public class AsmRelationshipProvider {
 		return peNode;
 	}
 	
-	private static IProgramElement lookupMember(IHierarchy model, Member member) {
+	private IProgramElement lookupMember(IHierarchy model, Member member) {
 		TypeX declaringType = member.getDeclaringType();
 		IProgramElement classNode =
 			model.findElementForType(declaringType.getPackageName(), declaringType.getClassName());
 		return findMemberInClass(classNode, member);
 	}
  
-	private static IProgramElement findMemberInClass(
+	private IProgramElement findMemberInClass(
 		IProgramElement classNode,
 		Member member)
 	{
@@ -275,4 +278,16 @@ public class AsmRelationshipProvider {
 //		}
 //	}
 
+    public static AsmRelationshipProvider getDefault() {
+        return INSTANCE;
+    }
+    
+    /**
+     * Reset the instance of this class, intended for extensibility.
+     * This enables a subclass to become used as the default instance.
+     */
+    public static void setDefault(AsmRelationshipProvider instance) {
+        INSTANCE = instance;
+    }
+	
 }
diff --git a/weaver/src/org/aspectj/weaver/Checker.java b/weaver/src/org/aspectj/weaver/Checker.java
index 8c8107e96..cfed27510 100644
--- a/weaver/src/org/aspectj/weaver/Checker.java
+++ b/weaver/src/org/aspectj/weaver/Checker.java
@@ -66,7 +66,7 @@ public class Checker extends ShadowMunger {
 			}
 			
 			if (world.getModel() != null) {
-				AsmRelationshipProvider.checkerMunger(world.getModel(), shadow, this);
+				AsmRelationshipProvider.getDefault().checkerMunger(world.getModel(), shadow, this);
 			}
 		}
 		return false;
diff --git a/weaver/src/org/aspectj/weaver/Shadow.java b/weaver/src/org/aspectj/weaver/Shadow.java
index 58ae6e723..de2348a4d 100644
--- a/weaver/src/org/aspectj/weaver/Shadow.java
+++ b/weaver/src/org/aspectj/weaver/Shadow.java
@@ -458,7 +458,7 @@ public abstract class Shadow {
 			
 			if (world.getModel() != null) {
 				//System.err.println("munger: " + munger + " on " + this);
-				AsmRelationshipProvider.adviceMunger(world.getModel(), this, munger);
+				AsmRelationshipProvider.getDefault().adviceMunger(world.getModel(), this, munger);
 			}
 		}
 	}
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
index c6f05aba5..b490e3d21 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java
@@ -87,9 +87,9 @@ public class BcelTypeMunger extends ConcreteTypeMunger {
 		if (ResolvedTypeMunger.persistSourceLocation) {
 			if (changed) {
 				if (munger.getKind().equals(ResolvedTypeMunger.Parent)) {
-			  	  AsmRelationshipProvider.addRelationship(weaver.getLazyClassGen().getType(), munger,getAspectType());
+			  	  AsmRelationshipProvider.getDefault().addRelationship(weaver.getLazyClassGen().getType(), munger,getAspectType());
 				} else {
-			  	  AsmRelationshipProvider.addRelationship(weaver.getLazyClassGen().getType(), munger,getAspectType());	
+			  	  AsmRelationshipProvider.getDefault().addRelationship(weaver.getLazyClassGen().getType(), munger,getAspectType());	
 				}
 			}
 		}