diff options
author | aclement <aclement> | 2009-04-06 15:37:47 +0000 |
---|---|---|
committer | aclement <aclement> | 2009-04-06 15:37:47 +0000 |
commit | bf9773a0b7ee6cfa7b79bbff75ee1b25d50cc8e4 (patch) | |
tree | 62c0360adb1c595c6b804c1930eeff2921d74b28 /org.aspectj.ajdt.core | |
parent | daf9c9b62dd64bf1f3daf6b77e6ce06656befdbf (diff) | |
download | aspectj-bf9773a0b7ee6cfa7b79bbff75ee1b25d50cc8e4.tar.gz aspectj-bf9773a0b7ee6cfa7b79bbff75ee1b25d50cc8e4.zip |
271201: inpath handle: can determine if class is from inpath in add method now
Diffstat (limited to 'org.aspectj.ajdt.core')
3 files changed, 8 insertions, 8 deletions
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 92e91fdc3..bef441f67 100644 --- 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 c4617814d..f6e95a90b 100644 --- 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 9f763e26a..f9ec2f618 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 @@ -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; |