aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2019-01-29 12:57:37 -0800
committerAndy Clement <aclement@pivotal.io>2019-01-29 12:57:37 -0800
commitc17032a561dc4b7643c2d1ee667482c18093b6df (patch)
tree7c43eea31459b7829cfb1f59f53b77837246c312 /org.aspectj.ajdt.core
parent6fa7ee1a67699219bf91339582eff594f6bc67f3 (diff)
downloadaspectj-c17032a561dc4b7643c2d1ee667482c18093b6df.tar.gz
aspectj-c17032a561dc4b7643c2d1ee667482c18093b6df.zip
mavenizing org.aspectj.ajdt.core - wip
Diffstat (limited to 'org.aspectj.ajdt.core')
-rw-r--r--org.aspectj.ajdt.core/.classpath21
-rw-r--r--org.aspectj.ajdt.core/.cvsignore5
-rw-r--r--org.aspectj.ajdt.core/.isJava51
-rw-r--r--org.aspectj.ajdt.core/.project25
-rw-r--r--org.aspectj.ajdt.core/build.xml6
-rw-r--r--org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java24
-rw-r--r--org.aspectj.ajdt.core/pom.xml74
-rw-r--r--org.aspectj.ajdt.core/pr107313-SourceLocation.patch242
-rw-r--r--org.aspectj.ajdt.core/scripts/file_replace.py31
-rw-r--r--org.aspectj.ajdt.core/scripts/makedelegate.py28
-rw-r--r--org.aspectj.ajdt.core/scripts/makeparser.py125
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/AjdtCommand.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/ConfigParser.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/ConfigParser.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/AspectJCore.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTFactory.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTFactory.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjClassFile.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjClassFile.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompiler.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CommonPrinter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CommonPrinter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/Proceed.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IStateListener.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java (renamed from org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java)0
-rw-r--r--org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties)0
-rw-r--r--org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties (renamed from org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/AroundAMain.java (renamed from org.aspectj.ajdt.core/testsrc/AroundAMain.java)4
-rw-r--r--org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java24
-rw-r--r--org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java (renamed from org.aspectj.ajdt.core/testsrc/RunWeaveTests.java)62
-rw-r--r--org.aspectj.ajdt.core/src/test/java/WeaveTest.java (renamed from org.aspectj.ajdt.core/testsrc/WeaveTests.java)2
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java43
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/StreamPrintWriter.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/StreamPrintWriter.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java)2
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java)41
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/Constants.java (renamed from org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/Ajc5Tests.java)32
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java45
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java)20
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java)75
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java)37
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java)11
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java)6
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DeclareParentsTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java)2
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java148
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java)6
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTests.java)2
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java)10
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjStateTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjStateTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java38
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/OutjarTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTVisitorTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTVisitorTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTitdTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTitdTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjAST5Test.java (renamed from org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/AjAST5Test.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java)86
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java30
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCaseTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCaseTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java36
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/DelegatingOutputStream.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/DelegatingOutputStream.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/MainTest.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java)0
-rw-r--r--org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/TestMessageHolder.java (renamed from org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/TestMessageHolder.java)0
-rw-r--r--org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java43
-rw-r--r--org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java39
-rw-r--r--org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java45
-rw-r--r--org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java38
-rw-r--r--org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java36
229 files changed, 642 insertions, 903 deletions
diff --git a/org.aspectj.ajdt.core/.classpath b/org.aspectj.ajdt.core/.classpath
deleted file mode 100644
index 9dd83784d..000000000
--- a/org.aspectj.ajdt.core/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="java5-testsrc"/>
- <classpathentry kind="src" path="/bridge"/>
- <classpathentry kind="src" path="/weaver"/>
- <classpathentry kind="src" path="/asm"/>
- <classpathentry kind="src" path="/util"/>
- <classpathentry kind="src" path="/runtime"/>
- <classpathentry kind="src" path="testsrc"/>
- <classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/>
- <classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
- <classpathentry kind="src" path="/testing-util"/>
- <classpathentry kind="src" path="/testing-client"/>
- <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
- <classpathentry combineaccessrules="false" kind="src" path="/loadtime"/>
- <classpathentry kind="lib" path="/lib/bcel/bcel-verifier.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.aspectj.ajdt.core/.cvsignore b/org.aspectj.ajdt.core/.cvsignore
deleted file mode 100644
index 9c522ca46..000000000
--- a/org.aspectj.ajdt.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-out
-bin
-default.ajsym
-default.lst
-bintest
diff --git a/org.aspectj.ajdt.core/.isJava5 b/org.aspectj.ajdt.core/.isJava5
deleted file mode 100644
index 0519ecba6..000000000
--- a/org.aspectj.ajdt.core/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/org.aspectj.ajdt.core/.project b/org.aspectj.ajdt.core/.project
deleted file mode 100644
index 55bb13722..000000000
--- a/org.aspectj.ajdt.core/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.aspectj.ajdt.core</name>
- <comment></comment>
- <projects>
- <project>asm</project>
- <project>bridge</project>
- <project>org.eclipse.jdt.core</project>
- <project>runtime</project>
- <project>testing-client</project>
- <project>testing-util</project>
- <project>util</project>
- <project>weaver</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.aspectj.ajdt.core/build.xml b/org.aspectj.ajdt.core/build.xml
deleted file mode 100644
index 8765d7548..000000000
--- a/org.aspectj.ajdt.core/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="org.aspectj.ajdt.core" default="test" basedir=".">
- <import file="${basedir}/../build/build.xml"/>
-</project>
-
diff --git a/org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java b/org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java
deleted file mode 100644
index 9efd128cc..000000000
--- a/org.aspectj.ajdt.core/java5-testsrc/Eajc515ModuleTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Matthew Webster - initial implementation
- *******************************************************************************/
-import junit.framework.*;
-import junit.framework.Test;
-
-public class Eajc515ModuleTests extends TestCase {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(Eajc515ModuleTests.class.getName());
- suite.addTest(org.aspectj.tools.ajc.Ajc5Tests.suite());
- return suite;
- }
-
- public Eajc515ModuleTests(String name) { super(name); }
-
-}
diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml
new file mode 100644
index 000000000..47bd8c56c
--- /dev/null
+++ b/org.aspectj.ajdt.core/pom.xml
@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectj-parent</artifactId>
+ <version>1.9.3.BUILD-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>org.aspectj.ajdt.core</artifactId>
+ <packaging>jar</packaging>
+ <name>org.aspectj.ajdt.core</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>bridge</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>weaver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>asm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>runtime</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>bcel-builder</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>testing-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>testing-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>loadtime</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>org.aspectj.matcher</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/org.aspectj.ajdt.core/pr107313-SourceLocation.patch b/org.aspectj.ajdt.core/pr107313-SourceLocation.patch
deleted file mode 100644
index 8a5ef11f8..000000000
--- a/org.aspectj.ajdt.core/pr107313-SourceLocation.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-Index: .classpath
-===================================================================
-RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/.classpath,v
-retrieving revision 1.6
-diff -u -r1.6 .classpath
---- .classpath 3 May 2005 13:31:17 -0000 1.6
-+++ .classpath 2 Sep 2005 07:39:42 -0000
-@@ -13,5 +13,6 @@
- <classpathentry kind="src" path="/testing-util"/>
- <classpathentry kind="src" path="/testing-client"/>
- <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-+ <classpathentry combineaccessrules="false" kind="src" path="/aspectj5rt"/>
- <classpathentry kind="output" path="bin"/>
- </classpath>
-Index: .project
-===================================================================
-RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/.project,v
-retrieving revision 1.2
-diff -u -r1.2 .project
---- .project 13 Aug 2004 15:18:01 -0000 1.2
-+++ .project 2 Sep 2005 07:39:42 -0000
-@@ -4,6 +4,7 @@
- <comment></comment>
- <projects>
- <project>asm</project>
-+ <project>aspectj5rt</project>
- <project>bridge</project>
- <project>org.eclipse.jdt.core</project>
- <project>runtime</project>
-Index: src/org/aspectj/ajdt/ajc/BuildArgParser.java
-===================================================================
-RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java,v
-retrieving revision 1.40
-diff -u -r1.40 BuildArgParser.java
---- src/org/aspectj/ajdt/ajc/BuildArgParser.java 23 Aug 2005 08:47:32 -0000 1.40
-+++ src/org/aspectj/ajdt/ajc/BuildArgParser.java 2 Sep 2005 07:39:43 -0000
-@@ -171,6 +171,7 @@
- }
-
- buildConfig.setFiles(fileList);
-+ buildConfig.setUserFileNameMap(parser.getUserFileNameMap());
- if (destinationPath != null) { // XXX ?? unparsed but set?
- buildConfig.setOutputDir(new File(destinationPath));
- }
-Index: src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
-===================================================================
-RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java,v
-retrieving revision 1.28
-diff -u -r1.28 AjBuildConfig.java
---- src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java 23 Aug 2005 08:47:14 -0000 1.28
-+++ src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java 2 Sep 2005 07:39:43 -0000
-@@ -44,6 +44,7 @@
- private File outputJar;
- private List/*File*/ sourceRoots = new ArrayList();
- private List/*File*/ files = new ArrayList();
-+ private Map/*File -> File*/ userFileNameMap = new HashMap();
- private List /*File*/ binaryFiles = new ArrayList(); // .class files in indirs...
- private List/*File*/ inJars = new ArrayList();
- private List/*File*/ inPath = new ArrayList();
-@@ -117,6 +118,10 @@
- public List/*File*/ getFiles() {
- return files;
- }
-+
-+ public Map/* File -> File*/ getUserFileNameMap() {
-+ return userFileNameMap;
-+ }
-
- /**
- * returned files includes all .class files found in
-@@ -134,6 +139,10 @@
- public void setFiles(List files) {
- this.files = files;
- }
-+
-+ public void setUserFileNameMap(Map userFileNameMap) {
-+ this.userFileNameMap = userFileNameMap;
-+ }
-
- public void setOutputDir(File outputDir) {
- this.outputDir = outputDir;
-Index: src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
-===================================================================
-RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java,v
-retrieving revision 1.73
-diff -u -r1.73 AjBuildManager.java
---- src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java 23 Aug 2005 21:30:11 -0000 1.73
-+++ src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java 2 Sep 2005 07:39:45 -0000
-@@ -165,8 +165,11 @@
- if (!canIncremental && !batch) { // retry as batch?
- return doBuild(buildConfig, baseHandler, true);
- }
-+ IMessageHandler userTranslatingHandler =
-+ new UserFileLocationTranslatingHandler(baseHandler,buildConfig.getUserFileNameMap());
- this.handler =
-- CountingMessageHandler.makeCountingMessageHandler(baseHandler);
-+ CountingMessageHandler.makeCountingMessageHandler(userTranslatingHandler);
-+ ;
- // XXX duplicate, no? remove?
- String check = checkRtJar(buildConfig);
- if (check != null) {
-Index: testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
-===================================================================
-RCS file: /home/technology/org.aspectj/modules/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java,v
-retrieving revision 1.16
-diff -u -r1.16 AjBuildManagerTest.java
---- testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java 23 Jan 2004 19:07:52 -0000 1.16
-+++ testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java 2 Sep 2005 07:39:46 -0000
-@@ -89,6 +89,29 @@
- // ((StructureNode)StructureModelManager.INSTANCE.getStructureModel().getRoot().getChildren().get(0)).getChildren()
- // );
- }
-+
-+ public void testUserFileTranslationInErrorMessages() throws IOException {
-+ AjBuildManager manager = new AjBuildManager(messageWriter);
-+ BuildArgParser parser = new BuildArgParser(messageWriter);
-+ String javaClassPath = System.getProperty("java.class.path");
-+ AjBuildConfig buildConfig =
-+ parser.genBuildConfig(new String[] {
-+ "-d", "out",
-+ "-classpath",
-+ javaClassPath,
-+ AjdtAjcTests.TESTDATA_PATH
-+ + "/src1/DeclareWarning.java",
-+// EajcModuleTests.TESTDATA_PATH + "/src1/Hello.java",
-+ });
-+ String err = parser.getOtherMessages(true);
-+ assertTrue(err, null == err);
-+ manager.setStructureModel(AsmManager.getDefault().getHierarchy());
-+ MessageHandler handler = new MessageHandler();
-+ manager.batchBuild(buildConfig, handler);
-+ IMessage[] warnings = handler.getMessages(IMessage.WARNING, false);
-+ assertEquals("1 warning",1,warnings.length);
-+ assertTrue("source file mapped back to user location",warnings[0].getSourceLocation().getSourceFile().getPath().startsWith(".."));
-+ }
-
-
-
-Index: src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java
-===================================================================
-RCS file: src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java
-diff -N src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ src/org/aspectj/ajdt/internal/core/builder/UserFileLocationTranslatingHandler.java 1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,97 @@
-+/* *******************************************************************
-+ * Copyright (c) 2005 Contributors.
-+ * All rights reserved.
-+ * This program and the accompanying materials are made available
-+ * under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution and is available at
-+ * http://eclipse.org/legal/epl-v10.html
-+ *
-+ * Contributors:
-+ * Adrian Colyer Initial implementation
-+ * ******************************************************************/
-+package org.aspectj.ajdt.internal.core.builder;
-+
-+import java.io.File;
-+import java.util.ArrayList;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.Map;
-+
-+import org.aspectj.bridge.AbortException;
-+import org.aspectj.bridge.IMessage;
-+import org.aspectj.bridge.IMessageHandler;
-+import org.aspectj.bridge.ISourceLocation;
-+import org.aspectj.bridge.Message;
-+import org.aspectj.bridge.SourceLocation;
-+import org.aspectj.bridge.IMessage.Kind;
-+
-+/**
-+ * @author colyer
-+ *
-+ */
-+public class UserFileLocationTranslatingHandler implements IMessageHandler {
-+
-+ private IMessageHandler delegate;
-+ private Map userFileNameMap;
-+
-+ public UserFileLocationTranslatingHandler(IMessageHandler delegateHandler, Map canonicalFileToUserFile) {
-+ this.delegate = delegateHandler;
-+ this.userFileNameMap = canonicalFileToUserFile;
-+ }
-+
-+ /* (non-Javadoc)
-+ * @see org.aspectj.bridge.IMessageHandler#handleMessage(org.aspectj.bridge.IMessage)
-+ */
-+ public boolean handleMessage(IMessage message) throws AbortException {
-+ IMessage messageToIssue = message;
-+ ISourceLocation location = message.getSourceLocation();
-+ if (location != null) {
-+ File sourceFile = location.getSourceFile();
-+ if (userFileNameMap.containsKey(sourceFile)) {
-+ File userFile = (File) userFileNameMap.get(sourceFile);
-+ if (!sourceFile.getPath().equals(userFile.getPath())) {
-+ // path as known to user is different to the canonical path we have been
-+ // working with. Could be due to eg. symbolic links in filesystem etc.
-+ // this upsets clients such as AJDT
-+ messageToIssue = replaceLocationsIn(message);
-+ }
-+ }
-+ }
-+ return delegate.handleMessage(messageToIssue);
-+ }
-+
-+ /* (non-Javadoc)
-+ * @see org.aspectj.bridge.IMessageHandler#isIgnoring(org.aspectj.bridge.IMessage.Kind)
-+ */
-+ public boolean isIgnoring(Kind kind) {
-+ return delegate.isIgnoring(kind);
-+ }
-+
-+ /* (non-Javadoc)
-+ * @see org.aspectj.bridge.IMessageHandler#dontIgnore(org.aspectj.bridge.IMessage.Kind)
-+ */
-+ public void dontIgnore(Kind kind) {
-+ delegate.dontIgnore(kind);
-+ }
-+
-+ private IMessage replaceLocationsIn(IMessage message) {
-+ ISourceLocation newSourceLocation = replaceLocationIn(message.getSourceLocation());
-+ List extraLocations = message.getExtraSourceLocations();
-+ List newExtraLocations = new ArrayList();
-+ for (Iterator iter = extraLocations.iterator(); iter.hasNext();) {
-+ ISourceLocation loc = (ISourceLocation) iter.next();
-+ newExtraLocations.add(replaceLocationIn(loc));
-+ }
-+ Message copyWithUpdatedLocation = new Message(message,newSourceLocation,newExtraLocations);
-+ return copyWithUpdatedLocation;
-+ }
-+
-+ private ISourceLocation replaceLocationIn(ISourceLocation location) {
-+ File newSourceFile = location.getSourceFile();
-+ if (userFileNameMap.containsKey(newSourceFile)) {
-+ newSourceFile = (File) userFileNameMap.get(newSourceFile);
-+ }
-+ SourceLocation newSourceLocation = new SourceLocation(location,newSourceFile);
-+ return newSourceLocation;
-+ }
-+}
diff --git a/org.aspectj.ajdt.core/scripts/file_replace.py b/org.aspectj.ajdt.core/scripts/file_replace.py
deleted file mode 100644
index 60f3986ab..000000000
--- a/org.aspectj.ajdt.core/scripts/file_replace.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import os, string
-
-DIR = "c:\\eclipse\\workspace\\weaver"
-
-old_text = "declare dominates:"
-
-new_text = "declare precedence:"
-
-
-def doit(arg, dirname, filenames):
- for name in filenames:
- fullname = os.path.join(dirname, name)
- if os.path.isfile(fullname):
- do_replace(fullname)
-
-def do_replace(filename):
- if filename.endswith(".py"): return
-
- s = open(filename, 'r')
- text = s.read()
- s.close()
-
- if string.find(text, old_text) == -1:
- return
-
- s = open(filename, 'w')
- s.write(text.replace(old_text, new_text))
- s.close()
-
- print "changed", filename
-os.path.walk(DIR, doit, None)
diff --git a/org.aspectj.ajdt.core/scripts/makedelegate.py b/org.aspectj.ajdt.core/scripts/makedelegate.py
deleted file mode 100644
index 682a338f0..000000000
--- a/org.aspectj.ajdt.core/scripts/makedelegate.py
+++ /dev/null
@@ -1,28 +0,0 @@
-inputFile = "c:/eclipse/workspace/org.eclipse.jdt.core/aspectj/org/aspectj/workbench/resources/FileAdapter.java"
-
-text = open(inputFile, 'r').read()
-
-#print text
-
-import re, string
-
-methodPat = re.compile(r"public [^{]*\([^{]*{[^}]*}") #^[{]\)^[{]{", re.DOTALL) #{ .* }", re.DOTALL)
-
-throwException = """throw new RuntimeException("unimplemented");"""
-
-for method in methodPat.findall(text):
- print method
-
- newMethod = method[:len(method)-1]
-
- startBody = newMethod.find("{")
- newMethod = newMethod[:startBody+1]
-
-
- newMethod = newMethod + "\n\t" + throwException + "\n\t}"
- text = text.replace(method, newMethod)
-
-print text
-
-open(inputFile, 'w').write(text)
-
diff --git a/org.aspectj.ajdt.core/scripts/makeparser.py b/org.aspectj.ajdt.core/scripts/makeparser.py
deleted file mode 100644
index 4b878f99b..000000000
--- a/org.aspectj.ajdt.core/scripts/makeparser.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# set these first four variables appropriately for your system
-eclipseWorkspace = "c:/aspectj/2.1/eclipse/workspace"
-workingDir = "c:/apps/jikespg/jdt/tmp"
-
-jikespg = "c:/apps/jikespg/src/jikespg.exe"
-makersc = "c:/j2sdk1.4/bin/java -classpath c:/aspectj/2.1/eclipse/workspace/org.eclipse.jdt.core/bin;c:/apps/jikespg/jdt UpdateParserFiles"
-
-# the rest of this should never change
-ajCompilerHomeRel = "org.aspectj.ajdt.core/src/"
-javaCompilerHomeRel = "org.eclipse.jdt.core/compiler/"
-
-compilerHomeRel = ajCompilerHomeRel
-parserHomeRel = ajCompilerHomeRel + "org/aspectj/ajdt/internal/compiler/parser"
-parserInfoFileRel = javaCompilerHomeRel + "org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java"
-symbolsHomeRel = javaCompilerHomeRel + "org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java"
-# symbolsHomeRel = "org/aspectj/ajdt/compiler/IAjTerminalSymbols.java"
-parserClass = "AjParser.java"
-grammarFileRel = javaCompilerHomeRel + "../grammar/java_1_4.g"
-
-import os
-from os import path
-import re
-
-def readFile(name, mode=''):
- f = open(name, 'r'+mode)
- text = f.read()
- f.close()
- return text
-
-def writeFile(name, text, mode=''):
- f = open(name, 'w'+mode)
- f.write(text)
- f.close()
-
-compilerHome = path.join(eclipseWorkspace, compilerHomeRel)
-parserHome = path.join(eclipseWorkspace, parserHomeRel)
-symbolFile = path.join(eclipseWorkspace, symbolsHomeRel)
-parserInfoFile = path.join(eclipseWorkspace, parserInfoFileRel)
-
-parserFile = path.join(parserHome, parserClass)
-parserText = readFile(parserFile)
-
-if grammarFileRel == None:
- r = re.compile(r"public final static void grammar\(\){.*(--main.*\$end\n)-- need", re.DOTALL)
- match = r.search(parserText)
- grammar = match.group(1)
-else:
- grammar = readFile(path.join(eclipseWorkspace, grammarFileRel), 'b')
-#print grammar
-
-grammarFile = path.join(workingDir, "java.g")
-writeFile(grammarFile, grammar, 'b')
-os.chdir(workingDir)
-os.system("%s java.g" % jikespg)
-
-#3.1 Copy the contents of the JavaAction.java file into the consumeRule(int) method of the org.eclipse.jdt.internal.compiler.parser.Parser class.
-
-newConsumeRule = readFile(path.join(workingDir, "JavaAction.java"))
-#print newConsumeRule
-
-r = re.compile(r"(// This method is part of an automatic generation : do NOT edit-modify\W+protected void consumeRule\(int act\) {.*)protected void consumeSimpleAssertStatement\(\) {", re.DOTALL)
-
-match = r.search(parserText)
-parserText = parserText.replace(match.group(1), newConsumeRule)
-
-
-#3.2 The definition of the Parser needs to be updated with two tables from javadcl.java. Those are rhs[] and name[].
-
-newTables = readFile(path.join(workingDir, "javadcl.java"))
-r = re.compile(r"(public final static byte rhs\[\] = \{[^}]*\};)", re.DOTALL)
-rhsTable = r.search(newTables).group(0)
-
-parserText = parserText.replace(r.search(parserText).group(0), rhsTable)
-
-
-r = re.compile(r"(public final static String name\[\] = \{[^}]*\}[^}]*\};)", re.DOTALL)
-nameTable = r.search(newTables).group(0)
-nameTable = nameTable.replace("\"$eof\"", "UNEXPECTED_EOF")
-nameTable = nameTable.replace("$error", "Invalid Character")
-
-parserText = parserText.replace(r.search(parserText).group(0), nameTable)
-
-
-#we're done w/ Parser.java
-writeFile(parserFile, parserText)
-
-
-
-#3.3 The class org.eclipse.jdt.internal.compiler.parser.ParserBasicInformation needs to be updated with the content of the file javadef.java.
-
-defs = readFile(path.join(workingDir, "javadef.java"))
-r = re.compile(r"(public final static int[^;]*;)", re.DOTALL)
-syms = r.search(defs).group(0)
-#print syms
-
-text = readFile(parserInfoFile)
-text = text.replace(r.search(text).group(0), syms)
-
-writeFile(parserInfoFile, text)
-
-#3.4 This is the contents of the class org.eclipse.jdt.internal.compiler.parser.TerminalSymbols.
-
-defs = readFile(path.join(workingDir, "javasym.java"))
-r = re.compile(r"(int\s+TokenNameIdentifier[^;]*;)", re.DOTALL)
-syms = r.search(defs).group(0)
-syms = syms.replace("$eof", "EOF")
-syms = syms.replace("$error", "ERROR")
-
-print syms
-
-text = readFile(symbolFile)
-text = text.replace(r.search(text).group(0), syms)
-
-writeFile(symbolFile, text)
-
-#3.5 The last step is to update the resource files:
-
-os.chdir(workingDir)
-os.system("%s javadcl.java" % makersc)
-
-for i in range(1,6):
- name = "parser%d.rsc" % i
- print "moving", name
- t = readFile(path.join(workingDir, name), 'b')
- writeFile(path.join(parserHome, name), t, 'b')
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/AjdtCommand.java
index 27553cf7d..27553cf7d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/AjdtCommand.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/AjdtCommand.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
index 66488fa8c..66488fa8c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/ConfigParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/ConfigParser.java
index 1bbd3327b..1bbd3327b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/ConfigParser.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/ConfigParser.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java
index 2c6480e97..2c6480e97 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/compiler/IAjTerminalSymbols.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/AspectJCore.java
index 45a4c4b17..45a4c4b17 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/AspectJCore.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java
index 121e55f4f..121e55f4f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTConverterFactory.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTFactory.java
index 68084e7e4..68084e7e4 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjASTFactory.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjASTFactory.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java
index b2d1788dd..b2d1788dd 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/core/dom/AjTypeDeclFactory.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java
index 52b468278..52b468278 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AbstractCompilerAdapter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjClassFile.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjClassFile.java
index 1276bffae..1276bffae 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjClassFile.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjClassFile.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompiler.java
index b726e7e02..b726e7e02 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompiler.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompiler.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
index a23eb05f0..a23eb05f0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
index 77410281b..77410281b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java
index dcee93802..dcee93802 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ClassFileBasedByteCodeProvider.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CommonPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CommonPrinter.java
index cfdc9da0a..cfdc9da0a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CommonPrinter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CommonPrinter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
index c8b12db84..c8b12db84 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/CompilationResultDestinationManager.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java
index 7e087ae0b..7e087ae0b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/DeclareAnnotationsPrinter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java
index 98fedb197..98fedb197 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IBinarySourceProvider.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java
index 09f4a6b63..09f4a6b63 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IIntermediateResultsRequestor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java
index 84938d788..84938d788 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/IOutputClassFileNameProvider.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java
index 0a5ca697a..0a5ca697a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDConstructorPrinter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java
index cf1f5249f..cf1f5249f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDFieldPrinter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java
index 55b1eb725..55b1eb725 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ITDMethodPrinter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java
index 7236237a1..7236237a1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/InterimCompilationResult.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java
index ebb82372f..ebb82372f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
index 78238afe7..78238afe7 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java
index 5bf9946da..5bf9946da 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AccessForInlineVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java
index 79447f0ae..79447f0ae 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AddAtAspectJAnnotationsVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
index 8db8e6076..8db8e6076 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java
index 8e9c04d16..8e9c04d16 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjConstructorDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java
index f2a938c4e..f2a938c4e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AjMethodDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java
index 977c6efa6..977c6efa6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index e5201a3e9..e5201a3e9 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
index 369e84c51..369e84c51 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java
index 3a9d499f9..3a9d499f9 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AtAspectJAnnotationFactory.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java
index a2448f314..a2448f314 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareAnnotationDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java
index 71ebea209..71ebea209 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java
index a6539247a..a6539247a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseAttributeAdapter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java
index 87d32ed2f..87d32ed2f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/EclipseConstantPoolWriter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java
index 24e463fe3..24e463fe3 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfMethodDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
index 7d7842c6d..7d7842c6d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java
index 27aaf3050..27aaf3050 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperFixerVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java
index 1b78aeef0..1b78aeef0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterSuperReference.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
index fddcc3b90..fddcc3b90 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeConstructorDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java
index 89d2482c7..89d2482c7 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
index 3f8e99494..3f8e99494 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
index fc0d42154..fc0d42154 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java
index 6b079949d..6b079949d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java
index d0a61e248..d0a61e248 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownFieldReference.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java
index 20bbef57a..20bbef57a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/KnownMessageSend.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java
index f7fc86dac..f7fc86dac 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/MakeDeclsPublicVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java
index 087e87d6c..087e87d6c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
index d9e6094fa..d9e6094fa 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/Proceed.java
index bd8e4db35..bd8e4db35 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/Proceed.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/Proceed.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java
index d633ebba2..d633ebba2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ProceedVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java
index ac679ad1a..ac679ad1a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java
index 4777d0faf..4777d0faf 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java
index 96f0d3227..96f0d3227 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/SuperFixerVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java
index 994be09f3..994be09f3 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ThisJoinPointVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java
index 90ca34c45..90ca34c45 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index efd1a2ba2..efd1a2ba2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java
index 347a6431b..347a6431b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjTypeConstants.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java
index 47c56f939..47c56f939 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseAnnotationConvertor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index 062f04fd2..062f04fd2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java
index ecd4f3ddd..ecd4f3ddd 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
index 2b3467ea3..2b3467ea3 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java
index e4de168e0..e4de168e0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseShadow.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java
index b1c9c2108..b1c9c2108 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
index 349758e36..349758e36 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java
index 4fbdfa849..4fbdfa849 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseTypeMunger.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java
index a9c4bd532..a9c4bd532 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/HelperInterfaceBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java
index afdd460b0..afdd460b0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InlineAccessFieldBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java
index b47978f62..b47978f62 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeFieldBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java
index 8b4a917f8..8b4a917f8 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMemberFinder.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java
index 10e93ae00..10e93ae00 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeMethodBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java
index bcb2a4c97..bcb2a4c97 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/InterTypeScope.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java
index 5ba0229dc..5ba0229dc 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/IntertypeMemberTypeFinder.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java
index f8cda6ff5..f8cda6ff5 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PointcutBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java
index 5cd04f6d2..5cd04f6d2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedFieldBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
index c4c7e1f84..c4c7e1f84 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PrivilegedHandler.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java
index e3d228e0b..e3d228e0b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java
index b8fcfc3da..b8fcfc3da 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/SimpleSyntheticAccessMethodBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java
index 5cc6bd37c..5cc6bd37c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/parser/DeclarationFactory.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
index c80bbb5e9..c80bbb5e9 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java
index 6b1115b65..6b1115b65 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java
index ce61a4704..ce61a4704 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBatchImageBuilder.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 1b6343fef..1b6343fef 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 9c58c24a0..9c58c24a0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java
index 9cb2723b0..9cb2723b0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
index cdf534b54..cdf534b54 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java
index d31bc2d48..d31bc2d48 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjIncrementalImageBuilder.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java
index 30bc1165b..30bc1165b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
index 450ffc40b..450ffc40b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index 7da62b87c..7da62b87c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
index 586508bd7..586508bd7 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
index e48c6cd0f..e48c6cd0f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java
index 7e3ef5ecd..7e3ef5ecd 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/CompilerConfigurationChangeFlags.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java
index 7c92b223e..7c92b223e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseAdapterUtils.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java
index fa7e531c4..fa7e531c4 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java
index f92d37877..f92d37877 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseSourceContext.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java
index 668ac2e8a..668ac2e8a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IStateListener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java
index 97a2a2baf..97a2a2baf 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IStateListener.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java
index e255761b6..e255761b6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IncrementalStateManager.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java
index b3cb0e2d1..b3cb0e2d1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/StatefulNameEnvironment.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java
index 3b8b211c1..3b8b211c1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AbstractBooleanTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java
index 4691827f9..4691827f9 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AdviceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java
index eed69d89c..eed69d89c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterAdviceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java
index f78e2a2a8..f78e2a2a8 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterReturningAdviceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java
index 0d5142278..0d5142278 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AfterThrowingAdviceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java
index 99580a8a6..99580a8a6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjAST.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
index 6580a388c..6580a388c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java
index cfa078388..cfa078388 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTMatcher.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java
index 182ba2054..182ba2054 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTVisitor.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java
index 8e950cd42..8e950cd42 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjNaiveASTFlattener.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java
index dd3f296a6..dd3f296a6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjTypeDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java
index 1cb204007..1cb204007 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndPointcut.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java
index b2ccde08b..b2ccde08b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AndTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java
index 801de79df..801de79df 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java
index 5a6e04f79..5a6e04f79 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AnyWithAnnotationTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java
index 915ab1a52..915ab1a52 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AroundAdviceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java
index ff1a2d1ac..ff1a2d1ac 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AspectDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java
index 043dc9822..043dc9822 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BeforeAdviceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java
index bb6bc75d1..bb6bc75d1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/BindingTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java
index 65b22b25e..65b22b25e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/CflowPointcut.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java
index 9e20dd9df..9e20dd9df 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAnnotationDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java
index 2fb1f45d3..2fb1f45d3 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtConstructorDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java
index 5c4268437..5c4268437 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtFieldDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java
index 1fab22b6b..1fab22b6b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtMethodDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java
index bbc2200d5..bbc2200d5 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareAtTypeDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java
index 5eb602344..5eb602344 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java
index 886574048..886574048 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareErrorDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java
index 0961d4e8d..0961d4e8d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareParentsDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java
index a40c70f41..a40c70f41 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclarePrecedenceDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java
index 34c40f14e..34c40f14e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareSoftDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java
index dfaba4cb9..dfaba4cb9 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DeclareWarningDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java
index bb05896fb..bb05896fb 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultPointcut.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java
index b9ca939e1..b9ca939e1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/DefaultTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java
index 332fe1a60..332fe1a60 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/EllipsisTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java
index c43adff00..c43adff00 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ExactTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java
index f84c74ab7..f84c74ab7 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/FormalBinding.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java
index 8ba7c7d06..8ba7c7d06 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/HasMemberTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java
index f7ab856cf..f7ab856cf 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/IdentifierTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java
index 80859baf3..80859baf3 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeFieldDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java
index 9aa4ba978..9aa4ba978 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/InterTypeMethodDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java
index 7ae1bd471..7ae1bd471 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NoTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java
index fc0408ea7..fc0408ea7 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotPointcut.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java
index b9a0dc4cf..b9a0dc4cf 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/NotTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java
index 2fb1cee2c..2fb1cee2c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrPointcut.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java
index c7545d359..c7545d359 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/OrTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java
index d0590a00e..d0590a00e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PatternNode.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java
index 106a99c22..106a99c22 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerCflow.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java
index a288611fa..a288611fa 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerObject.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java
index 8b6d22c39..8b6d22c39 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PerTypeWithin.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java
index 15069516d..15069516d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDeclaration.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java
index 9a54578cc..9a54578cc 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/PointcutDesignator.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java
index 7ecd8b5c1..7ecd8b5c1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/ReferencePointcut.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java
index 77a875ac2..77a875ac2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/SignaturePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java
index 1b9c08d2e..1b9c08d2e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypeCategoryTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java
index a58782216..a58782216 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/TypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java
index 90f31246d..90f31246d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/WildTypePattern.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
index c8b111ec3..c8b111ec3 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/tools/ajc/Main.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
index d40571fb5..d40571fb5 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/ajc/messages.properties
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties
index ecc98bf1f..ecc98bf1f 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties
+++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/ajdt/internal/compiler/parser/readableNames.properties
diff --git a/org.aspectj.ajdt.core/testsrc/AroundAMain.java b/org.aspectj.ajdt.core/src/test/java/AroundAMain.java
index 0b304bf6a..94f2be84f 100644
--- a/org.aspectj.ajdt.core/testsrc/AroundAMain.java
+++ b/org.aspectj.ajdt.core/src/test/java/AroundAMain.java
@@ -15,10 +15,10 @@ import junit.framework.TestCase;
import org.aspectj.runtime.internal.AroundClosure;
import org.aspectj.util.Reflection;
-public class AroundAMain extends TestCase {
+public class AroundAMain {//extends TestCase {
public AroundAMain(String name) {
- super(name);
+// super(name);
}
diff --git a/org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java b/org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java
new file mode 100644
index 000000000..094ab29c2
--- /dev/null
+++ b/org.aspectj.ajdt.core/src/test/java/Eajc515ModuleTests.java
@@ -0,0 +1,24 @@
+///*******************************************************************************
+// * Copyright (c) 2006 IBM Corporation and others.
+// * All rights reserved. This program and the accompanying materials
+// * are made available under the terms of the Eclipse Public License v1.0
+// * which accompanies this distribution, and is available at
+// * http://www.eclipse.org/legal/epl-v10.html
+// *
+// * Contributors:
+// * Matthew Webster - initial implementation
+// *******************************************************************************/
+//import junit.framework.*;
+//import junit.framework.Test;
+//
+//public class Eajc515ModuleTests extends TestCase {
+//
+// public static Test suite() {
+// TestSuite suite = new TestSuite(Eajc515ModuleTests.class.getName());
+// suite.addTest(org.aspectj.tools.ajc.Ajc5Tests.suite());
+// return suite;
+// }
+//
+// public Eajc515ModuleTests(String name) { super(name); }
+//
+//}
diff --git a/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java b/org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java
index 3b483a3b2..e54ab44e2 100644
--- a/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java
+++ b/org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java
@@ -45,76 +45,76 @@ public class RunWeaveTests {
// Purely as a warm-up...
System.out.println("Warming up...");
- WeaveTests.main(split(WARMUP_ARGS + "-i " + ITERATIONS));
+ WeaveTest.main(split(WARMUP_ARGS + "-i " + ITERATIONS));
if (RUN_SMALL) {
- WeaveTests.main(
+ WeaveTest.main(
split(SMALL_PROGRAM_ARGS + "-echo -i " + ITERATIONS));
for (int i = 0; i < ITERATIONS; i++)
- times[0][i] = WeaveTests.compileTimes[i];
+ times[0][i] = WeaveTest.compileTimes[i];
for (int i = 0; i < ITERATIONS; i++)
- times[1][i] = WeaveTests.executionFastTimes[i];
+ times[1][i] = WeaveTest.executionFastTimes[i];
for (int i = 0; i < ITERATIONS; i++)
- times[2][i] = WeaveTests.executionMedTimes[i];
+ times[2][i] = WeaveTest.executionMedTimes[i];
for (int i = 0; i < ITERATIONS; i++)
- times[3][i] = WeaveTests.executionSlowTimes[i];
+ times[3][i] = WeaveTest.executionSlowTimes[i];
for (int i = 0; i < ITERATIONS; i++)
- times[4][i] = WeaveTests.getFastTimes[i];
+ times[4][i] = WeaveTest.getFastTimes[i];
for (int i = 0; i < ITERATIONS; i++)
- times[5][i] = WeaveTests.getMedTimes[i];
+ times[5][i] = WeaveTest.getMedTimes[i];
for (int i = 0; i < ITERATIONS; i++)
- times[6][i] = WeaveTests.getSlowTimes[i];
+ times[6][i] = WeaveTest.getSlowTimes[i];
}
if (RUN_MED) {
- WeaveTests.main(
+ WeaveTest.main(
split(MEDIUM_PROGRAM_ARGS + "-echo -i " + ITERATIONS));
for (int i = ITERATIONS; i < (2 * ITERATIONS); i++)
- times[0][i] = WeaveTests.compileTimes[i - ITERATIONS];
+ times[0][i] = WeaveTest.compileTimes[i - ITERATIONS];
for (int i = ITERATIONS; i < (2 * ITERATIONS); i++)
- times[1][i] = WeaveTests.executionFastTimes[i - ITERATIONS];
+ times[1][i] = WeaveTest.executionFastTimes[i - ITERATIONS];
for (int i = ITERATIONS; i < (2 * ITERATIONS); i++)
- times[2][i] = WeaveTests.executionMedTimes[i - ITERATIONS];
+ times[2][i] = WeaveTest.executionMedTimes[i - ITERATIONS];
for (int i = ITERATIONS; i < (2 * ITERATIONS); i++)
- times[3][i] = WeaveTests.executionSlowTimes[i - ITERATIONS];
+ times[3][i] = WeaveTest.executionSlowTimes[i - ITERATIONS];
for (int i = ITERATIONS; i < (2 * ITERATIONS); i++)
- times[4][i] = WeaveTests.getFastTimes[i - ITERATIONS];
+ times[4][i] = WeaveTest.getFastTimes[i - ITERATIONS];
for (int i = ITERATIONS; i < (2 * ITERATIONS); i++)
- times[5][i] = WeaveTests.getMedTimes[i - ITERATIONS];
+ times[5][i] = WeaveTest.getMedTimes[i - ITERATIONS];
for (int i = ITERATIONS; i < (2 * ITERATIONS); i++)
- times[6][i] = WeaveTests.getSlowTimes[i - ITERATIONS];
+ times[6][i] = WeaveTest.getSlowTimes[i - ITERATIONS];
}
if (RUN_LARGE) {
- WeaveTests.main(
+ WeaveTest.main(
split(LARGE_PROGRAM_ARGS + "-echo -i " + ITERATIONS));
for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++)
- times[0][i] = WeaveTests.compileTimes[i - (2 * ITERATIONS)];
+ times[0][i] = WeaveTest.compileTimes[i - (2 * ITERATIONS)];
for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++)
times[1][i] =
- WeaveTests.executionFastTimes[i - (2 * ITERATIONS)];
+ WeaveTest.executionFastTimes[i - (2 * ITERATIONS)];
for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++)
times[2][i] =
- WeaveTests.executionMedTimes[i - (2 * ITERATIONS)];
+ WeaveTest.executionMedTimes[i - (2 * ITERATIONS)];
for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++)
times[3][i] =
- WeaveTests.executionSlowTimes[i - (2 * ITERATIONS)];
+ WeaveTest.executionSlowTimes[i - (2 * ITERATIONS)];
for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++)
- times[4][i] = WeaveTests.getFastTimes[i - (2 * ITERATIONS)];
+ times[4][i] = WeaveTest.getFastTimes[i - (2 * ITERATIONS)];
for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++)
- times[5][i] = WeaveTests.getMedTimes[i - (2 * ITERATIONS)];
+ times[5][i] = WeaveTest.getMedTimes[i - (2 * ITERATIONS)];
for (int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++)
- times[6][i] = WeaveTests.getSlowTimes[i - (2 * ITERATIONS)];
+ times[6][i] = WeaveTest.getSlowTimes[i - (2 * ITERATIONS)];
}
@@ -186,37 +186,37 @@ public class RunWeaveTests {
csv.append(NL);
- csv.append(WeaveTests.EXECUTION_FAST);
+ csv.append(WeaveTest.EXECUTION_FAST);
if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[1][i]);
if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[1][i]);
if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[1][i]);
csv.append(NL);
- csv.append(WeaveTests.EXECUTION_MED);
+ csv.append(WeaveTest.EXECUTION_MED);
if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[2][i]);
if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[2][i]);
if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[2][i]);
csv.append(NL);
- csv.append(WeaveTests.EXECUTION_SLOW);
+ csv.append(WeaveTest.EXECUTION_SLOW);
if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[3][i]);
if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[3][i]);
if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[3][i]);
csv.append(NL);
- csv.append(WeaveTests.GET_FAST);
+ csv.append(WeaveTest.GET_FAST);
if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[4][i]);
if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[4][i]);
if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[4][i]);
csv.append(NL);
- csv.append(WeaveTests.GET_MED);
+ csv.append(WeaveTest.GET_MED);
if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[5][i]);
if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[5][i]);
if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[5][i]);
csv.append(NL);
- csv.append(WeaveTests.GET_SLOW);
+ csv.append(WeaveTest.GET_SLOW);
if(RUN_SMALL) for(int i = 0; i < ITERATIONS; i++) csv.append("," + times[6][i]);
if(RUN_MED) for(int i = ITERATIONS; i < (2 * ITERATIONS); i++) csv.append("," + times[6][i]);
if(RUN_LARGE) for(int i = (2 * ITERATIONS); i < (3 * ITERATIONS); i++) csv.append("," + times[6][i]);
diff --git a/org.aspectj.ajdt.core/testsrc/WeaveTests.java b/org.aspectj.ajdt.core/src/test/java/WeaveTest.java
index be3f328e1..1b858bb05 100644
--- a/org.aspectj.ajdt.core/testsrc/WeaveTests.java
+++ b/org.aspectj.ajdt.core/src/test/java/WeaveTest.java
@@ -19,7 +19,7 @@ import java.io.IOException;
/**
* @author Noel Markham
*/
-public class WeaveTests {
+public class WeaveTest {
private static final String OUTPUT_PACKAGE = "out";
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java
new file mode 100644
index 000000000..370d1f33f
--- /dev/null
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java
@@ -0,0 +1,43 @@
+//package org.aspectj.ajdt;
+///* *******************************************************************
+// * Copyright (c) 1999-2001 Xerox Corporation,
+// * 2002 Palo Alto Research Center, Incorporated (PARC).
+// * All rights reserved.
+// * This program and the accompanying materials are made available
+// * under the terms of the Eclipse Public License v1.0
+// * which accompanies this distribution and is available at
+// * http://www.eclipse.org/legal/epl-v10.html
+// *
+// * Contributors:
+// * PARC initial implementation
+// * ******************************************************************/
+//
+//
+//// default package
+//
+//
+//import org.aspectj.testing.util.TestUtil;
+//
+//import junit.framework.*;
+//
+//public class EajcModuleTests extends TestCase {
+//
+// public static Test suite() {
+// TestSuite suite = new TestSuite(EajcModuleTests.class.getName());
+// suite.addTest(org.aspectj.ajdt.ajc.AjdtAjcTests.suite());
+// suite.addTest(org.aspectj.ajdt.internal.compiler.batch.AjdtBatchTests.suite());
+// suite.addTest(org.aspectj.ajdt.internal.core.builder.AjdtBuilderTests.suite());
+// suite.addTest(org.aspectj.tools.ajc.AjcTests.suite());
+//
+// /* FIXME maw move these Java 5 dependent tests to a separate project */
+// if (TestUtil.is15VMOrGreater()) {
+// TestUtil.loadTestsReflectively(suite, "Eajc515ModuleTests", true);
+// } else {
+// suite.addTest(TestUtil.testNamed("Eajc515ModuleTests require 1.5"));
+// }
+// return suite;
+// }
+//
+// public EajcModuleTests(String name) { super(name); }
+//
+//}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/StreamPrintWriter.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/StreamPrintWriter.java
index 4ead0209b..4ead0209b 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/StreamPrintWriter.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/StreamPrintWriter.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java
index d42ed6355..9c504a300 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/AjdtCommandTestCase.java
@@ -125,7 +125,7 @@ public class AjdtCommandTestCase extends TestCase {
assertTrue("didn't specify source root", outputWriter.getContents().indexOf("specify a source root") != -1);
outputWriter.flushBuffer();
- AjdtCommand.genBuildConfig(new String[] { "-incremental", "-sourceroots", AjdtAjcTests.TESTDATA_PATH + "/src1" }, counter);
+ AjdtCommand.genBuildConfig(new String[] { "-incremental", "-sourceroots", Constants.TESTDATA_PATH + "/src1" }, counter);
assertTrue(outputWriter.getContents(), outputWriter.getContents().equals(""));
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java
index dc019010a..5bb86a18c 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java
@@ -40,7 +40,7 @@ import junit.framework.TestCase;
*/
public class BuildArgParserTestCase extends TestCase {
- private static final String TEST_DIR = AjdtAjcTests.TESTDATA_PATH + File.separator + "ajc" + File.separator;
+ private static final String TEST_DIR = Constants.TESTDATA_PATH + File.separator + "ajc" + File.separator;
private MessageWriter messageWriter = new MessageWriter(new PrintWriter(System.out), false);
public BuildArgParserTestCase(String name) {
@@ -151,8 +151,8 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testAspectpath() throws InvalidInputException {
- final String SOURCE_JAR = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar";
- final String SOURCE_JARS = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator
+ final String SOURCE_JAR = Constants.TESTDATA_PATH + "/testclasses.jar";
+ final String SOURCE_JARS = Constants.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator
+ "../weaver/testdata/tracing.jar" + File.pathSeparator
+ "../weaver/testdata/dummyAspect.jar";
AjBuildConfig config = genBuildConfig(new String[] {
@@ -168,8 +168,8 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testInJars() throws InvalidInputException {
- final String SOURCE_JAR = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar";
- final String SOURCE_JARS = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator
+ final String SOURCE_JAR = Constants.TESTDATA_PATH + "/testclasses.jar";
+ final String SOURCE_JARS = Constants.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator
+ "../weaver/testdata/tracing.jar" + File.pathSeparator
+ "../weaver/testdata/dummyAspect.jar";
AjBuildConfig config = genBuildConfig(new String[] {
@@ -188,7 +188,7 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testBadInJars() throws InvalidInputException {
- final String SOURCE_JARS = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + "b.far" + File.pathSeparator + "c.jar";
+ final String SOURCE_JARS = Constants.TESTDATA_PATH + "/testclasses.jar" + File.pathSeparator + "b.far" + File.pathSeparator + "c.jar";
AjBuildConfig config = genBuildConfig(new String[] {
"-injars", SOURCE_JARS },
messageWriter);
@@ -201,9 +201,10 @@ public class BuildArgParserTestCase extends TestCase {
assertTrue("Expected an error for the invalid path.",countingHandler.numMessages(IMessage.ERROR,false)==1);
}
+
public void testMultipleSourceRoots() throws InvalidInputException, IOException {
- final String SRCROOT_1 = AjdtAjcTests.TESTDATA_PATH + "/src1/p1";
- final String SRCROOT_2 = AjdtAjcTests.TESTDATA_PATH + "/ajc";
+ final String SRCROOT_1 = Constants.TESTDATA_PATH + "/src1/p1";
+ final String SRCROOT_2 = Constants.TESTDATA_PATH + "/ajc";
AjBuildConfig config = genBuildConfig(new String[] {
"-sourceroots", SRCROOT_1 + File.pathSeparator + SRCROOT_2 },
messageWriter);
@@ -240,7 +241,7 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testSourceRootDir() throws InvalidInputException, IOException {
- final String SRCROOT = AjdtAjcTests.TESTDATA_PATH + "/ajc";
+ final String SRCROOT = Constants.TESTDATA_PATH + "/ajc";
AjBuildConfig config = genBuildConfig(new String[] {
"-sourceroots", SRCROOT },
messageWriter);
@@ -263,8 +264,8 @@ public class BuildArgParserTestCase extends TestCase {
public void testBadSourceRootDir() throws InvalidInputException {
AjBuildConfig config = genBuildConfig(new String[] {
"-sourceroots",
- AjdtAjcTests.TESTDATA_PATH + "/mumbleDoesNotExist" + File.pathSeparator
- + AjdtAjcTests.TESTDATA_PATH + "/ajc" },
+ Constants.TESTDATA_PATH + "/mumbleDoesNotExist" + File.pathSeparator
+ + Constants.TESTDATA_PATH + "/ajc" },
messageWriter);
assertTrue(config.getSourceRoots().toString(), config.getSourceRoots().size() == 1);
@@ -279,16 +280,16 @@ public class BuildArgParserTestCase extends TestCase {
//??? we've decided not to make this an error
public void testSourceRootDirWithFiles() throws InvalidInputException, IOException {
- final String SRCROOT = AjdtAjcTests.TESTDATA_PATH + "/ajc/pkg";
+ final String SRCROOT = Constants.TESTDATA_PATH + "/ajc/pkg";
AjBuildConfig config = genBuildConfig(new String[] {
- "-sourceroots", SRCROOT, AjdtAjcTests.TESTDATA_PATH + "/src1/A.java"},
+ "-sourceroots", SRCROOT, Constants.TESTDATA_PATH + "/src1/A.java"},
messageWriter);
assertEquals(getCanonicalPath(new File(SRCROOT)), config.getSourceRoots().get(0).getAbsolutePath());
Collection expectedFiles = Arrays.asList(new File[] {
new File(SRCROOT+File.separator+"Hello.java").getCanonicalFile(),
- new File(AjdtAjcTests.TESTDATA_PATH +File.separator+"src1"+File.separator+"A.java").getCanonicalFile(),
+ new File(Constants.TESTDATA_PATH +File.separator+"src1"+File.separator+"A.java").getCanonicalFile(),
});
TestUtil.assertSetEquals(expectedFiles, config.getFiles());
@@ -296,7 +297,7 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testExtDirs() throws Exception {
- final String DIR = AjdtAjcTests.TESTDATA_PATH;
+ final String DIR = Constants.TESTDATA_PATH;
AjBuildConfig config = genBuildConfig(new String[] {
"-extdirs", DIR },
messageWriter);
@@ -320,7 +321,7 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testOutputJar() throws InvalidInputException {
- final String OUT_JAR = AjdtAjcTests.TESTDATA_PATH + "/testclasses.jar";
+ final String OUT_JAR = Constants.TESTDATA_PATH + "/testclasses.jar";
AjBuildConfig config = genBuildConfig(new String[] {
"-outjar", OUT_JAR },
@@ -333,7 +334,7 @@ public class BuildArgParserTestCase extends TestCase {
assertEquals(
getCanonicalPath(new File(OUT_JAR)),config.getOutputJar().getAbsolutePath());
- File nonExistingJar = new File(AjdtAjcTests.TESTDATA_PATH + "/mumbleDoesNotExist.jar");
+ File nonExistingJar = new File(Constants.TESTDATA_PATH + "/mumbleDoesNotExist.jar");
config = genBuildConfig(new String[] {
"-outjar", nonExistingJar.getAbsolutePath() },
messageWriter);
@@ -426,7 +427,7 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testXlintfile() throws InvalidInputException {
- String lintFile = AjdtAjcTests.TESTDATA_PATH + "/lintspec.properties";
+ String lintFile = Constants.TESTDATA_PATH + "/lintspec.properties";
// String badLintFile = "lint.props";
AjBuildConfig config = genBuildConfig(new String[] {"-Xlintfile", lintFile}, messageWriter);
assertTrue(new File(lintFile).exists());
@@ -564,14 +565,14 @@ public class BuildArgParserTestCase extends TestCase {
}
public void testNonstandardOutputDirectorySetting() throws InvalidInputException {
- String filePath = AjdtAjcTests.TESTDATA_PATH + File.separator + "ajc.jar" + File.separator;
+ String filePath = Constants.TESTDATA_PATH + File.separator + "ajc.jar" + File.separator;
File testDir = new File(filePath);
AjBuildConfig config = genBuildConfig(new String[] { "-d", filePath }, messageWriter);
assertEquals(testDir.getAbsolutePath(), config.getOutputDir().getAbsolutePath());
}
- private static final String NONSTANDARD_JAR_DIR = AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/folder.jar/";
+ private static final String NONSTANDARD_JAR_DIR = Constants.TESTDATA_PATH + "/OutjarTest/folder.jar/";
private AjBuildConfig setupNonstandardPath(String pathType) {
String NONSTANDARD_PATH_ENTRY = NONSTANDARD_JAR_DIR+"aspectjJar.file" + File.pathSeparator + NONSTANDARD_JAR_DIR+"aspectJar.file" + File.pathSeparator + NONSTANDARD_JAR_DIR+"jarChild" + File.pathSeparator + NONSTANDARD_JAR_DIR+"parent.zip";
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java
index 9ec3e201c..9ec3e201c 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/ConsoleMessageHandlerTestCase.java
diff --git a/org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/Ajc5Tests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/Constants.java
index 44bdc76eb..3093b84e1 100644
--- a/org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/Ajc5Tests.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/ajc/Constants.java
@@ -1,30 +1,28 @@
/* *******************************************************************
- * Copyright (c) 2005 Contributors.
+ * Copyright (c) 2019 Contributors
* All rights reserved.
* This program and the accompanying materials are made available
* under the terms of the Eclipse Public License v1.0
* which accompanies this distribution and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Matthew Webster initial implementation
+ * http://www.eclipse.org/legal/epl-v10.html
* ******************************************************************/
-package org.aspectj.tools.ajc;
+package org.aspectj.ajdt.ajc;
+import java.io.File;
import org.aspectj.testing.util.TestUtil;
+import junit.framework.*;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+/**
+ * @author Andy Clement
+ */
+public class Constants {
-public class Ajc5Tests extends TestCase {
+ public static final String TESTDATA_PATH = "../org.aspectj.ajdt.core/testdata";
+
+ public static final File TESTDATA_DIR = new File(TESTDATA_PATH);
+
public static String aspectjrtClasspath() {
return TestUtil.aspectjrtPath().getPath();
}
- public static Test suite() {
- TestSuite suite = new TestSuite(Ajc5Tests.class.getName());
- suite.addTestSuite(AjAST5Test.class);
- return suite;
- }
-
-}
+
+}
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java
new file mode 100644
index 000000000..7b1ee7163
--- /dev/null
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java
@@ -0,0 +1,45 @@
+///* *******************************************************************
+// * Copyright (c) 1999-2001 Xerox Corporation,
+// * 2002 Palo Alto Research Center, Incorporated (PARC).
+// * All rights reserved.
+// * This program and the accompanying materials are made available
+// * under the terms of the Eclipse Public License v1.0
+// * which accompanies this distribution and is available at
+// * http://www.eclipse.org/legal/epl-v10.html
+// *
+// * Contributors:
+// * PARC initial implementation
+// * ******************************************************************/
+//
+//
+//package org.aspectj.ajdt.internal.compiler.batch;
+//
+//import junit.framework.*;
+//
+//public class AjdtBatchTests extends TestCase {
+//
+// public static Test suite() {
+// TestSuite suite = new TestSuite(AjdtBatchTests.class.getName());
+// // Abstract superclass
+// //suite.addTestSuite(CommandTestCase.class);
+// //$JUnit-BEGIN$
+// suite.addTestSuite(BasicCommandTestCase.class);
+// suite.addTestSuite(BinaryFormsTestCase.class);
+// suite.addTestSuite(CompileAndRunTestCase.class);
+// suite.addTestSuite(PerformanceTestCase.class);
+// suite.addTestSuite(ImageTestCase.class);
+// suite.addTestSuite(MultipleCompileTestCase.class);
+// suite.addTestSuite(JavadocTest.class);
+// suite.addTestSuite(PartiallyExposedHierarchyTestCase.class);
+// suite.addTestSuite(CompilerDumpTestCase.class);
+// suite.addTestSuite(ProceedOnErrorTestCase.class);
+// suite.addTestSuite(DeclareParentsTest.class);
+// // XXX suite.addTestSuite(VerifyWeaveTestCase.class);
+// //suite.addTestSuite(WorkingCommandTestCase.class);
+// //$JUnit-END$
+// return suite;
+// }
+//
+// public AjdtBatchTests(String name) { super(name); }
+//
+//}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
index 62b1ef67e..99ea9b1d9 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
@@ -105,7 +105,7 @@ public class BasicCommandTestCase extends CommandTestCase {
classpath.append(File.pathSeparator).append("../lib/junit/junit.jar;../testing-client/bin");
args.add(classpath.toString());
args.add("-Xlint:error");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Xlint.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/Xlint.java");
runCompiler(args, new int[] {2});
}
@@ -117,7 +117,7 @@ public class BasicCommandTestCase extends CommandTestCase {
args.add("-classpath");
args.add(getRuntimeClasspath() + File.pathSeparator + "../lib/junit/junit.jar;../testing-client/bin;not_found_anywhere.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/ThisAndModifiers.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/ThisAndModifiers.java");
ICommand command = new AjdtCommand();
MessageHandler myHandler = new MessageHandler();
@@ -137,7 +137,7 @@ public class BasicCommandTestCase extends CommandTestCase {
args.add("-classpath");
args.add("../lib/junit/junit.jar;../testing-client/bin");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/ThisAndModifiers.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/ThisAndModifiers.java");
ICommand command = new AjdtCommand();
MessageHandler myHandler = new MessageHandler();
@@ -154,16 +154,16 @@ public class BasicCommandTestCase extends CommandTestCase {
args.add(getRuntimeClasspath() + File.pathSeparator +
"../lib/junit/junit.jar;../testing-client/bin");
- File f1 = new File(AjdtAjcTests.TESTDATA_PATH + "/src1/p1/Foo.class");
- File f2 = new File(AjdtAjcTests.TESTDATA_PATH + "/src1/WrongPackage.class");
- File f3 = new File(AjdtAjcTests.TESTDATA_PATH + "/src1/WrongPackage$1.class");
+ File f1 = new File(Constants.TESTDATA_PATH + "/src1/p1/Foo.class");
+ File f2 = new File(Constants.TESTDATA_PATH + "/src1/WrongPackage.class");
+ File f3 = new File(Constants.TESTDATA_PATH + "/src1/WrongPackage$1.class");
if (f1.exists()) f1.delete();
if (f2.exists()) f2.delete();
if (f3.exists()) f3.delete();
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/p1/Foo.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/WrongPackage.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/p1/Foo.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/WrongPackage.java");
runCompiler(args, NO_ERRORS);
@@ -190,8 +190,8 @@ public class BasicCommandTestCase extends CommandTestCase {
args.add(getRuntimeClasspath() + File.pathSeparator +
"../lib/junit/junit.jar;../testing-client/bin");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/SizeIssuesAspect.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/SizeIssues.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/SizeIssuesAspect.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/SizeIssues.java");
runCompiler(args, NO_ERRORS);
long size = f1.length();
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
index 361e74904..983ff62d5 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
@@ -17,8 +17,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.aspectj.ajdt.ajc.AjdtAjcTests;
-import org.aspectj.tools.ajc.AjcTests;
+import org.aspectj.ajdt.ajc.Constants;
+import org.aspectj.testing.util.TestUtil;
public class BcweaverJarMaker {
@@ -55,24 +55,25 @@ public class BcweaverJarMaker {
args.add("../weaver/testdata/tracing.jar");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Trace.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/MyTrace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/Trace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/MyTrace.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
+
public static void makeJar1() throws IOException {
List<String> args = new ArrayList<>();
args.add("-outjar");
args.add("../weaver/testdata/megatrace.jar");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ExecTrace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/ExecTrace.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
@@ -84,10 +85,10 @@ public class BcweaverJarMaker {
args.add("../weaver/testdata/megatrace0easy.jar");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ObviousTraceNothing.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/ObviousTraceNothing.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
@@ -98,10 +99,10 @@ public class BcweaverJarMaker {
args.add("../weaver/testdata/megatrace0hard.jar");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/HardTraceNothing.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/HardTraceNothing.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
@@ -115,10 +116,10 @@ public class BcweaverJarMaker {
args.add("-XterminateAfterCompilation");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/trace/ExecTrace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/MegaTrace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/trace/ExecTrace.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
@@ -130,9 +131,9 @@ public class BcweaverJarMaker {
args.add("../weaver/testdata/dummyAspect.jar");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/DummyAspect.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/DummyAspect.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
@@ -207,8 +208,8 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../weaver/testdata/ltw-classes.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWHelloWorld.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/ltw/LTWPackageTest.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWHelloWorld.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/ltw/LTWPackageTest.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -221,8 +222,8 @@ public class BcweaverJarMaker {
args.add("-XnotReweavable");
args.add("-outjar");
args.add("../weaver/testdata/ltw-woven.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWHelloWorld.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWAspect.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWHelloWorld.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWAspect.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -234,7 +235,7 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../weaver/testdata/ltw-aspects.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWAspect.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWAspect.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -246,7 +247,7 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../weaver/testdata/ltw-dwaspects.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWDeclareWarning.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWDeclareWarning.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -258,7 +259,7 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../weaver/testdata/ltw-deaspects.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWDeclareError.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWDeclareError.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -270,7 +271,7 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../weaver/testdata/ltw-acaspects.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWAroundClosure.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWAroundClosure.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -283,9 +284,9 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../weaver/testdata/ltw-itdaspects.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWInterfaceITD.aj");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWFieldITD.aj");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWMethodITD.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWInterfaceITD.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWFieldITD.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWMethodITD.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -297,7 +298,7 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../weaver/testdata/ltw-peraspects.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/LTWPerthis.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/LTWPerthis.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
@@ -343,7 +344,7 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../ajde/testdata/DuplicateManifestTest/injar.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Hello.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/Hello.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -355,8 +356,8 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("../ajde/testdata/DuplicateManifestTest/aspectjar.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/Trace.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/TraceHello.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/Trace.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/TraceHello.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
@@ -393,7 +394,7 @@ public class BcweaverJarMaker {
File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("./testdata/OutjarTest/parent.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/src/jar1/Parent.java");
+ args.add(Constants.TESTDATA_PATH + "/OutjarTest/src/jar1/Parent.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -406,7 +407,7 @@ public class BcweaverJarMaker {
+ File.pathSeparator + "./testdata/OutjarTest/parent.jar");
args.add("-outjar");
args.add("./testdata/OutjarTest/child.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/src/jar2/Child.java");
+ args.add(Constants.TESTDATA_PATH + "/OutjarTest/src/jar2/Child.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
@@ -418,7 +419,7 @@ public class BcweaverJarMaker {
+ File.pathSeparator + System.getProperty("aspectjrt.path"));
args.add("-outjar");
args.add("./testdata/OutjarTest/aspects.jar");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/OutjarTest/src/jar3/Aspect.aj");
+ args.add(Constants.TESTDATA_PATH + "/OutjarTest/src/jar3/Aspect.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
/*
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java
index c0cf6c515..cd514fe43 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java
@@ -17,9 +17,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.aspectj.ajdt.ajc.AjdtAjcTests;
+import org.aspectj.ajdt.ajc.Constants;
import org.aspectj.testing.util.TestUtil;
-import org.aspectj.tools.ajc.AjcTests;
public class BinaryFormsTestCase extends CommandTestCase {
@@ -37,14 +36,14 @@ public class BinaryFormsTestCase extends CommandTestCase {
args.add(library);
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
args.add("-d");
args.add(getSandboxName());
args.add("-XnotReweavable");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/lib/ConcreteA.aj");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/lib/AbstractA.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/lib/ConcreteA.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/lib/AbstractA.aj");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
@@ -53,14 +52,14 @@ public class BinaryFormsTestCase extends CommandTestCase {
args.add(library);
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
args.add("-d");
args.add(getSandboxName());
args.add("-XnotReweavable");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client.java");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
@@ -72,14 +71,14 @@ public class BinaryFormsTestCase extends CommandTestCase {
args.add(library);
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
args.add("-XnotReweavable");
args.add("-d");
args.add(getSandboxName());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
@@ -90,39 +89,39 @@ public class BinaryFormsTestCase extends CommandTestCase {
args.add(library);
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
args.add("-d");
args.add(getSandboxName());
args.add("-XnotReweavable");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/MyAspect1.aj");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/MyAspect1.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java");
CommandTestCase.runCompiler(args, new int[] {24, 30});
args = new ArrayList();
args.add("-classpath");
- args.add(library + File.pathSeparator + AjcTests.aspectjrtClasspath());
+ args.add(library + File.pathSeparator + Constants.aspectjrtClasspath());
args.add("-d");
args.add(getSandboxName());
args.add("-XnotReweavable");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java");
CommandTestCase.runCompiler(args, new int[] {15, 17, 22});
args = new ArrayList();
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath() + File.pathSeparator + library);
+ args.add(Constants.aspectjrtClasspath() + File.pathSeparator + library);
args.add("-Xlint:error");
args.add("-d");
args.add(getSandboxName());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj");
- args.add(AjdtAjcTests.TESTDATA_PATH + "/src1/binary/client/Client1.java");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/MyAspect.aj");
+ args.add(Constants.TESTDATA_PATH + "/src1/binary/client/Client1.java");
CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS);
}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java
index 23e589080..8331eb3f4 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CommandTestCase.java
@@ -21,8 +21,8 @@ import java.util.List;
import junit.framework.TestCase;
-import org.aspectj.ajdt.ajc.AjdtAjcTests;
import org.aspectj.ajdt.ajc.AjdtCommand;
+import org.aspectj.ajdt.ajc.Constants;
import org.aspectj.bridge.ICommand;
import org.aspectj.bridge.IMessage;
import org.aspectj.bridge.IMessageHandler;
@@ -30,7 +30,6 @@ import org.aspectj.bridge.IMessageHolder;
import org.aspectj.bridge.MessageHandler;
import org.aspectj.testing.util.TestUtil;
import org.aspectj.tools.ajc.Ajc;
-import org.aspectj.tools.ajc.AjcTests;
import org.aspectj.util.LangUtil;
import org.aspectj.weaver.bcel.LazyClassGen;
@@ -79,7 +78,7 @@ public abstract class CommandTestCase extends TestCase {
args.add(extraArgs[i]);
}
- args.add(AjdtAjcTests.TESTDATA_PATH + "/" + source);
+ args.add(Constants.TESTDATA_PATH + "/" + source);
runCompiler(args, expectedErrors);
}
@@ -97,7 +96,7 @@ public abstract class CommandTestCase extends TestCase {
args.add("-classpath");
args.add(getRuntimeClasspath());
- args.add(AjdtAjcTests.TESTDATA_PATH + "/" + source);
+ args.add(Constants.TESTDATA_PATH + "/" + source);
ICommand compiler = runCompiler(args, NO_ERRORS);
Thread.sleep(100);
@@ -153,7 +152,7 @@ public abstract class CommandTestCase extends TestCase {
}
public static void printGenerated(String path, String name) throws IOException {
- String fullpath = AjdtAjcTests.TESTDATA_PATH + "/" + path;
+ String fullpath = Constants.TESTDATA_PATH + "/" + path;
LazyClassGen.disassemble(fullpath, name, System.out);
}
@@ -180,7 +179,7 @@ public abstract class CommandTestCase extends TestCase {
if (LangUtil.is19VMOrGreater()) {
classpath.append(LangUtil.getJrtFsFilePath()).append(File.pathSeparator);
}
- classpath.append(AjcTests.aspectjrtClasspath());
+ classpath.append(Constants.aspectjrtClasspath());
return classpath.toString();
}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java
index 4d1d6db26..4d1d6db26 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompileAndRunTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java
index 9851cda08..7aa3749c2 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java
@@ -56,7 +56,7 @@ public class CompilerDumpTestCase extends AjcTestCase {
assertNoMessages(result);
String fileName = Dump.dump("DumpTestCase.testDump()");
dumpFile = new File(fileName);
- org.aspectj.weaver.DumpTestCase.assertContents(dumpFile, "Command Line", "HelloWorld.java");
+ DumpTestCase.assertContents(dumpFile, "Command Line", "HelloWorld.java");
}
/**
@@ -73,7 +73,7 @@ public class CompilerDumpTestCase extends AjcTestCase {
ajc(baseDir, args);
String fileName = Dump.dump("DumpTestCase.testDumpWithWarnings()");
dumpFile = new File(fileName);
- org.aspectj.weaver.DumpTestCase.assertContents(dumpFile, "Compiler Messages", "warning");
+ DumpTestCase.assertContents(dumpFile, "Compiler Messages", "warning");
}
/**
@@ -92,7 +92,7 @@ public class CompilerDumpTestCase extends AjcTestCase {
String fileName = Dump.getLastDumpFileName();
assertTrue("Dump file should be created", !fileName.equals(previousFileName));
dumpFile = new File(fileName);
- org.aspectj.weaver.DumpTestCase.assertContents(dumpFile, "Compiler Messages", "error");
+ DumpTestCase.assertContents(dumpFile, "Compiler Messages", "error");
}
}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DeclareParentsTest.java
index c0d796753..7ca59d741 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DeclareParentsTest.java
@@ -38,7 +38,7 @@ import org.aspectj.tools.ajc.CompilationResult;
*
* Covariance on method overrides is supported but untested because we need a Java5 compiler (so we can write easy tests)
*/
-public class DeclareParents extends AjcTestCase {
+public class DeclareParentsTest extends AjcTestCase {
private static final boolean verbose = false;
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java
new file mode 100644
index 000000000..dad021a7c
--- /dev/null
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/DumpTestCase.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Matthew Webster
+ *******************************************************************************/
+package org.aspectj.ajdt.internal.compiler.batch;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.IMessageHolder;
+import org.aspectj.bridge.Message;
+import org.aspectj.bridge.MessageHandler;
+import org.aspectj.weaver.Dump;
+
+/**
+ * @author websterm
+ *
+ * Test Dump facility. Ensure it can be configured and files contain expected contents. Testcase
+ * returns Dump configuration to orginal state.
+ */
+public class DumpTestCase extends TestCase {
+
+ private File dumpFile;
+ private IMessage.Kind savedDumpCondition;
+
+ public DumpTestCase(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ dumpFile = null;
+ savedDumpCondition = Dump.getDumpOnExit();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+
+ if (dumpFile != null && dumpFile.exists()) {
+ boolean deleted = dumpFile.delete();
+ assertTrue("Dump file '" + dumpFile.getPath() + "' could not be deleted",deleted);
+ }
+ Dump.setDumpOnExit(savedDumpCondition);
+ }
+
+ public void testSetDumpOnException () {
+ Dump.setDumpOnException(true);
+ assertTrue("DumpOnException should be true",Dump.getDumpOnException());
+ }
+
+ public void testSetDumpOnExit () {
+ assertTrue("Should be able to set condition 'error'",Dump.setDumpOnExit("error"));
+ assertTrue("Should be able to set condition 'warning'",Dump.setDumpOnExit("warning"));
+ assertFalse("Should not be able to set condition 'junk'",Dump.setDumpOnExit("junk"));
+ }
+
+ public void testDump () {
+ String fileName = Dump.dump("testDump()");
+ dumpFile = new File(fileName);
+ assertTrue("Dump file '" + fileName + "' should exist",dumpFile.exists());
+ }
+
+ public void testDumpWithException () {
+ String message = "testDumpWithException()";
+ String fileName = recursiveCall(message,100);
+ dumpFile = new File(fileName);
+ assertContents(dumpFile,"Exception Information",message);
+ }
+
+ public void testDumpOnExit () {
+ Dump.setDumpOnExit("abort");
+ Dump.saveMessageHolder(null);
+ String fileName = Dump.dumpOnExit();
+ dumpFile = new File(fileName);
+ assertTrue("Dump file '" + fileName + "' should exist",dumpFile.exists());
+ }
+
+ public void testDumpOnExitExcluded () {
+ Dump.setDumpOnExit("abort");
+ IMessageHolder holder = new MessageHandler();
+ Dump.saveMessageHolder(holder);
+ holder.handleMessage(new Message("testDumpOnExitExcluded()",IMessage.ERROR,null,null));
+ String fileName = Dump.dumpOnExit();
+ dumpFile = new File(fileName);
+ assertEquals("Dump '" + fileName + "' should be excluded",Dump.DUMP_EXCLUDED,fileName);
+ }
+
+ public void testDumpOnExitIncluded () {
+ Dump.setDumpOnExit("error");
+ IMessageHolder holder = new MessageHandler();
+ Dump.saveMessageHolder(holder);
+ IMessage error = new Message("testDumpOnExitIncluded()",IMessage.ERROR,null,null);
+ holder.handleMessage(error);
+ String fileName = Dump.dumpOnExit();
+ dumpFile = new File(fileName);
+ assertContents(dumpFile,"Compiler Messages",error.getMessage());
+ }
+
+ /* Ensure dump file exists and contains certain contents under a given heading */
+ public static void assertContents (File dumpFile, String heading, String contents) {
+ assertTrue("Dump file '" + dumpFile.getPath() + "' should exist",dumpFile.exists());
+ assertTrue("Dump file '" + dumpFile.getPath()+ "' should contain '" + contents + "'",fileContains(dumpFile,heading,contents));
+ }
+
+ private static boolean fileContains (File dumpFile, String heading, String contents) {
+ boolean result = false;
+
+ try {
+ BufferedReader reader = new BufferedReader(new FileReader(dumpFile));
+ String currentHeading = "";
+ String record;
+ while ((null != (record = reader.readLine())) && (result == false)) {
+ if (record.startsWith("----")) currentHeading = record;
+ else if ((record.indexOf(contents) != -1) && currentHeading.indexOf(heading) != -1) result = true;
+ }
+ reader.close();
+ }
+ catch (IOException ex) {
+ fail(ex.toString());
+ }
+
+ return result;
+ }
+
+ /* Generate a big stack trace */
+ private String recursiveCall (String message, int depth) {
+ if (depth == 0) {
+ Throwable th = new RuntimeException(message);
+ return Dump.dumpWithException(th);
+ }
+ else {
+ return recursiveCall(message,--depth);
+ }
+ }
+
+}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java
index 73043b064..73043b064 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ImageTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java
index 36fe2e92c..36fe2e92c 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
index a9ee51fe9..a9ee51fe9 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java
index 7b3e31015..7b3e31015 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/MultipleCompileTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java
index 994cce516..994cce516 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
index 2d678e140..2d678e140 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java
index 70d42bf4a..70d42bf4a 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/ProceedOnErrorTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java
index dbf205d6d..dbf205d6d 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/VerifyWeaveTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
index 3e834a083..307232643 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/WorkingTestMain.java
@@ -16,8 +16,8 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
+import org.aspectj.ajdt.ajc.Constants;
import org.aspectj.testing.util.TestUtil;
-import org.aspectj.tools.ajc.AjcTests;
public class WorkingTestMain {
@@ -41,7 +41,7 @@ public class WorkingTestMain {
args.add("out");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath() + File.pathSeparator
+ args.add(Constants.aspectjrtClasspath() + File.pathSeparator
+ "../testing-client/bin");
//args.add("../runtime/bin;../lib/junit/junit.jar");
@@ -78,7 +78,7 @@ public class WorkingTestMain {
args.add("out");
args.add("-classpath");
- args.add(AjcTests.aspectjrtClasspath());
+ args.add(Constants.aspectjrtClasspath());
for (int i=0; i < argfiles.length; i++) {
args.add("@" + examplesDir + argfiles[i]);
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTest.java
index 5283d79cc..880d58f86 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTests.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfigTest.java
@@ -30,7 +30,7 @@ import junit.framework.TestCase;
/**
* @author Andy Clement
*/
-public class AjBuildConfigTests extends TestCase {
+public class AjBuildConfigTest extends TestCase {
@Override
public void setUp() throws Exception {
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
index fc841c5a8..d8d1621de 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
@@ -17,8 +17,8 @@ import java.io.IOException;
import java.io.PrintWriter;
import org.aspectj.ajdt.StreamPrintWriter;
-import org.aspectj.ajdt.ajc.AjdtAjcTests;
import org.aspectj.ajdt.ajc.BuildArgParser;
+import org.aspectj.ajdt.ajc.Constants;
import org.aspectj.bridge.IMessage;
import org.aspectj.bridge.MessageHandler;
import org.aspectj.bridge.MessageWriter;
@@ -31,9 +31,9 @@ public class AjBuildManagerTest extends TestCase {
private final StreamPrintWriter outputWriter = new StreamPrintWriter(new PrintWriter(System.out));
private final MessageWriter messageWriter = new MessageWriter(outputWriter, false);
- public static File source1 = new File(AjdtAjcTests.TESTDATA_DIR, "src1/A.java");
- public static File source2 = new File(AjdtAjcTests.TESTDATA_DIR, "src1/Hello.java");
- public static File source3 = new File(AjdtAjcTests.TESTDATA_DIR, "src1/X.java");
+ public static File source1 = new File(Constants.TESTDATA_DIR, "src1/A.java");
+ public static File source2 = new File(Constants.TESTDATA_DIR, "src1/Hello.java");
+ public static File source3 = new File(Constants.TESTDATA_DIR, "src1/X.java");
/**
* @throws AssertionFailedError unless handler has 0 messages worse than warning, or the one message is a warning about
@@ -63,7 +63,7 @@ public class AjBuildManagerTest extends TestCase {
System.out.println(javaClassPath);
String sandboxName = Ajc.createEmptySandbox().getAbsolutePath();
AjBuildConfig buildConfig = parser.genBuildConfig(new String[] { "-d", sandboxName, "-1.4", "-classpath", javaClassPath,
- AjdtAjcTests.TESTDATA_PATH + "/src1/A.java",
+ Constants.TESTDATA_PATH + "/src1/A.java",
// EajcModuleTests.TESTDATA_PATH + "/src1/Hello.java",
});
String err = parser.getOtherMessages(true);
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java
index 21050fc95..21050fc95 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjStateTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjStateTest.java
index 101fdade1..101fdade1 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjStateTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjStateTest.java
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java
new file mode 100644
index 000000000..14eb7a0db
--- /dev/null
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java
@@ -0,0 +1,38 @@
+///* *******************************************************************
+// * Copyright (c) 1999-2001 Xerox Corporation,
+// * 2002 Palo Alto Research Center, Incorporated (PARC).
+// * All rights reserved.
+// * This program and the accompanying materials are made available
+// * under the terms of the Eclipse Public License v1.0
+// * which accompanies this distribution and is available at
+// * http://www.eclipse.org/legal/epl-v10.html
+// *
+// * Contributors:
+// * PARC initial implementation
+// * ******************************************************************/
+//
+//
+//package org.aspectj.ajdt.internal.core.builder;
+//
+//import junit.framework.Test;
+//import junit.framework.TestCase;
+//import junit.framework.TestSuite;
+//
+//public class AjdtBuilderTests extends TestCase {
+//
+// public static Test suite() {
+// TestSuite suite = new TestSuite(AjdtBuilderTests.class.getName());
+// //$JUnit-BEGIN$
+// suite.addTestSuite(AjBuildManagerTest.class);
+// suite.addTestSuite(AjBuildConfigTest.class);
+// suite.addTestSuite(AsmBuilderTest.class);
+// suite.addTestSuite(AjCompilerOptionsTest.class);
+// suite.addTestSuite(AjStateTest.class);
+// suite.addTestSuite(OutjarTest.class);
+// //$JUnit-END$
+// return suite;
+// }
+//
+// public AjdtBuilderTests(String name) { super(name); }
+//
+//}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
index dc40100bc..dc40100bc 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/OutjarTest.java
index 32e8fd329..32e8fd329 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/core/builder/OutjarTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTVisitorTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTVisitorTest.java
index e63ecf15e..e63ecf15e 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTVisitorTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTVisitorTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTitdTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTitdTest.java
index 2c18f05dd..2c18f05dd 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/ASTitdTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/ASTitdTest.java
diff --git a/org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/AjAST5Test.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjAST5Test.java
index 213cf0e2c..213cf0e2c 100644
--- a/org.aspectj.ajdt.core/java5-testsrc/org/aspectj/tools/ajc/AjAST5Test.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjAST5Test.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTest.java
index ced2ecd8f..ced2ecd8f 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTestCase.java
index 94d57c862..94d57c862 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjASTTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjASTTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java
index b08b8604f..b08b8604f 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjNaiveASTFlattenerTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc.java
index eeb6136a5..f43875541 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc.java
@@ -51,47 +51,59 @@ public class Ajc {
private static final String SANDBOX_NAME = "ajcSandbox";
+ private static final String BUILD_OUTPUT_FOLDER = "target";
+
+ public static final String outputFolder(String module) {
+ return File.pathSeparator + ".." +File.separator + module + File.separator + "target" + File.separator + "classes";
+ }
+
// ALSO SEE ANTSPEC AND AJCTESTCASE
- private static final String TESTER_PATH = ".." + File.separator + "testing-client" + File.separator + "bin"
- + File.pathSeparator + ".." + File.separator + "runtime" + File.separator + "bin" + File.pathSeparator + ".."
- + File.separator + "aspectj5rt" + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "lib"
- + File.separator + "junit" + File.separator + "junit.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel"
- + File.separator + "bcel.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator
- + "bcel-verifier.jar" +
-
- File.pathSeparator + ".." + File.separator + "bridge" + File.separator + "bin" + File.pathSeparator + ".."
- + File.separator + "loadtime" + File.separator + "bin" + File.pathSeparator
- + ".."
- + File.separator
- + "weaver"
- + File.separator
- + "bin"
- + File.pathSeparator
- + ".."
- + File.separator
- + "weaver5"
- + File.separator
- + "bin"
- + File.pathSeparator
- + ".."
- + File.separator
- + "org.aspectj.matcher"
- + File.separator
- + "bin"
+ private static final String TESTER_PATH = outputFolder("testing-client") + outputFolder("runtime") + outputFolder("bcel-builder")
+// + File.pathSeparator + ".." + File.separator + "runtime" + File.separator + BUILD_OUTPUT_FOLDER //
+// + File.pathSeparator + ".." + File.separator + "aspectj5rt" + File.separator + BUILD_OUTPUT_FOLDER //
+ + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "junit" + File.separator + "junit.jar" //
+// + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator + "bcel.jar" //
+// + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "bcel" + File.separator
+// + "bcel-verifier.jar" +
+
+ + outputFolder("bridge")
+ + outputFolder("loadtime")
+ + outputFolder("weaver")
+ + outputFolder("org.aspectj.matcher")
+ + outputFolder("bridge");
+// File.pathSeparator + ".." + File.separator + "bridge" + File.separator + "bin" + File.pathSeparator + ".."
+// + File.separator + "loadtime" + File.separator + "bin" + File.pathSeparator
+// + ".."
+// + File.separator
+// + "weaver"
+// + File.separator
+// + "bin"
+// + File.pathSeparator
+// + ".."
+// + File.separator
+// + "weaver5"
+// + File.separator
+// + "bin"
+// + File.pathSeparator
+// + ".."
+// + File.separator
+// + "org.aspectj.matcher"
+// + File.separator
+// + "bin"
// When the build machine executes the tests, it is using code built into jars rather than code build into
// bin directories. This means for the necessary types to be found we have to put these jars on the classpath:
- + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "bridge.jar"
- + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator
- + "org.aspectj.matcher.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
- + File.separator + "util.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
- + File.separator + "loadtime.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
- + File.separator + "weaver.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
- + File.separator + "weaver5.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
- + File.separator + "asm.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test"
- + File.separator + "testing-client.jar"
- // hmmm, this next one should perhaps point to an aj-build jar...
- + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar";
+// + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator + "bridge.jar"
+// + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars" + File.separator
+// + "org.aspectj.matcher.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+// + File.separator + "util.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+// + File.separator + "loadtime.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+// + File.separator + "weaver.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+// + File.separator + "weaver5.jar" + File.pathSeparator + ".." + File.separator + "aj-build" + File.separator + "jars"
+// + File.separator + "asm.jar" + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test"
+// + File.separator + "testing-client.jar"
+// // hmmm, this next one should perhaps point to an aj-build jar...
+// + File.pathSeparator + ".." + File.separator + "lib" + File.separator + "test" + File.separator + "aspectjrt.jar";
private CompilationResult result;
private File sandbox;
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java
new file mode 100644
index 000000000..f4426d3ff
--- /dev/null
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/Ajc5Tests.java
@@ -0,0 +1,30 @@
+///* *******************************************************************
+// * Copyright (c) 2005 Contributors.
+// * All rights reserved.
+// * This program and the accompanying materials are made available
+// * under the terms of the Eclipse Public License v1.0
+// * which accompanies this distribution and is available at
+// * http://eclipse.org/legal/epl-v10.html
+// *
+// * Contributors:
+// * Matthew Webster initial implementation
+// * ******************************************************************/
+//package org.aspectj.tools.ajc;
+//
+//import org.aspectj.testing.util.TestUtil;
+//
+//import junit.framework.Test;
+//import junit.framework.TestCase;
+//import junit.framework.TestSuite;
+//
+//public class Ajc5Tests extends TestCase {
+// public static String aspectjrtClasspath() {
+// return TestUtil.aspectjrtPath().getPath();
+// }
+// public static Test suite() {
+// TestSuite suite = new TestSuite(Ajc5Tests.class.getName());
+// suite.addTestSuite(AjAST5Test.class);
+// return suite;
+// }
+//
+//}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
index 24214cf17..24214cf17 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCaseTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCaseTest.java
index a3d349eb4..a3d349eb4 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCaseTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCaseTest.java
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java
new file mode 100644
index 000000000..decf3ad99
--- /dev/null
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTests.java
@@ -0,0 +1,36 @@
+///* *******************************************************************
+// * Copyright (c) 2005 Contributors.
+// * All rights reserved.
+// * This program and the accompanying materials are made available
+// * under the terms of the Eclipse Public License v1.0
+// * which accompanies this distribution and is available at
+// * http://eclipse.org/legal/epl-v10.html
+// *
+// * Contributors:
+// * Wes Isberg initial implementation
+// * ******************************************************************/
+//
+//
+//package org.aspectj.tools.ajc;
+//
+//import org.aspectj.testing.util.TestUtil;
+//
+//import junit.framework.Test;
+//import junit.framework.TestCase;
+//import junit.framework.TestSuite;
+//
+//public class AjcTests extends TestCase {
+// public static String aspectjrtClasspath() {
+// return TestUtil.aspectjrtPath().getPath();
+// }
+// public static Test suite() {
+// TestSuite suite = new TestSuite(AjcTests.class.getName());
+// suite.addTestSuite(org.aspectj.tools.ajc.MainTest.class);
+// suite.addTestSuite(ASTVisitorTest.class);
+// suite.addTestSuite(ASTitdTest.class);
+// suite.addTestSuite(AjASTTest.class);
+// suite.addTestSuite(AjNaiveASTFlattenerTest.class);
+// return suite;
+// }
+//
+//}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java
index 1265e4502..1265e4502 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/DelegatingOutputStream.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/DelegatingOutputStream.java
index 019a51849..019a51849 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/DelegatingOutputStream.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/DelegatingOutputStream.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/MainTest.java
index 8d6f788d4..8d6f788d4 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/MainTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/MainTest.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/TestMessageHolder.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/TestMessageHolder.java
index 5acefcab1..5acefcab1 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/TestMessageHolder.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/TestMessageHolder.java
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java
deleted file mode 100644
index 8889ddc06..000000000
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/EajcModuleTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.aspectj.ajdt;
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
- * 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * PARC initial implementation
- * ******************************************************************/
-
-
-// default package
-
-
-import org.aspectj.testing.util.TestUtil;
-
-import junit.framework.*;
-
-public class EajcModuleTests extends TestCase {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(EajcModuleTests.class.getName());
- suite.addTest(org.aspectj.ajdt.ajc.AjdtAjcTests.suite());
- suite.addTest(org.aspectj.ajdt.internal.compiler.batch.AjdtBatchTests.suite());
- suite.addTest(org.aspectj.ajdt.internal.core.builder.AjdtBuilderTests.suite());
- suite.addTest(org.aspectj.tools.ajc.AjcTests.suite());
-
- /* FIXME maw move these Java 5 dependent tests to a separate project */
- if (TestUtil.is15VMOrGreater()) {
- TestUtil.loadTestsReflectively(suite, "Eajc515ModuleTests", true);
- } else {
- suite.addTest(TestUtil.testNamed("Eajc515ModuleTests require 1.5"));
- }
- return suite;
- }
-
- public EajcModuleTests(String name) { super(name); }
-
-}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java
deleted file mode 100644
index 51dc1c8ef..000000000
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/AjdtAjcTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
- * 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * PARC initial implementation
- * ******************************************************************/
-
-
-package org.aspectj.ajdt.ajc;
-
-import java.io.File;
-
-import junit.framework.*;
-
-public class AjdtAjcTests extends TestCase {
-
- public static final String TESTDATA_PATH
- = "../org.aspectj.ajdt.core/testdata";
- public static final File TESTDATA_DIR = new File(TESTDATA_PATH);
-
- public static Test suite() {
- TestSuite suite = new TestSuite(AjdtAjcTests.class.getName());
- //$JUnit-BEGIN$
- suite.addTestSuite(AjdtCommandTestCase.class);
- suite.addTestSuite(BuildArgParserTestCase.class);
- suite.addTestSuite(ConsoleMessageHandlerTestCase.class);
- //$JUnit-END$
- return suite;
- }
-
- public AjdtAjcTests(String name) { super(name); }
-
-}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java
deleted file mode 100644
index 93466906a..000000000
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/AjdtBatchTests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
- * 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * PARC initial implementation
- * ******************************************************************/
-
-
-package org.aspectj.ajdt.internal.compiler.batch;
-
-import junit.framework.*;
-
-public class AjdtBatchTests extends TestCase {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(AjdtBatchTests.class.getName());
- // Abstract superclass
- //suite.addTestSuite(CommandTestCase.class);
- //$JUnit-BEGIN$
- suite.addTestSuite(BasicCommandTestCase.class);
- suite.addTestSuite(BinaryFormsTestCase.class);
- suite.addTestSuite(CompileAndRunTestCase.class);
- suite.addTestSuite(PerformanceTestCase.class);
- suite.addTestSuite(ImageTestCase.class);
- suite.addTestSuite(MultipleCompileTestCase.class);
- suite.addTestSuite(JavadocTest.class);
- suite.addTestSuite(PartiallyExposedHierarchyTestCase.class);
- suite.addTestSuite(CompilerDumpTestCase.class);
- suite.addTestSuite(ProceedOnErrorTestCase.class);
- suite.addTestSuite(DeclareParents.class);
- // XXX suite.addTestSuite(VerifyWeaveTestCase.class);
- //suite.addTestSuite(WorkingCommandTestCase.class);
- //$JUnit-END$
- return suite;
- }
-
- public AjdtBatchTests(String name) { super(name); }
-
-}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java
deleted file mode 100644
index 61f92803e..000000000
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjdtBuilderTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation,
- * 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * PARC initial implementation
- * ******************************************************************/
-
-
-package org.aspectj.ajdt.internal.core.builder;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AjdtBuilderTests extends TestCase {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(AjdtBuilderTests.class.getName());
- //$JUnit-BEGIN$
- suite.addTestSuite(AjBuildManagerTest.class);
- suite.addTestSuite(AjBuildConfigTests.class);
- suite.addTestSuite(AsmBuilderTest.class);
- suite.addTestSuite(AjCompilerOptionsTest.class);
- suite.addTestSuite(AjStateTest.class);
- suite.addTestSuite(OutjarTest.class);
- //$JUnit-END$
- return suite;
- }
-
- public AjdtBuilderTests(String name) { super(name); }
-
-}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java
deleted file mode 100644
index eb8445352..000000000
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 2005 Contributors.
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Wes Isberg initial implementation
- * ******************************************************************/
-
-
-package org.aspectj.tools.ajc;
-
-import org.aspectj.testing.util.TestUtil;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AjcTests extends TestCase {
- public static String aspectjrtClasspath() {
- return TestUtil.aspectjrtPath().getPath();
- }
- public static Test suite() {
- TestSuite suite = new TestSuite(AjcTests.class.getName());
- suite.addTestSuite(org.aspectj.tools.ajc.MainTest.class);
- suite.addTestSuite(ASTVisitorTest.class);
- suite.addTestSuite(ASTitdTest.class);
- suite.addTestSuite(AjASTTest.class);
- suite.addTestSuite(AjNaiveASTFlattenerTest.class);
- return suite;
- }
-
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 14:45:36 +0000