Added support for multiple relationships for a single program element. Renamed model container class.

2 files changed, 7 insertions, 7 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 37f50061c..8cb60f48f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -42,7 +42,7 @@ public class AjBuildManager {
 	private int compiledCount;
 	private int sourceFileCount;
 	
-	private StructureModel structureModel;
+	private AspectJModel structureModel;
 	public AjBuildConfig buildConfig;
 	
 	AjState state = new AjState(this);
@@ -167,7 +167,7 @@ public class AjBuildManager {
      
     private void setupModel() {
         String rootLabel = "<root>";
-        StructureModel model = AsmManager.getDefault().getModel();
+        AspectJModel model = AsmManager.getDefault().getModel();
         IProgramElement.Kind kind = IProgramElement.Kind.FILE_JAVA;
         if (buildConfig.getConfigFile() != null) {
             rootLabel = buildConfig.getConfigFile().getName();
@@ -523,14 +523,14 @@ public class AjBuildManager {
 	}
 
 
-	public void setStructureModel(StructureModel structureModel) {
+	public void setStructureModel(AspectJModel structureModel) {
 		this.structureModel = structureModel;
 	}
 
 	/**
 	 * Returns null if there is no structure model
 	 */
-	public StructureModel getStructureModel() {
+	public AspectJModel getStructureModel() {
 		return structureModel;
 	}
     
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index b7fd8d1be..c159919d5 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -32,7 +32,7 @@ public class AsmHierarchyBuilder extends AbstractSyntaxTreeVisitorAdapter {
 	
     public static void build(    
         CompilationUnitDeclaration unit,
-        StructureModel structureModel) {
+        AspectJModel structureModel) {
         LangUtil.throwIaxIfNull(unit, "unit");
         new AsmHierarchyBuilder(unit.compilationResult()).internalBuild(unit, structureModel);
     }
@@ -53,7 +53,7 @@ public class AsmHierarchyBuilder extends AbstractSyntaxTreeVisitorAdapter {
      */
     private void internalBuild(
         CompilationUnitDeclaration unit, 
-        StructureModel structureModel) {
+        AspectJModel structureModel) {
         LangUtil.throwIaxIfNull(structureModel, "structureModel");        
         if (!currCompilationResult.equals(unit.compilationResult())) {
             throw new IllegalArgumentException("invalid unit: " + unit);
@@ -116,7 +116,7 @@ public class AsmHierarchyBuilder extends AbstractSyntaxTreeVisitorAdapter {
 	 */
 	private IProgramElement genAddToNode(
 		CompilationUnitDeclaration unit,
-		StructureModel structureModel) {
+		AspectJModel structureModel) {
 		final IProgramElement addToNode;
 		{
 		    ImportReference currentPackage = unit.currentPackage;