271201: inpath handle: can determine if class is from inpath in add method now

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
index 92e91fdc362a15b699ecda4002c339eb23196abc..bef441f673ebd745317ae45d512155a2d9f394d8 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
@@ -289,7 +289,7 @@ public class AjCompilerAdapter extends AbstractCompilerAdapter {
                for (Iterator iter = resultsPendingWeave.iterator(); iter.hasNext();) {
                        InterimCompilationResult iresult = (InterimCompilationResult) iter.next();
                        for (int i = 0; i < iresult.unwovenClassFiles().length; i++) {
-                               weaver.addClassFile(iresult.unwovenClassFiles()[i]);
+                               weaver.addClassFile(iresult.unwovenClassFiles()[i],false);
                        }
                }
 

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
index c4617814d1270f8481c59e5be32775913888d5db..f6e95a90b59ce5a0b9d84a9f524f04025aa5918a 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
@@ -425,7 +425,7 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter {
                for (Iterator iter = resultsPendingWeave.iterator(); iter.hasNext();) {
                        InterimCompilationResult iresult = (InterimCompilationResult) iter.next();
                        for (int i = 0; i < iresult.unwovenClassFiles().length; i++) {
-                               weaver.addClassFile(iresult.unwovenClassFiles()[i]);
+                               weaver.addClassFile(iresult.unwovenClassFiles()[i],false);
                        }
                }
                ensureWeaverInitialized(); // by doing this only once, are we saying needToReweaveWorld can't change once the aspects have

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 9f763e26ab48e77560c1e20d67531dc7d167570b..f9ec2f6187e61c9659e61c613279160d4cccbf0e 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
@@ -898,12 +898,12 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
                return getBcelWorld();
        }
 
-       void addAspectClassFilesToWeaver(List addedClassFiles) throws IOException {
-               for (Iterator i = addedClassFiles.iterator(); i.hasNext();) {
-                       UnwovenClassFile classFile = (UnwovenClassFile) i.next();
-                       getWeaver().addClassFile(classFile);
-               }
-       }
+//     void addAspectClassFilesToWeaver(List addedClassFiles) throws IOException {
+//             for (Iterator i = addedClassFiles.iterator(); i.hasNext();) {
+//                     UnwovenClassFile classFile = (UnwovenClassFile) i.next();
+//                     getWeaver().addClassFile(classFile);
+//             }
+//     }
 
        public FileSystem getLibraryAccess(String[] classpaths, String[] filenames) {
                String defaultEncoding = buildConfig.getOptions().defaultEncoding;