271201: inpath handles

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
index 8ea5c2c1781ee4ad06d0d2e98fc694b4f42a268d..c8b12db846dff81bc7468b8260f4eb726018069b 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
@@ -13,6 +13,7 @@ package org.aspectj.ajdt.internal.compiler;
 
 import java.io.File;
 import java.util.List;
+import java.util.Map;
 
 /**
  * acts as a bridge from ajde's OutputLocationManager interface to the compiler internals
@@ -75,6 +76,8 @@ public interface CompilationResultDestinationManager {
         */
        void reportFileRemove(String outputfile, int filetype);
 
+       Map getInpathMap();
+
        int discoverChangesSince(File dir, long buildtime);
 
        // match numbers in IOutputLocationManager - ought to factor into super interface

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 f9ec2f6187e61c9659e61c613279160d4cccbf0e..a9eb731110344d3495c7689e47669ca52c43048d 100644 (file)
--- 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
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -756,7 +757,8 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
                // if (!AsmManager.isCreatingModel())
                // return;
 
-               AsmManager structureModel = AsmManager.createNewStructureModel();
+               CompilationResultDestinationManager crdm = config.getCompilationResultDestinationManager();
+               AsmManager structureModel = AsmManager.createNewStructureModel(crdm==null?Collections.EMPTY_MAP:crdm.getInpathMap());
                // AsmManager.getDefault().getRelationshipMap().clear();
                IHierarchy model = structureModel.getHierarchy();
                String rootLabel = "<root>";