From 440d0d0ecb98c8f819c7182f397174053e389767 Mon Sep 17 00:00:00 2001 From: Mickael Istria Date: Wed, 5 Jun 2024 20:19:36 +0200 Subject: [PATCH] Merge org.eclipse.jdt.apt.core into org.eclipse.jdt.core Implementation notes: * org.eclipse.jdt.apt.core "proxies" to org.eclipse.jdt.core * Both new and legacy extension points ids are processed, this brings backward compatibility * Platform mandates that we change the marker ids * The marker type constants had to move so that client code reacts to their value changing --- org.eclipse.jdt.apt.core/.classpath | 1 - org.eclipse.jdt.apt.core/.options | 12 - .../.settings/.api_filters | 11 + org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF | 26 +- org.eclipse.jdt.apt.core/build.properties | 10 +- org.eclipse.jdt.apt.core/plugin.properties | 9 +- org.eclipse.jdt.apt.core/plugin.xml | 105 +---- .../schema/annotationProcessorFactory.exsd | 11 +- .../eclipse/jdt/apt/tests/APTTestBase.java | 7 +- .../jdt/apt/tests/FactoryLoaderTests.java | 3 +- org.eclipse.jdt.core/.classpath | 1 + org.eclipse.jdt.core/.options | 13 + org.eclipse.jdt.core/META-INF/MANIFEST.MF | 19 +- org.eclipse.jdt.core/about.html | 50 ++- .../sun/mirror/apt/AnnotationProcessor.java | 0 .../apt/AnnotationProcessorEnvironment.java | 0 .../apt/AnnotationProcessorFactory.java | 0 .../apt/AnnotationProcessorListener.java | 0 .../sun/mirror/apt/AnnotationProcessors.java | 0 .../apt}/com/sun/mirror/apt/Filer.java | 0 .../apt}/com/sun/mirror/apt/Messager.java | 0 .../sun/mirror/apt/RoundCompleteEvent.java | 0 .../sun/mirror/apt/RoundCompleteListener.java | 0 .../apt}/com/sun/mirror/apt/RoundState.java | 0 .../apt}/com/sun/mirror/apt/package.html | 0 .../mirror/declaration/AnnotationMirror.java | 0 .../AnnotationTypeDeclaration.java | 0 .../AnnotationTypeElementDeclaration.java | 0 .../mirror/declaration/AnnotationValue.java | 0 .../mirror/declaration/ClassDeclaration.java | 0 .../declaration/ConstructorDeclaration.java | 0 .../sun/mirror/declaration/Declaration.java | 0 .../declaration/EnumConstantDeclaration.java | 0 .../mirror/declaration/EnumDeclaration.java | 0 .../declaration/ExecutableDeclaration.java | 0 .../mirror/declaration/FieldDeclaration.java | 0 .../declaration/InterfaceDeclaration.java | 0 .../mirror/declaration/MemberDeclaration.java | 0 .../mirror/declaration/MethodDeclaration.java | 0 .../com/sun/mirror/declaration/Modifier.java | 0 .../declaration/PackageDeclaration.java | 0 .../declaration/ParameterDeclaration.java | 0 .../mirror/declaration/TypeDeclaration.java | 0 .../declaration/TypeParameterDeclaration.java | 0 .../com/sun/mirror/declaration/package.html | 0 .../com/sun/mirror/type/AnnotationType.java | 0 .../apt}/com/sun/mirror/type/ArrayType.java | 0 .../apt}/com/sun/mirror/type/ClassType.java | 0 .../com/sun/mirror/type/DeclaredType.java | 0 .../apt}/com/sun/mirror/type/EnumType.java | 0 .../com/sun/mirror/type/InterfaceType.java | 0 .../mirror/type/MirroredTypeException.java | 0 .../mirror/type/MirroredTypesException.java | 0 .../com/sun/mirror/type/PrimitiveType.java | 0 .../com/sun/mirror/type/ReferenceType.java | 0 .../apt}/com/sun/mirror/type/TypeMirror.java | 0 .../com/sun/mirror/type/TypeVariable.java | 0 .../apt}/com/sun/mirror/type/VoidType.java | 0 .../com/sun/mirror/type/WildcardType.java | 0 .../apt}/com/sun/mirror/type/package.html | 0 .../sun/mirror/util/DeclarationFilter.java | 0 .../sun/mirror/util/DeclarationScanner.java | 0 .../sun/mirror/util/DeclarationVisitor.java | 0 .../sun/mirror/util/DeclarationVisitors.java | 0 .../com/sun/mirror/util/Declarations.java | 0 .../mirror/util/SimpleDeclarationVisitor.java | 0 .../sun/mirror/util/SimpleTypeVisitor.java | 0 .../mirror/util/SourceOrderDeclScanner.java | 0 .../com/sun/mirror/util/SourcePosition.java | 0 .../apt}/com/sun/mirror/util/TypeVisitor.java | 0 .../apt}/com/sun/mirror/util/Types.java | 0 .../apt}/com/sun/mirror/util/package.html | 0 .../jdt/apt/core/build/AptBuilder.java | 0 .../eclipse/jdt/apt/core/build/JdtApt.java | 0 .../eclipse/jdt/apt/core/build/package.html | 0 ...EclipseAnnotationProcessorEnvironment.java | 0 .../EclipseAnnotationProcessorFactory.java | 0 .../jdt/apt/core/env/EnvironmentFactory.java | 0 .../org/eclipse/jdt/apt/core/env/Phase.java | 0 .../org/eclipse/jdt/apt/core/env/package.html | 0 .../core/internal/APTDispatchRunnable.java | 6 +- .../AnnotationProcessorFactoryLoader.java | 3 +- .../internal/AptCompilationParticipant.java | 3 +- ...ompilationParticipantExtensionFactory.java | 0 .../jdt/apt/core/internal/AptPlugin.java | 12 +- .../jdt/apt/core/internal/AptProject.java | 0 .../core/internal/ClassServiceFactory.java | 0 .../core/internal/ExtJarFactoryContainer.java | 0 .../core/internal/FactoryPluginManager.java | 32 +- .../apt/core/internal/IServiceFactory.java | 0 .../jdt/apt/core/internal/JarClassLoader.java | 0 .../core/internal/JarFactoryContainer.java | 0 .../apt/core/internal/LoadFailureHandler.java | 5 +- .../jdt/apt/core/internal/Messages.java | 0 .../NonEclipseImplementationException.java | 0 .../core/internal/PluginFactoryContainer.java | 0 .../core/internal/VarJarFactoryContainer.java | 0 .../internal/WkspJarFactoryContainer.java | 0 .../jdt/apt/core/internal/build/Messages.java | 0 .../core/internal/build/messages.properties | 0 ...BasedAnnotationElementDeclarationImpl.java | 0 .../ASTBasedConstructorDeclarationImpl.java | 0 .../declaration/ASTBasedDeclarationImpl.java | 0 .../ASTBasedExecutableDeclarationImpl.java | 0 .../ASTBasedFieldDeclarationImpl.java | 0 .../ASTBasedMemberDeclarationImpl.java | 0 .../ASTBasedMethodDeclarationImpl.java | 0 .../AnnotationDeclarationImpl.java | 0 .../AnnotationElementDeclarationImpl.java | 0 .../declaration/AnnotationMirrorImpl.java | 0 .../declaration/AnnotationValueImpl.java | 0 .../BinaryParameterDeclarationImpl.java | 0 .../declaration/ClassDeclarationImpl.java | 0 .../ConstructorDeclarationImpl.java | 0 .../internal/declaration/DeclarationImpl.java | 0 .../declaration/EclipseDeclarationImpl.java | 0 .../declaration/EclipseMirrorObject.java | 0 .../declaration/EclipseMirrorType.java | 0 .../EnumConstantDeclarationImpl.java | 0 .../declaration/EnumDeclarationImpl.java | 0 .../ExecutableDeclarationImpl.java | 0 .../internal/declaration/ExecutableUtil.java | 0 .../declaration/FieldDeclarationImpl.java | 0 .../declaration/InterfaceDeclarationImpl.java | 0 .../declaration/MemberDeclarationImpl.java | 0 .../declaration/MethodDeclarationImpl.java | 0 .../declaration/PackageDeclarationImpl.java | 0 .../PackageDeclarationImplNoBinding.java | 0 .../SourceParameterDeclarationImpl.java | 0 .../declaration/TypeDeclarationImpl.java | 0 .../TypeParameterDeclarationImpl.java | 0 .../jdt/apt/core/internal/env/APTProblem.java | 18 +- .../internal/env/AbstractCompilationEnv.java | 0 .../env/AnnotationInvocationHandler.java | 0 .../core/internal/env/BaseProcessorEnv.java | 0 .../internal/env/BinaryFileOutputStream.java | 0 .../jdt/apt/core/internal/env/BuildEnv.java | 2 +- .../apt/core/internal/env/BuildFilerImpl.java | 0 .../env/EclipseRoundCompleteEvent.java | 0 .../internal/env/EncodedFileOutputStream.java | 0 .../jdt/apt/core/internal/env/EnvUtil.java | 0 .../jdt/apt/core/internal/env/FilerImpl.java | 0 .../apt/core/internal/env/ITypeConstants.java | 0 .../env/JavaSourceFilePrintWriter.java | 0 .../jdt/apt/core/internal/env/MarkerInfo.java | 0 .../apt/core/internal/env/MessagerImpl.java | 0 .../core/internal/env/NoOpOutputStream.java | 0 .../core/internal/env/NoOpPrintWriter.java | 0 .../apt/core/internal/env/ReconcileEnv.java | 0 .../core/internal/env/ReconcileFilerImpl.java | 0 .../internal/generatedfile/ClasspathUtil.java | 0 .../generatedfile/CompilationUnitHelper.java | 0 .../generatedfile/FileGenerationResult.java | 0 .../generatedfile/GeneratedFileManager.java | 5 +- .../generatedfile/GeneratedFileMap.java | 0 .../GeneratedResourceChangeListener.java | 0 .../GeneratedSourceFolderManager.java | 0 .../WorkingCopyCleanupListener.java | 0 .../jdt/apt/core/internal/messages.properties | 0 .../apt/core/internal/type/ArrayTypeImpl.java | 0 .../jdt/apt/core/internal/type/ErrorType.java | 0 .../core/internal/type/PrimitiveTypeImpl.java | 0 .../apt/core/internal/type/VoidTypeImpl.java | 0 .../core/internal/type/WildcardTypeImpl.java | 0 .../core/internal/util/AnnotationScanner.java | 0 .../util/AptCorePreferenceInitializer.java | 0 .../util/CharArrayAnnotationScanner.java | 0 .../core/internal/util/DeclarationsUtil.java | 0 .../jdt/apt/core/internal/util/Factory.java | 0 .../core/internal/util/FactoryContainer.java | 0 .../apt/core/internal/util/FactoryPath.java | 0 .../core/internal/util/FactoryPathUtil.java | 0 .../core/internal/util/FileSystemUtil.java | 0 .../util/InputStreamAnnotationScanner.java | 0 .../apt/core/internal/util/ManyToMany.java | 0 .../jdt/apt/core/internal/util/Messages.java | 0 .../apt/core/internal/util/PackageUtil.java | 0 .../util/ReaderAnnotationScanner.java | 0 .../apt/core/internal/util/ScannerUtil.java | 0 .../internal/util/SourcePositionImpl.java | 0 .../apt/core/internal/util/TestCodeUtil.java | 0 .../jdt/apt/core/internal/util/TypesUtil.java | 0 .../jdt/apt/core/internal/util/Visitors.java | 0 .../core/internal/util/messages.properties | 0 .../eclipse/jdt/apt/core/util/AptConfig.java | 0 .../apt/core/util/AptPreferenceConstants.java | 0 .../eclipse/jdt/apt/core/util/AptUtil.java | 0 .../jdt/apt/core/util/EclipseMessager.java | 0 .../jdt/apt/core/util/IFactoryPath.java | 0 .../eclipse/jdt/apt/core/util/package.html | 0 org.eclipse.jdt.core/apt_build_notes.html | 380 ++++++++++++++++++ org.eclipse.jdt.core/apt_design-notes.html | 227 +++++++++++ org.eclipse.jdt.core/build.properties | 3 +- org.eclipse.jdt.core/mirror-api-license.txt | 28 ++ .../model/org/eclipse/jdt/core/JavaCore.java | 6 + .../core/builder/AbstractImageBuilder.java | 3 +- org.eclipse.jdt.core/plugin.properties | 8 + org.eclipse.jdt.core/plugin.xml | 79 ++++ org.eclipse.jdt.core/pom.xml | 2 +- .../schema/annotationProcessorFactory.exsd | 184 +++++++++ 200 files changed, 1072 insertions(+), 212 deletions(-) delete mode 100644 org.eclipse.jdt.apt.core/.options create mode 100644 org.eclipse.jdt.apt.core/.settings/.api_filters rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/AnnotationProcessor.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/AnnotationProcessorEnvironment.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/AnnotationProcessorFactory.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/AnnotationProcessorListener.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/AnnotationProcessors.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/Filer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/Messager.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/RoundCompleteEvent.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/RoundCompleteListener.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/RoundState.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/apt/package.html (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/AnnotationMirror.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/AnnotationTypeDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/AnnotationValue.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/ClassDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/ConstructorDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/Declaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/EnumConstantDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/EnumDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/ExecutableDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/FieldDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/InterfaceDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/MemberDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/MethodDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/Modifier.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/PackageDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/ParameterDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/TypeDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/TypeParameterDeclaration.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/declaration/package.html (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/AnnotationType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/ArrayType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/ClassType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/DeclaredType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/EnumType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/InterfaceType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/MirroredTypeException.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/MirroredTypesException.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/PrimitiveType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/ReferenceType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/TypeMirror.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/TypeVariable.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/VoidType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/WildcardType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/type/package.html (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/DeclarationFilter.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/DeclarationScanner.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/DeclarationVisitor.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/DeclarationVisitors.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/Declarations.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/SimpleDeclarationVisitor.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/SimpleTypeVisitor.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/SourceOrderDeclScanner.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/SourcePosition.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/TypeVisitor.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/Types.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/com/sun/mirror/util/package.html (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/build/AptBuilder.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/build/JdtApt.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/build/package.html (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorEnvironment.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorFactory.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/env/EnvironmentFactory.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/env/Phase.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/env/package.html (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java (99%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java (99%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/AptCompilationParticipant.java (98%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/AptCompilationParticipantExtensionFactory.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/AptPlugin.java (91%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/AptProject.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/ClassServiceFactory.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/ExtJarFactoryContainer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/FactoryPluginManager.java (90%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/IServiceFactory.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/JarClassLoader.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/JarFactoryContainer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/LoadFailureHandler.java (95%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/Messages.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/NonEclipseImplementationException.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/PluginFactoryContainer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/VarJarFactoryContainer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/WkspJarFactoryContainer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/build/Messages.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/build/messages.properties (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedAnnotationElementDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedConstructorDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedExecutableDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedFieldDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMemberDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMethodDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/AnnotationDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/AnnotationElementDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/AnnotationMirrorImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/AnnotationValueImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/BinaryParameterDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ClassDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ConstructorDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/DeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/EclipseDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorObject.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/EnumConstantDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/EnumDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ExecutableDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/ExecutableUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/FieldDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/InterfaceDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/MemberDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/MethodDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImplNoBinding.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/SourceParameterDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/TypeDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/declaration/TypeParameterDeclarationImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/APTProblem.java (72%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/AbstractCompilationEnv.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/AnnotationInvocationHandler.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/BinaryFileOutputStream.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/BuildEnv.java (99%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/BuildFilerImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/EclipseRoundCompleteEvent.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/EncodedFileOutputStream.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/EnvUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/FilerImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/ITypeConstants.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/JavaSourceFilePrintWriter.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/MarkerInfo.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/MessagerImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/NoOpOutputStream.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/NoOpPrintWriter.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/ReconcileEnv.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/env/ReconcileFilerImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/ClasspathUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/CompilationUnitHelper.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/FileGenerationResult.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileManager.java (99%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileMap.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedResourceChangeListener.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedSourceFolderManager.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/generatedfile/WorkingCopyCleanupListener.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/messages.properties (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/type/ArrayTypeImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/type/ErrorType.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/type/PrimitiveTypeImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/type/VoidTypeImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/type/WildcardTypeImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/AnnotationScanner.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/AptCorePreferenceInitializer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/CharArrayAnnotationScanner.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/DeclarationsUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/Factory.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/FactoryContainer.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/FactoryPath.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/FactoryPathUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/FileSystemUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/InputStreamAnnotationScanner.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/ManyToMany.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/Messages.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/PackageUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/ReaderAnnotationScanner.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/ScannerUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/SourcePositionImpl.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/TestCodeUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/TypesUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/Visitors.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/internal/util/messages.properties (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/util/AptConfig.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/util/AptPreferenceConstants.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/util/AptUtil.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/util/EclipseMessager.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/util/IFactoryPath.java (100%) rename {org.eclipse.jdt.apt.core/src => org.eclipse.jdt.core/apt}/org/eclipse/jdt/apt/core/util/package.html (100%) create mode 100644 org.eclipse.jdt.core/apt_build_notes.html create mode 100644 org.eclipse.jdt.core/apt_design-notes.html create mode 100644 org.eclipse.jdt.core/mirror-api-license.txt create mode 100644 org.eclipse.jdt.core/schema/annotationProcessorFactory.exsd diff --git a/org.eclipse.jdt.apt.core/.classpath b/org.eclipse.jdt.apt.core/.classpath index 3628e336878..558b50a9d9e 100644 --- a/org.eclipse.jdt.apt.core/.classpath +++ b/org.eclipse.jdt.apt.core/.classpath @@ -6,6 +6,5 @@ - diff --git a/org.eclipse.jdt.apt.core/.options b/org.eclipse.jdt.apt.core/.options deleted file mode 100644 index 8a4836f0133..00000000000 --- a/org.eclipse.jdt.apt.core/.options +++ /dev/null @@ -1,12 +0,0 @@ -# Debug tracing for org.eclipse.jdt.core plugin -# Includes traces needed for most client-visible problems -org.eclipse.jdt.apt.core/debug=false - -# Debug tracing for file generation -org.eclipse.jdt.apt.core/debug/generatedFiles=false - -# Debug tracing for internal data structures used in file generation -org.eclipse.jdt.apt.core/debug/generatedFileMaps=false - -# Debug tracing for compilation environment -org.eclipse.jdt.apt.core/debug/compilationEnv=false diff --git a/org.eclipse.jdt.apt.core/.settings/.api_filters b/org.eclipse.jdt.apt.core/.settings/.api_filters new file mode 100644 index 00000000000..690e0386f2a --- /dev/null +++ b/org.eclipse.jdt.apt.core/.settings/.api_filters @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF index 04adcc31931..dd8258df435 100644 --- a/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF @@ -1,30 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.jdt.apt.core; singleton:=true -Bundle-Version: 3.8.500.qualifier +Bundle-SymbolicName: org.eclipse.jdt.apt.core;singleton:=true +Bundle-Version: 3.9.0.qualifier Bundle-Localization: plugin -Export-Package: com.sun.mirror.apt, - com.sun.mirror.declaration, - com.sun.mirror.type, - com.sun.mirror.util, - org.eclipse.jdt.apt.core.build, - org.eclipse.jdt.apt.core.env, - org.eclipse.jdt.apt.core.internal;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", - org.eclipse.jdt.apt.core.internal.build;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", - org.eclipse.jdt.apt.core.internal.declaration;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", - org.eclipse.jdt.apt.core.internal.env;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", - org.eclipse.jdt.apt.core.internal.generatedfile;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", - org.eclipse.jdt.apt.core.internal.type;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", - org.eclipse.jdt.apt.core.internal.util;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", - org.eclipse.jdt.apt.core.util -Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)", - org.apache.ant;bundle-version="1.6.5" -Bundle-Activator: org.eclipse.jdt.apt.core.internal.AptPlugin +Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.38.0,4.0.0)";visibility:=reexport Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy -Import-Package: com.sun.mirror.type Automatic-Module-Name: org.eclipse.jdt.apt.core diff --git a/org.eclipse.jdt.apt.core/build.properties b/org.eclipse.jdt.apt.core/build.properties index 79f2d92ea36..5b6787c5d68 100644 --- a/org.eclipse.jdt.apt.core/build.properties +++ b/org.eclipse.jdt.apt.core/build.properties @@ -9,15 +9,11 @@ # SPDX-License-Identifier: EPL-2.0 ############################################################################### jars.compile.order = . -source.. = src/ -output.. = bin/ -bin.includes = plugin.xml,\ - .,\ +bin.includes = .,\ META-INF/,\ about.html,\ mirror-api-license.txt,\ plugin.properties,\ - .options + plugin.xml src.includes = about.html,\ - mirror-api-license.txt,\ - schema/ + mirror-api-license.txt diff --git a/org.eclipse.jdt.apt.core/plugin.properties b/org.eclipse.jdt.apt.core/plugin.properties index e930f54bccd..eea6430856d 100644 --- a/org.eclipse.jdt.apt.core/plugin.properties +++ b/org.eclipse.jdt.apt.core/plugin.properties @@ -12,11 +12,4 @@ # BEA Systems Inc. - initial implementation ############################################################################### providerName=Eclipse.org -pluginName=Java Annotation Processing Core -annotationProcessorFactoriesName=Annotation Processor Factories -annotationProcessingName=Annotation Processing -aptBatchMarkerName=Annotation Problem -aptNonreconcileBatchMarkerName=Annotation Problem (build-only processor) -aptBuildMarkerName=APT Build Problem -aptConfigurationMarkerName=APT Configuration Problem -traceComponentLabel=JDT APT Core +pluginName=(Deprecated, included in JDT Core) Java Annotation Processing Core diff --git a/org.eclipse.jdt.apt.core/plugin.xml b/org.eclipse.jdt.apt.core/plugin.xml index 62327492940..ff87c6768ae 100644 --- a/org.eclipse.jdt.apt.core/plugin.xml +++ b/org.eclipse.jdt.apt.core/plugin.xml @@ -1,106 +1,5 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/org.eclipse.jdt.apt.core/schema/annotationProcessorFactory.exsd b/org.eclipse.jdt.apt.core/schema/annotationProcessorFactory.exsd index 8551232ef0b..3bf94bf372d 100644 --- a/org.eclipse.jdt.apt.core/schema/annotationProcessorFactory.exsd +++ b/org.eclipse.jdt.apt.core/schema/annotationProcessorFactory.exsd @@ -2,11 +2,11 @@ - - - + + + - Plug-ins which contribute JSR-175 annotation processors should extend this extension point in order to participate in compilation. + Deprecated - use org.eclipse.jdt.core.annotationProcessorFactory @@ -21,6 +21,9 @@ + + + diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/APTTestBase.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/APTTestBase.java index 5e3a022d36e..716594cd7c2 100644 --- a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/APTTestBase.java +++ b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/APTTestBase.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.apt.core.internal.AptPlugin; +import org.eclipse.jdt.apt.core.internal.env.APTProblem; import org.eclipse.jdt.apt.core.util.AptConfig; import org.eclipse.jdt.apt.tests.annotations.BaseProcessor; import org.eclipse.jdt.apt.tests.annotations.ProcessorTestStatus; @@ -262,11 +263,11 @@ protected IMarker[] getAllAPTMarkers(IPath path){ try { IMarker[] markers = null; int total = 0; - final IMarker[] processorMarkers = resource.findMarkers(AptPlugin.APT_BATCH_PROCESSOR_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); + final IMarker[] processorMarkers = resource.findMarkers(APTProblem.APT_BATCH_PROCESSOR_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); total = processorMarkers.length; markers = processorMarkers; - final IMarker[] factoryPathMarkers = resource.findMarkers(AptPlugin.APT_LOADER_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); + final IMarker[] factoryPathMarkers = resource.findMarkers(APTProblem.APT_LOADER_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); if( factoryPathMarkers.length != 0 ){ if( total != 0 ){ final int len = factoryPathMarkers.length; @@ -279,7 +280,7 @@ protected IMarker[] getAllAPTMarkers(IPath path){ else markers = factoryPathMarkers; } - final IMarker[] configMarkers = resource.findMarkers(AptPlugin.APT_CONFIG_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); + final IMarker[] configMarkers = resource.findMarkers(APTProblem.APT_CONFIG_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); if( configMarkers.length != 0 ){ if( total != 0 ){ final int len = configMarkers.length; diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryLoaderTests.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryLoaderTests.java index b61579a9983..d97e24304d3 100644 --- a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryLoaderTests.java +++ b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryLoaderTests.java @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.apt.core.internal.AptPlugin; +import org.eclipse.jdt.apt.core.internal.env.APTProblem; import org.eclipse.jdt.apt.core.util.AptConfig; import org.eclipse.jdt.apt.core.util.IFactoryPath; import org.eclipse.jdt.apt.tests.external.annotations.classloader.ColorAnnotationProcessor; @@ -149,7 +150,7 @@ public void testNonexistentEntry() throws Exception { fullBuild( project.getFullPath() ); IMarker[] markers = getAllAPTMarkers(_projectPath); assertEquals(1, markers.length); - assertEquals(AptPlugin.APT_LOADER_PROBLEM_MARKER, markers[0].getType()); + assertEquals(APTProblem.APT_LOADER_PROBLEM_MARKER, markers[0].getType()); String message = markers[0].getAttribute(IMarker.MESSAGE, ""); assertTrue(message.contains("bogusJar.jar")); diff --git a/org.eclipse.jdt.core/.classpath b/org.eclipse.jdt.core/.classpath index 1df939a98f1..9cf438068e9 100644 --- a/org.eclipse.jdt.core/.classpath +++ b/org.eclipse.jdt.core/.classpath @@ -13,5 +13,6 @@ + diff --git a/org.eclipse.jdt.core/.options b/org.eclipse.jdt.core/.options index 42187bb6e5b..36a090bd207 100644 --- a/org.eclipse.jdt.core/.options +++ b/org.eclipse.jdt.core/.options @@ -103,3 +103,16 @@ org.eclipse.jdt.core/perf/containerinitializer=5000 # Reports the time to perform a reconcile operation. org.eclipse.jdt.core/perf/reconcile=1000 + +# Debug tracing for org.eclipse.jdt.core plugin +# Includes traces needed for most client-visible problems +org.eclipse.jdt.apt.core/debug=false + +# Debug tracing for file generation +org.eclipse.jdt.apt.core/debug/generatedFiles=false + +# Debug tracing for internal data structures used in file generation +org.eclipse.jdt.apt.core/debug/generatedFileMaps=false + +# Debug tracing for compilation environment +org.eclipse.jdt.apt.core/debug/compilationEnv=false diff --git a/org.eclipse.jdt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.core/META-INF/MANIFEST.MF index 2dfff3fc7c8..2bd558dcb77 100644 --- a/org.eclipse.jdt.core/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jdt.core; singleton:=true -Bundle-Version: 3.38.100.qualifier +Bundle-Version: 3.39.0.qualifier Bundle-Activator: org.eclipse.jdt.core.JavaCore Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -41,7 +41,22 @@ Export-Package: org.eclipse.jdt.core, org.eclipse.jdt.internal.eval;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests", org.eclipse.jdt.internal.formatter;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests, org.eclipse.jdt.ui.tests", org.eclipse.jdt.internal.formatter.linewrap;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests", - org.eclipse.jdt.internal.formatter.old;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests" + org.eclipse.jdt.internal.formatter.old;x-friends:="org.eclipse.jdt.core.tests.model, org.eclipse.jdt.core.tests.compiler, org.eclipse.jdt.core.tests.builder, org.eclipse.jdt.core.tests.performance, org.eclipse.jdt.ui.tests", + com.sun.mirror.apt;version="3.8.400", + com.sun.mirror.declaration;version="3.8.400", + com.sun.mirror.type;version="3.8.400", + com.sun.mirror.util;version="3.8.400", + org.eclipse.jdt.apt.core.build;version="3.8.400", + org.eclipse.jdt.apt.core.env;version="3.8.400", + org.eclipse.jdt.apt.core.internal;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", + org.eclipse.jdt.apt.core.internal.build;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", + org.eclipse.jdt.apt.core.internal.declaration;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", + org.eclipse.jdt.apt.core.internal.env;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", + org.eclipse.jdt.apt.core.internal.generatedfile;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", + org.eclipse.jdt.apt.core.internal.type;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", + org.eclipse.jdt.apt.core.internal.util;version="3.8.400";x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests", + org.eclipse.jdt.apt.core.util;version="3.8.400" +Import-Package: com.sun.mirror.type Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)", diff --git a/org.eclipse.jdt.core/about.html b/org.eclipse.jdt.core/about.html index f0810d12f3e..5c0148b2d40 100644 --- a/org.eclipse.jdt.core/about.html +++ b/org.eclipse.jdt.core/about.html @@ -32,11 +32,51 @@

License

href="http://www.eclipse.org/">http://www.eclipse.org.

- -

Disassembler

-

This plug-in contains a bytecode disassembler ("Disassembler") that can produce a listing of the Java assembler mnemonics ("Assembler Mnemonics") for a Java method. If you -use the Disassembler to view the Assembler Mnemonics for a method, you should ensure that doing so will not violate the terms of any licenses that apply to your use of that method, as -such licenses may not permit you to reverse engineer, decompile, or disassemble method bytecodes.

+

Third Party Content

+ +

The Content includes items that have been sourced from third parties as set out below. If you +did not receive this Content directly from the Eclipse Foundation, the following is provided +for informational purposes only, and you should look to the Redistributor’s license for +terms and conditions of use.

+ +

Java Mirror API

+ +

The plug-in includes classes in the com.sun.mirror package ("Java Mirror API"). +Your use of the Java Mirror API is governed by the terms and conditions of the following license:

+ +
+
+Copyright (c) 2004, Sun Microsystems, Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of the Sun Microsystems, Inc. nor the names of
+     its contributors may be used to endorse or promote products
+     derived from this software without specific prior written
+     permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+ \ No newline at end of file diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessor.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessor.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessor.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessor.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorEnvironment.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessorEnvironment.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorEnvironment.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessorEnvironment.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorFactory.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessorFactory.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorFactory.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessorFactory.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorListener.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessorListener.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessorListener.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessorListener.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessors.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessors.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/AnnotationProcessors.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/AnnotationProcessors.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/Filer.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/Filer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/Filer.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/Filer.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/Messager.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/Messager.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/Messager.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/Messager.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/RoundCompleteEvent.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/RoundCompleteEvent.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/RoundCompleteEvent.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/RoundCompleteEvent.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/RoundCompleteListener.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/RoundCompleteListener.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/RoundCompleteListener.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/RoundCompleteListener.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/RoundState.java b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/RoundState.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/RoundState.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/RoundState.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/package.html b/org.eclipse.jdt.core/apt/com/sun/mirror/apt/package.html similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/apt/package.html rename to org.eclipse.jdt.core/apt/com/sun/mirror/apt/package.html diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationMirror.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationMirror.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationMirror.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationMirror.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationTypeDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationTypeDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationTypeDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationTypeDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationValue.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationValue.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/AnnotationValue.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/AnnotationValue.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ClassDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ClassDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ClassDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ClassDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ConstructorDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ConstructorDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ConstructorDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ConstructorDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/Declaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/Declaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/Declaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/Declaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/EnumConstantDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/EnumConstantDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/EnumConstantDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/EnumConstantDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/EnumDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/EnumDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/EnumDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/EnumDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ExecutableDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ExecutableDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ExecutableDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ExecutableDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/FieldDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/FieldDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/FieldDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/FieldDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/InterfaceDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/InterfaceDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/InterfaceDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/InterfaceDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/MemberDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/MemberDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/MemberDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/MemberDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/MethodDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/MethodDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/MethodDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/MethodDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/Modifier.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/Modifier.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/Modifier.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/Modifier.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/PackageDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/PackageDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/PackageDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/PackageDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ParameterDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ParameterDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/ParameterDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/ParameterDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/TypeDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/TypeDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeParameterDeclaration.java b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/TypeParameterDeclaration.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/TypeParameterDeclaration.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/TypeParameterDeclaration.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/package.html b/org.eclipse.jdt.core/apt/com/sun/mirror/declaration/package.html similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/declaration/package.html rename to org.eclipse.jdt.core/apt/com/sun/mirror/declaration/package.html diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/AnnotationType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/AnnotationType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/AnnotationType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/AnnotationType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ArrayType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/ArrayType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ArrayType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/ArrayType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ClassType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/ClassType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ClassType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/ClassType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/DeclaredType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/DeclaredType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/DeclaredType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/DeclaredType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/EnumType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/EnumType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/EnumType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/EnumType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/InterfaceType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/InterfaceType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/InterfaceType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/InterfaceType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/MirroredTypeException.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/MirroredTypeException.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/MirroredTypeException.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/MirroredTypeException.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/MirroredTypesException.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/MirroredTypesException.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/MirroredTypesException.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/MirroredTypesException.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/PrimitiveType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/PrimitiveType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/PrimitiveType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/PrimitiveType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ReferenceType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/ReferenceType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/ReferenceType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/ReferenceType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeMirror.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/TypeMirror.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeMirror.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/TypeMirror.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeVariable.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/TypeVariable.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/TypeVariable.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/TypeVariable.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/VoidType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/VoidType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/VoidType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/VoidType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/WildcardType.java b/org.eclipse.jdt.core/apt/com/sun/mirror/type/WildcardType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/WildcardType.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/WildcardType.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/type/package.html b/org.eclipse.jdt.core/apt/com/sun/mirror/type/package.html similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/type/package.html rename to org.eclipse.jdt.core/apt/com/sun/mirror/type/package.html diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationFilter.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationFilter.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationFilter.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationFilter.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationScanner.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationScanner.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationScanner.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationScanner.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationVisitor.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationVisitor.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationVisitor.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationVisitor.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationVisitors.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationVisitors.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/DeclarationVisitors.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/DeclarationVisitors.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Declarations.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/Declarations.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Declarations.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/Declarations.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SimpleDeclarationVisitor.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/SimpleDeclarationVisitor.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SimpleDeclarationVisitor.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/SimpleDeclarationVisitor.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SimpleTypeVisitor.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/SimpleTypeVisitor.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SimpleTypeVisitor.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/SimpleTypeVisitor.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SourceOrderDeclScanner.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/SourceOrderDeclScanner.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SourceOrderDeclScanner.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/SourceOrderDeclScanner.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SourcePosition.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/SourcePosition.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/SourcePosition.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/SourcePosition.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/TypeVisitor.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/TypeVisitor.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/TypeVisitor.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/TypeVisitor.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Types.java b/org.eclipse.jdt.core/apt/com/sun/mirror/util/Types.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/Types.java rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/Types.java diff --git a/org.eclipse.jdt.apt.core/src/com/sun/mirror/util/package.html b/org.eclipse.jdt.core/apt/com/sun/mirror/util/package.html similarity index 100% rename from org.eclipse.jdt.apt.core/src/com/sun/mirror/util/package.html rename to org.eclipse.jdt.core/apt/com/sun/mirror/util/package.html diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/AptBuilder.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/build/AptBuilder.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/AptBuilder.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/build/AptBuilder.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/JdtApt.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/build/JdtApt.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/JdtApt.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/build/JdtApt.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/package.html b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/build/package.html similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/build/package.html rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/build/package.html diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorEnvironment.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorEnvironment.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorEnvironment.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorEnvironment.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorFactory.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorFactory.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorFactory.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/EclipseAnnotationProcessorFactory.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EnvironmentFactory.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/EnvironmentFactory.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/EnvironmentFactory.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/EnvironmentFactory.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/Phase.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/Phase.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/Phase.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/Phase.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/package.html b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/package.html similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/env/package.html rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/env/package.html diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java similarity index 99% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java index 537362f910c..6f0203cc790 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/APTDispatchRunnable.java @@ -34,11 +34,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.apt.core.env.Phase; +import org.eclipse.jdt.apt.core.internal.env.APTProblem; import org.eclipse.jdt.apt.core.internal.env.AbstractCompilationEnv; +import org.eclipse.jdt.apt.core.internal.env.AbstractCompilationEnv.EnvCallback; import org.eclipse.jdt.apt.core.internal.env.BuildEnv; import org.eclipse.jdt.apt.core.internal.env.EclipseRoundCompleteEvent; import org.eclipse.jdt.apt.core.internal.env.ReconcileEnv; -import org.eclipse.jdt.apt.core.internal.env.AbstractCompilationEnv.EnvCallback; import org.eclipse.jdt.apt.core.internal.generatedfile.GeneratedFileManager; import org.eclipse.jdt.apt.core.internal.util.FactoryPath; import org.eclipse.jdt.apt.core.util.AptConfig; @@ -97,8 +98,7 @@ public void run(AbstractCompilationEnv env) { final int numProblems = problemList.size(); if (numProblems > 0) { final CategorizedProblem[] aptCatProblems = new CategorizedProblem[numProblems]; - _context.putProblems( - AptPlugin.APT_COMPILATION_PROBLEM_MARKER, problemList + _context.putProblems(APTProblem.APT_COMPILATION_PROBLEM_MARKER, problemList .toArray(aptCatProblems)); } diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java similarity index 99% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java index f0bb805c7c2..a7429f5317e 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AnnotationProcessorFactoryLoader.java @@ -45,6 +45,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.apt.core.internal.env.APTProblem; import org.eclipse.jdt.apt.core.internal.util.FactoryContainer; import org.eclipse.jdt.apt.core.internal.util.FactoryContainer.FactoryType; import org.eclipse.jdt.apt.core.internal.util.FactoryPath; @@ -724,7 +725,7 @@ private void removeAptBuildProblemMarkers( IJavaProject jproj ) { for (IJavaProject jp : jprojects) { if (jp.exists()) { IProject p = jp.getProject(); - IMarker[] markers = p.findMarkers(AptPlugin.APT_LOADER_PROBLEM_MARKER, false, IResource.DEPTH_ZERO); + IMarker[] markers = p.findMarkers(APTProblem.APT_LOADER_PROBLEM_MARKER, false, IResource.DEPTH_ZERO); if( markers != null ){ for( IMarker marker : markers ) marker.delete(); diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptCompilationParticipant.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptCompilationParticipant.java similarity index 98% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptCompilationParticipant.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptCompilationParticipant.java index ecf85e7d265..83f767ccb0c 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptCompilationParticipant.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptCompilationParticipant.java @@ -27,6 +27,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.apt.core.internal.env.APTProblem; import org.eclipse.jdt.apt.core.internal.util.FactoryPath; import org.eclipse.jdt.apt.core.internal.util.TestCodeUtil; import org.eclipse.jdt.apt.core.util.AptConfig; @@ -234,7 +235,7 @@ public void cleanStarting(IJavaProject javaProject){ AptPlugin.getAptProject(javaProject).projectClean( true, true, true ); try{ // clear out all markers during a clean. - IMarker[] markers = p.findMarkers(AptPlugin.APT_BATCH_PROCESSOR_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); + IMarker[] markers = p.findMarkers(APTProblem.APT_BATCH_PROCESSOR_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); if( markers != null ){ for( IMarker marker : markers ) marker.delete(); diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptCompilationParticipantExtensionFactory.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptCompilationParticipantExtensionFactory.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptCompilationParticipantExtensionFactory.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptCompilationParticipantExtensionFactory.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptPlugin.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptPlugin.java similarity index 91% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptPlugin.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptPlugin.java index 3640324ed0f..6ecb2613264 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptPlugin.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptPlugin.java @@ -60,16 +60,6 @@ public class AptPlugin extends Plugin implements DebugOptionsListener { */ public static final String APT_MARKER_SOURCE_ID = "APT"; //$NON-NLS-1$ - public static final String APT_BATCH_PROCESSOR_PROBLEM_MARKER = PLUGIN_ID + ".marker"; //$NON-NLS-1$ - /** Marker ID used for build problem, e.g., missing factory jar */ - public static final String APT_LOADER_PROBLEM_MARKER = PLUGIN_ID + ".buildproblem"; //$NON-NLS-1$ - /** Marker ID used for configuration problem, e.g generated source folder not on classpath */ - public static final String APT_CONFIG_PROBLEM_MARKER = PLUGIN_ID + ".configproblem"; //$NON-NLS-1$ - /** Marker ID used for posting problems during reconcile/build */ - public static final String APT_COMPILATION_PROBLEM_MARKER = PLUGIN_ID + ".compile.problem"; //$NON-NLS-1$ - /** Marker ID used for posting problems during build by processors that don't run in reconcile */ - public static final String APT_NONRECONCILE_COMPILATION_PROBLEM_MARKER = PLUGIN_ID + ".nonreconcile.compile.problem"; //$NON-NLS-1$ - private static final SimpleDateFormat TRACE_DATE_FORMAT = new SimpleDateFormat("HH:mm:ss.SSS"); //$NON-NLS-1$ private static AptPlugin thePlugin = null; // singleton object @@ -244,7 +234,7 @@ private static AptProject getAptProject(IJavaProject javaProject, boolean create } } } - + public static void cleanProjectCache() { synchronized(PROJECT_MAP){ PROJECT_MAP.clear(); diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptProject.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptProject.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/AptProject.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/AptProject.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/ClassServiceFactory.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/ClassServiceFactory.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/ClassServiceFactory.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/ClassServiceFactory.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/ExtJarFactoryContainer.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/ExtJarFactoryContainer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/ExtJarFactoryContainer.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/ExtJarFactoryContainer.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/FactoryPluginManager.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/FactoryPluginManager.java similarity index 90% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/FactoryPluginManager.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/FactoryPluginManager.java index 8b72e5dffa6..e0916b111d2 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/FactoryPluginManager.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/FactoryPluginManager.java @@ -15,20 +15,23 @@ package org.eclipse.jdt.apt.core.internal; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.TreeMap; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.apt.core.internal.util.FactoryContainer; import org.eclipse.jdt.apt.core.internal.util.FactoryPath; +import org.eclipse.jdt.core.JavaCore; import com.sun.mirror.apt.AnnotationProcessorFactory; @@ -38,6 +41,8 @@ * @since 3.3 */ public class FactoryPluginManager { + private static final String EXTENSION_POINT_ID = "annotationProcessorFactory"; //$NON-NLS-1$ + /** * Map of factory names -> factories. A single plugin factory container may * contain multiple annotation processor factories, each with a unique name. @@ -160,24 +165,19 @@ private static synchronized void loadFactoryPlugins() { if (mapsInitialized) { return; } - IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint( - AptPlugin.PLUGIN_ID, // name of plugin that exposes this extension point - "annotationProcessorFactory"); //$NON-NLS-1$ - extension id + var extensionRegistry = Platform.getExtensionRegistry(); + List elements = new ArrayList<>(); + elements.addAll(Arrays.asList(extensionRegistry.getConfigurationElementsFor(AptPlugin.PLUGIN_ID, EXTENSION_POINT_ID))); // legacy + elements.addAll(Arrays.asList(extensionRegistry.getConfigurationElementsFor(JavaCore.PLUGIN_ID, EXTENSION_POINT_ID))); // Iterate over all declared extensions of this extension point. // A single plugin may extend the extension point more than once, although it's not recommended. - for (IExtension extension : extensionPoint.getExtensions()) - { - // Iterate over the children of the extension to find one named "factories". - for(IConfigurationElement factories : extension.getConfigurationElements()) - { - if ("factories".equals(factories.getName())) { //$NON-NLS-1$ - name of configElement - loadJava5Factories(extension, factories); - } - else if ("java6processors".equals(factories.getName())) { //$NON-NLS-1$ - name of configElement - loadJava6Factories(extension, factories); - } - + // Iterate over the children of the extension to find one named "factories". + for(IConfigurationElement factories : elements) { + if ("factories".equals(factories.getName())) { //$NON-NLS-1$ - name of configElement + loadJava5Factories(factories.getDeclaringExtension(), factories); + } else if ("java6processors".equals(factories.getName())) { //$NON-NLS-1$ - name of configElement + loadJava6Factories(factories.getDeclaringExtension(), factories); } } mapsInitialized = true; diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/IServiceFactory.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/IServiceFactory.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/IServiceFactory.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/IServiceFactory.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarClassLoader.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/JarClassLoader.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarClassLoader.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/JarClassLoader.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarFactoryContainer.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/JarFactoryContainer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/JarFactoryContainer.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/JarFactoryContainer.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/LoadFailureHandler.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/LoadFailureHandler.java similarity index 95% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/LoadFailureHandler.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/LoadFailureHandler.java index cf1f8ab24a3..d517607a785 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/LoadFailureHandler.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/LoadFailureHandler.java @@ -20,6 +20,7 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.apt.core.internal.env.APTProblem; import org.eclipse.jdt.core.IJavaProject; /** @@ -68,7 +69,7 @@ private void reportMissingLibraries() { String message = Messages.bind( Messages.AnnotationProcessorFactoryLoader_factorypath_missingLibrary, new String[] {fc, _project.getName()}); - IMarker marker = _project.createMarker(AptPlugin.APT_LOADER_PROBLEM_MARKER); + IMarker marker = _project.createMarker(APTProblem.APT_LOADER_PROBLEM_MARKER); marker.setAttributes( new String[] { IMarker.MESSAGE, @@ -104,7 +105,7 @@ private void reportFailureToLoadFactories() { String message = Messages.bind( Messages.AnnotationProcessorFactoryLoader_unableToLoadFactoryClass, new String[] {factoryName, _project.getName()}); - IMarker marker = _project.createMarker(AptPlugin.APT_LOADER_PROBLEM_MARKER); + IMarker marker = _project.createMarker(APTProblem.APT_LOADER_PROBLEM_MARKER); marker.setAttributes( new String[] { IMarker.MESSAGE, diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/Messages.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/Messages.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/Messages.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/Messages.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/NonEclipseImplementationException.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/NonEclipseImplementationException.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/NonEclipseImplementationException.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/NonEclipseImplementationException.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/PluginFactoryContainer.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/PluginFactoryContainer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/PluginFactoryContainer.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/PluginFactoryContainer.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/VarJarFactoryContainer.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/VarJarFactoryContainer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/VarJarFactoryContainer.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/VarJarFactoryContainer.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/WkspJarFactoryContainer.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/WkspJarFactoryContainer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/WkspJarFactoryContainer.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/WkspJarFactoryContainer.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/build/Messages.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/build/Messages.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/build/Messages.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/build/Messages.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/build/messages.properties b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/build/messages.properties similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/build/messages.properties rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/build/messages.properties diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedAnnotationElementDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedAnnotationElementDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedAnnotationElementDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedAnnotationElementDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedConstructorDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedConstructorDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedConstructorDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedConstructorDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedExecutableDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedExecutableDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedExecutableDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedExecutableDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedFieldDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedFieldDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedFieldDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedFieldDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMemberDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMemberDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMemberDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMemberDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMethodDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMethodDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMethodDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ASTBasedMethodDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationElementDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationElementDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationElementDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationElementDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationMirrorImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationMirrorImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationMirrorImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationMirrorImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationValueImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationValueImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/AnnotationValueImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/AnnotationValueImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/BinaryParameterDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/BinaryParameterDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/BinaryParameterDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/BinaryParameterDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ClassDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ClassDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ClassDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ClassDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ConstructorDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ConstructorDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ConstructorDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ConstructorDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/DeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/DeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/DeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/DeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EclipseDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EclipseDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EclipseDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EclipseDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorObject.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorObject.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorObject.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorObject.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorType.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorType.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EclipseMirrorType.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EnumConstantDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EnumConstantDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EnumConstantDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EnumConstantDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EnumDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EnumDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/EnumDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/EnumDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ExecutableDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ExecutableDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ExecutableDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ExecutableDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ExecutableUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ExecutableUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/ExecutableUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/ExecutableUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/FieldDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/FieldDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/FieldDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/FieldDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/InterfaceDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/InterfaceDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/InterfaceDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/InterfaceDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/MemberDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/MemberDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/MemberDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/MemberDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/MethodDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/MethodDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/MethodDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/MethodDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImplNoBinding.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImplNoBinding.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImplNoBinding.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/PackageDeclarationImplNoBinding.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/SourceParameterDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/SourceParameterDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/SourceParameterDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/SourceParameterDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/TypeDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/TypeDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/TypeDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/TypeDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/TypeParameterDeclarationImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/TypeParameterDeclarationImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/declaration/TypeParameterDeclarationImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/declaration/TypeParameterDeclarationImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/APTProblem.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/APTProblem.java similarity index 72% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/APTProblem.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/APTProblem.java index 9089374741b..db8458a503b 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/APTProblem.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/APTProblem.java @@ -14,13 +14,25 @@ package org.eclipse.jdt.apt.core.internal.env; import org.eclipse.core.resources.IFile; -import org.eclipse.jdt.apt.core.internal.AptPlugin; import org.eclipse.jdt.apt.core.internal.env.MessagerImpl.Severity; import org.eclipse.jdt.apt.core.util.EclipseMessager; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.compiler.CategorizedProblem; -class APTProblem extends CategorizedProblem +public class APTProblem extends CategorizedProblem { + + public static final String APT_BATCH_PROCESSOR_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".apt.marker"; //$NON-NLS-1$ + /** Marker ID used for build problem, e.g., missing factory jar */ + public static final String APT_LOADER_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".apt.buildproblem"; //$NON-NLS-1$ + /** Marker ID used for configuration problem, e.g generated source folder not on classpath */ + public static final String APT_CONFIG_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".apt.configproblem"; //$NON-NLS-1$ + /** Marker ID used for posting problems during reconcile/build */ + public static final String APT_COMPILATION_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".apt.compile.problem"; //$NON-NLS-1$ + /** Marker ID used for posting problems during build by processors that don't run in reconcile */ + public static final String APT_NONRECONCILE_COMPILATION_PROBLEM_MARKER = JavaCore.PLUGIN_ID + ".apt.nonreconcile.compile.problem"; //$NON-NLS-1$ + + private static final String[] NO_ARGS = new String[0]; private final Severity _severity; private int _startingOffset; @@ -48,7 +60,7 @@ class APTProblem extends CategorizedProblem _line = line; _resource = file; _arguments = arguments; - _markerType = isNonReconcile ? AptPlugin.APT_NONRECONCILE_COMPILATION_PROBLEM_MARKER : AptPlugin.APT_COMPILATION_PROBLEM_MARKER; + _markerType = isNonReconcile ? APT_NONRECONCILE_COMPILATION_PROBLEM_MARKER : APT_COMPILATION_PROBLEM_MARKER; } @Override diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/AbstractCompilationEnv.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/AbstractCompilationEnv.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/AbstractCompilationEnv.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/AbstractCompilationEnv.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/AnnotationInvocationHandler.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/AnnotationInvocationHandler.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/AnnotationInvocationHandler.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/AnnotationInvocationHandler.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BinaryFileOutputStream.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BinaryFileOutputStream.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BinaryFileOutputStream.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BinaryFileOutputStream.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BuildEnv.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BuildEnv.java similarity index 99% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BuildEnv.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BuildEnv.java index f418e5f4458..ef76b70e5a9 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BuildEnv.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BuildEnv.java @@ -580,7 +580,7 @@ public void run(IProgressMonitor monitor) { for( MarkerInfo markerInfo : _markerInfos ){ try{ - final IMarker marker = _javaProject.getProject().createMarker(AptPlugin.APT_BATCH_PROCESSOR_PROBLEM_MARKER); + final IMarker marker = _javaProject.getProject().createMarker(APTProblem.APT_BATCH_PROCESSOR_PROBLEM_MARKER); markerInfo.copyIntoMarker(marker); } catch(CoreException e){ diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BuildFilerImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BuildFilerImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BuildFilerImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/BuildFilerImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/EclipseRoundCompleteEvent.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/EclipseRoundCompleteEvent.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/EclipseRoundCompleteEvent.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/EclipseRoundCompleteEvent.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/EncodedFileOutputStream.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/EncodedFileOutputStream.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/EncodedFileOutputStream.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/EncodedFileOutputStream.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/EnvUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/EnvUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/EnvUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/EnvUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/FilerImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/FilerImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/FilerImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/FilerImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/ITypeConstants.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/ITypeConstants.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/ITypeConstants.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/ITypeConstants.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/JavaSourceFilePrintWriter.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/JavaSourceFilePrintWriter.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/JavaSourceFilePrintWriter.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/JavaSourceFilePrintWriter.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/MarkerInfo.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/MarkerInfo.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/MarkerInfo.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/MarkerInfo.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/MessagerImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/MessagerImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/MessagerImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/MessagerImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/NoOpOutputStream.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/NoOpOutputStream.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/NoOpOutputStream.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/NoOpOutputStream.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/NoOpPrintWriter.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/NoOpPrintWriter.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/NoOpPrintWriter.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/NoOpPrintWriter.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/ReconcileEnv.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/ReconcileEnv.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/ReconcileEnv.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/ReconcileEnv.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/ReconcileFilerImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/ReconcileFilerImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/ReconcileFilerImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/env/ReconcileFilerImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/ClasspathUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/ClasspathUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/ClasspathUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/ClasspathUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/CompilationUnitHelper.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/CompilationUnitHelper.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/CompilationUnitHelper.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/CompilationUnitHelper.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/FileGenerationResult.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/FileGenerationResult.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/FileGenerationResult.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/FileGenerationResult.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileManager.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileManager.java similarity index 99% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileManager.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileManager.java index 4ed4ae8c97b..1fe6fa26758 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileManager.java +++ b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileManager.java @@ -41,6 +41,7 @@ import org.eclipse.jdt.apt.core.internal.AptPlugin; import org.eclipse.jdt.apt.core.internal.AptProject; import org.eclipse.jdt.apt.core.internal.Messages; +import org.eclipse.jdt.apt.core.internal.env.APTProblem; import org.eclipse.jdt.apt.core.internal.util.FileSystemUtil; import org.eclipse.jdt.apt.core.internal.util.ManyToMany; import org.eclipse.jdt.core.ElementChangedEvent; @@ -351,7 +352,7 @@ public void compilationStarted() try { // clear out any generated source folder config markers if(!_gsfm.isTestCode()) { - IMarker[] markers = _jProject.getProject().findMarkers(AptPlugin.APT_CONFIG_PROBLEM_MARKER, true, + IMarker[] markers = _jProject.getProject().findMarkers(APTProblem.APT_CONFIG_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE); if (markers != null) { for (IMarker marker : markers) @@ -506,7 +507,7 @@ public FileGenerationResult generateFileDuringBuild(Collection parentFile // then it doesn't matter that the classpath is wrong. String message = Messages.bind(Messages.GeneratedFileManager_missing_classpath_entry, new String[] { gpfr.name }); - IMarker marker = _jProject.getProject().createMarker(AptPlugin.APT_CONFIG_PROBLEM_MARKER); + IMarker marker = _jProject.getProject().createMarker(APTProblem.APT_CONFIG_PROBLEM_MARKER); marker.setAttributes(new String[] { IMarker.MESSAGE, IMarker.SEVERITY, IMarker.SOURCE_ID }, new Object[] { message, IMarker.SEVERITY_ERROR, AptPlugin.APT_MARKER_SOURCE_ID }); // disable any future type generation diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileMap.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileMap.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileMap.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedFileMap.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedResourceChangeListener.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedResourceChangeListener.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedResourceChangeListener.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedResourceChangeListener.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedSourceFolderManager.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedSourceFolderManager.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedSourceFolderManager.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/GeneratedSourceFolderManager.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/WorkingCopyCleanupListener.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/WorkingCopyCleanupListener.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/generatedfile/WorkingCopyCleanupListener.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/generatedfile/WorkingCopyCleanupListener.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/messages.properties b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/messages.properties similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/messages.properties rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/messages.properties diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/ArrayTypeImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/ArrayTypeImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/ArrayTypeImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/ArrayTypeImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/ErrorType.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/ErrorType.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/ErrorType.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/ErrorType.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/PrimitiveTypeImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/PrimitiveTypeImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/PrimitiveTypeImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/PrimitiveTypeImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/VoidTypeImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/VoidTypeImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/VoidTypeImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/VoidTypeImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/WildcardTypeImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/WildcardTypeImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/type/WildcardTypeImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/type/WildcardTypeImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/AnnotationScanner.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/AnnotationScanner.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/AnnotationScanner.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/AnnotationScanner.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/AptCorePreferenceInitializer.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/AptCorePreferenceInitializer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/AptCorePreferenceInitializer.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/AptCorePreferenceInitializer.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/CharArrayAnnotationScanner.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/CharArrayAnnotationScanner.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/CharArrayAnnotationScanner.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/CharArrayAnnotationScanner.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/DeclarationsUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/DeclarationsUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/DeclarationsUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/DeclarationsUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/Factory.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/Factory.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/Factory.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/Factory.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FactoryContainer.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FactoryContainer.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FactoryContainer.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FactoryContainer.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FactoryPath.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FactoryPath.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FactoryPath.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FactoryPath.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FactoryPathUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FactoryPathUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FactoryPathUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FactoryPathUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FileSystemUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FileSystemUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/FileSystemUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/FileSystemUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/InputStreamAnnotationScanner.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/InputStreamAnnotationScanner.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/InputStreamAnnotationScanner.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/InputStreamAnnotationScanner.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/ManyToMany.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/ManyToMany.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/ManyToMany.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/ManyToMany.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/Messages.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/Messages.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/Messages.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/Messages.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/PackageUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/PackageUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/PackageUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/PackageUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/ReaderAnnotationScanner.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/ReaderAnnotationScanner.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/ReaderAnnotationScanner.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/ReaderAnnotationScanner.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/ScannerUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/ScannerUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/ScannerUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/ScannerUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/SourcePositionImpl.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/SourcePositionImpl.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/SourcePositionImpl.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/SourcePositionImpl.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/TestCodeUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/TestCodeUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/TestCodeUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/TestCodeUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/TypesUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/TypesUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/TypesUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/TypesUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/Visitors.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/Visitors.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/Visitors.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/Visitors.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/messages.properties b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/messages.properties similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/util/messages.properties rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/internal/util/messages.properties diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/AptConfig.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/AptConfig.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/AptConfig.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/AptConfig.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/AptPreferenceConstants.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/AptPreferenceConstants.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/AptPreferenceConstants.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/AptPreferenceConstants.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/AptUtil.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/AptUtil.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/AptUtil.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/AptUtil.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/EclipseMessager.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/EclipseMessager.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/EclipseMessager.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/EclipseMessager.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/IFactoryPath.java b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/IFactoryPath.java similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/IFactoryPath.java rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/IFactoryPath.java diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/package.html b/org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/package.html similarity index 100% rename from org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/util/package.html rename to org.eclipse.jdt.core/apt/org/eclipse/jdt/apt/core/util/package.html diff --git a/org.eclipse.jdt.core/apt_build_notes.html b/org.eclipse.jdt.core/apt_build_notes.html new file mode 100644 index 00000000000..287daaf5981 --- /dev/null +++ b/org.eclipse.jdt.core/apt_build_notes.html @@ -0,0 +1,380 @@ + + + + + + + Eclipse Platform Release Notes (3.6) - JDT Annotation Processing + + + + +

Eclipse Platform Build Notes (3.6)
+JDT Annotation Processing

+ +

Integration Build (March 05, 2011, 11:48 a.m.)

+

Problem reports updated

+

+Bug 338370. NPE in BatchFilerImpl.getResource (FIXED)
+Bug 338625. 23 compile warnings in official build (FIXED)
+

+

Integration Build (January 20, 2011)

+

Problem reports updated

+

+Bug 301894. OutOfMemory error when building a large project with annotations
+

+ +

Integration Build (July 26, 2010, 11:03 p.m.)

+

Problem reports updated

+

+Bug 320195. Eclipse hangs when processing annotation (FIXED)
+

+ +

Integration Build (July 06, 2010, 10:04 p.m.)

+

Problem reports updated

+

+Bug 313324. Suspicious fall-through (NEW)
+

+ +

Integration Build (April 20, 2010, 11:23 p.m.)

+

Problem reports updated

+

+Bug 261969. classElement.getAnnotation(...).value() returns null in some cases for String[] properties (FIXED)
+Bug 290780. org.eclipse.jdt.compiler.apt does not export all its packages (FIXED)
+Bug 308555. The ".factorypath" doesn't have a team file type registered (FIXED)
+

+ +

Integration Build (September 21, 2009, 10:36 p.m.)

+

Problem reports updated

+

+Bug 290027. Use IResource#setDerived(boolean, IProgressMonitor) instead of IResource#setDerived(boolean) (NEW)
+

+ +

Integration Build (August 21, 2009, 11:24 p.m.) - 3.5.1

+

Problem reports updated

+

+Bug 287323. [compiler][apt] Error type detection is too conservative (FIXED)
+

+ +

Integration Build (August 17, 2009, 11:24 p.m.)

+

Problem reports updated

+

+Bug 285838. [apt] IdeFilerImpl breaks javax.annotation.processing.Filer contract (FIXED)
+

+ +

Integration Build (April 26, 2009, 12:24 a.m.)

+

Problem reports updated

+

+Bug 263985. APT errors on a clean build (DUPLICATE)
+Bug 269934. [apt] APT-generated classes that contain annotations causes NPE (FIXED)
+

+ +

Integration Build (April 13, 2009, 9:48 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (January 12, 2009, 11:37 p.m.)

+

Problem reports updated

+

+Bug 258917. [jsr269] Not-yet-implemented methods in Java 6 APT (FIXED)
+Bug 259248. [jsr269] TypesImpl#isSubtype not yet implemented in APT6 (FIXED)
+Bug 259249. [jsr269] VariableElementImpl#getEnclosingElement not yet implemented in APT6 (FIXED)
+

+ +

Integration Build (January 05, 2009, 11:26 a.m.)

+

Problem reports updated

+

+

+ +

Integration Build (December 09, 2008, 12:16 a.m.)

+

Problem reports updated

+

+Bug 256184. getDeclaredType throws IllegalArgumentException for array types (FIXED)
+

+ +

Integration Build (November 25, 2008, 7:10 a.m.)

+

Problem reports updated

+

+

+ +

Integration Build (November 25, 2008, 12:14 a.m.)

+

Problem reports updated

+

+

+ +

Integration Build (November 25, 2008, 12:09 a.m.)

+

Problem reports updated

+

+

+ +

Integration Build (November 08, 2008, 4:56 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (September 29, 2008, 9:56 p.m.)

+

Problem reports updated

+

+Bug 240264. UnsupportedOperationException in FileObject.getName (FIXED)
+Bug 246089. UnsupportedOperationException in FileObject.getCharContent (FIXED)
+Bug 248156. Implement FileObject.toUri() (FIXED)
+

+ +

Integration Build (September 02, 2008, 9:50 a.m.)

+

Problem reports updated

+

+Bug 245746. NPE org.eclipse.jdt.apt.core.internal.env.BaseProcessorEnv:491 (FIXED)
+

+ +

Integration Build (May 13, 2008, 9:33 a.m.)

+

Problem reports updated

+

+Bug 231496. Extraneous override: ErrorTypeElement#accept is a plain copy of TypeElementImpl#accept (FIXED)
+Bug 231521. JDT APT TypeElement#getInterfaces brings interfaces back when they are missing, while javac brings none (FIXED)
+

+ +

Integration Build (May 07, 2008, 8:39 a.m.)

+

Problem reports updated

+

+

+ +

Integration Build (April 29, 2008, 11:38 p.m.)

+

Problem reports updated

+

+Bug 228691. JDT impl of com.sun.mirror.util.Types.isAssignable() returns false for wrapper to primitive assignment (FIXED)
+

+ +

Integration Build (April 27, 2008, 11:27 a.m.)

+

Problem reports updated

+

+Bug 222735. DOM AST: hide recovered bindings unless 'recovered bindings' is enabled (FIXED)
+

+ +

Integration Build (April 14, 2008, 6:41 p.m.)

+

Problem reports updated

+

+Bug 218057. [jsr269] annotation values should preserve order (FIXED)
+

+ +

Integration Build (April 07, 2008, 10:43 a.m.)

+

Problem reports updated

+

+Bug 178138. APT writes to the log when a factory path entry is missing (FIXED)
+Bug 224424. Negative1 test failing on Linux (NEW)
+Bug 224943. Markers should have a sourceID set (FIXED)
+Bug 225611. APT test failure to delete parent file (FIXED)
+

+ +

Integration Build (March 29, 2008, 9:44 a.m.)

+

Problem reports updated

+

+Bug 224424. Negative1 test failing on Linux (NEW)
+Bug 224750. NPE during reconcile, in AbstractCompilationEnv.getAnnotationTypes() (FIXED)
+

+ +

Integration Build (March 27, 2008, 10:41 a.m.)

+

Problem reports updated

+

+Bug 224424. Negative1 test failing on Linux (NEW)
+

+ +

Integration Build (March 25, 2008, 5:41 p.m.)

+

Problem reports updated

+

+Bug 223281. isValidBinding() returns true for missing parameterized types (FIXED)
+

+ +

Integration Build (March 23, 2008, 11:10 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (March 17, 2008, 11:33 a.m.)

+

Problem reports updated

+

+Bug 208454. [prov] Provisioning of root files (NEW)
+

+ +

Integration Build (March 12, 2008, 8:48 a.m.)

+

Problem reports updated

+

+Bug 221267. [1.5][compiler] missing annotation bindings on interface method parameter (NEW)
+

+ +

Integration Build (February 25, 2008, 3:22 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (February 11, 2008, 3:21 p.m.)

+

Problem reports updated

+

+Bug 217002. Typo in javadoc for AptPreferenceConstants.PROCESSING_IN_EDITOR_DISABLED_OPTION (FIXED)
+

+ +

Integration Build (January 14, 2008, 11:49 a.m.)

+

Problem reports updated

+

+Bug 213540. Support Filer.getResource() in IDE (FIXED)
+

+ +

Integration Build (January 07, 2008, 3:36 p.m.)

+

Problem reports updated

+

+Bug 202956. APT should group their marker types (FIXED)
+Bug 213539. Support Filer.createClassFile() in IDE (NEW)
+Bug 213917. [apt] env.getPackage() returns corrupt packages (FIXED)
+

+ +

Integration Build (November 20, 2007, 9:10 a.m.)

+

Problem reports updated

+

+

+ +

Integration Build (November 19, 2007, ? p.m.)

+

Problem reports updated

+

+Bug 209715. org.eclipse.jdt.apt.core.util.AptPreferenceConstants should clarify its specification (FIXED)
+

+ +

Integration Build (November 12, 2007, 8:26 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (November 05, 2007, 5:36 p.m.)

+

Problem reports updated

+

+Bug 208186. Don't set encoding of generated file unless it needs to change (FIXED)
+

+ +

Integration Build (October 26, 2007, 6:26 p.m.)

+

Problem reports updated

+

+Bug 203241. [compiler] Missing warning when a serializable class without serialVersionUID is also abstract (FIXED)
+Bug 206591. AnnotationProcessorEnvironment.getTypeUtils().isSubtype does not work as expected (NEW)
+Bug 207408. non-translated marker name %aptNonreconcileBatchMarkerName (FIXED)
+

+ +

Integration Build (October 15, 2007, 4:20 p.m.)

+

Problem reports updated

+

+Bug 170692. Timeliness of problem removal with APT (FIXED)
+

+ +

Integration Build (October 02, 2007, 5:53 p.m.)

+

Problem reports updated

+

+Bug 190612. Implement JavaFileObject.openOutputStream() in IDE (FIXED)
+Bug 202548. APT plugins are missing .options files (FIXED)
+

+ +

Integration Build (September 20, 2007, 3:36 p.m.)

+

Problem reports updated

+

+Bug 203900. Generated file dependencies not always serialized (NEW)
+Bug 204056. disabling annotation processing from UI does not clean build state (ASSIGNED)
+

+ +

Integration Build (September 16, 2007, 4:46 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (September 13, 2007, 2:59 p.m.)

+

Problem reports updated

+

+Bug 200124. [jsr269] Implement createResourceFile in IDE (FIXED)
+Bug 201479. non-source generated files deleted improperly (FIXED)
+Bug 201931. pluggable FilerTests fail sporadically (NEW)
+

+ +

Integration Build (August 27, 2007, 12:51 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (August 20, 2007, 4:03 p.m.)

+

Problem reports updated

+

+Bug 188559. Delete files generated by Java 6 processors during build (NEW)
+Bug 190617. [jsr269] processors not getting called on final round (ASSIGNED)
+

+ +

Integration Build (July 23, 2007, 3:16 p.m.)

+

Problem reports updated

+

+Bug 190268. Need to perform a validateEdit() before setting encoding (FIXED)
+Bug 193784. Proprietary licenses (FIXED)
+Bug 197050. [jsr269] Support -XprintRounds and -XprintProcessorInfo (FIXED)
+

+ +

Integration Build (May 23, 2007, 9:07 a.m.)

+

Problem reports updated

+

+Bug 186427. Need a finally block in AptDispatchRunnable.build (FIXED)
+Bug 187135. AbortCompilationException when project is missing classes (FIXED)
+Bug 188185. RTTG_ENABLED_OPTION should ignore -A (FIXED)
+

+ +

Integration Build (May 14, 2007, 6:20 p.m.)

+

Problem reports updated

+

+Bug 171893. getPackage().getQualifiedName() is slow (FIXED)
+Bug 186740. [PERF] discard cached Problems after each build (FIXED)
+

+ +

Integration Build (May 10, 2007, 5:05 p.m.)

+

Problem reports updated

+

+Bug 178138. APT writes to the log when a factory path entry is missing (FIXED)
+Bug 181869. IllegalArgumentException with annotation value syntax error (FIXED)
+Bug 182364. Type checking is too aggressive (FIXED)
+Bug 185220. IDE java 6 APT support needs a Messager (FIXED)
+

+ +

Integration Build (May 02, 2007, 12:55 p.m.)

+

Problem reports updated

+

+Bug 184923. Deadlock in AnnotationProcessorFactoryLoader (FIXED)
+

+ +

Integration Build (May 01, 2007, 5:57 p.m.)

+

Problem reports updated

+

+Bug 178690. Processors should be able to disable reconcile-time type deletion (NEW)
+Bug 185010. Catch processor exceptions lower on the stack during reconcile (NEW)
+

+ +

Integration Build (April 16, 2007, 7:16 p.m.)

+

Problem reports updated

+

+

+ +

Integration Build (April 09, 2007, 6:36 p.m.)

+

Problem reports updated

+

+Bug 180595. Permit modification of AnnotationProcessorListeners during callback (FIXED)
+

+ +

Integration Build (April 02, 2007, 5:59 p.m.)

+

Problem reports updated

+

+Bug 175794. Type generation causes reported problems to disappear (ASSIGNED)
+Bug 177683. NPE in internal.util.Factory.createErrorClassType() (FIXED)
+

+ +

Integration Build (March 19, 2007, 00:10)

+

Java 6 annotation processing

+

+In this integration build, the Java 6 annotation processing API (JSR-269) has been partly enabled. Not all aspects of the API are yet working. +If you have specific use cases that need to be supported before you can to contribute testing, please feel free to enter bug reports +against the JDT APT component, or email jdt-apt-dev@eclipse.org. Please provide as much detail as possible. +

+ +

Problem reports updated

+

+Bug 176883. Deleted files not being properly reported (FIXED)
+Bug 176132. Add a flag to disable reconcile-time annotation processing (FIXED)
+

\ No newline at end of file diff --git a/org.eclipse.jdt.core/apt_design-notes.html b/org.eclipse.jdt.core/apt_design-notes.html new file mode 100644 index 00000000000..c79e6f016fe --- /dev/null +++ b/org.eclipse.jdt.core/apt_design-notes.html @@ -0,0 +1,227 @@ + + + + +Eclipse APT Design Notes + + +

Overview

+

Annotation processors may implement either the Java 5 com.sun.mirror.apt interfaces or the +Java 6 javax.annotation.processing interfaces. The two interfaces are functionally similar but +the details are different. Note that although the Java 5 apt tool has been deprecated by Sun, +it is still included in the Java 6 JDK and developers continue to write processors against it. +However, the com.sun.mirror.apt interface is considered proprietary and there are no Java +compliance tests which validate it. +

+ +

Build Process

+

The JDT system performs three kinds of build: full build, incremental build, and reconcile. When +a single file is edited and saved (if autobuild is enabled) or manually built, an incremental +build is performed: only the affected files will be rebuilt. This will include the edited file +as well as any other files with relevant dependencies on the edited file. After a clean, or +when incremental build detects an overwhelming number of files needing to be rebuilt, a full +build will be performed; in this case every file in the project will be rebuilt. During an +editing session, prior to saving, a file will frequently be reconciled, in order to identify +errors while typing. Reconcile operates on only a single file at a time.

+

+Java 5 and Java 6 processors are handled by different code and interact with the Eclipse Java +compiler in different ways and at different points in the build cycle. This is partly for +historical reasons and partly in order to support Java 6 processors in the context of the +command-line Eclipse compiler (ecj.jar). The Java 5 annotation processing code is built against +the JDT's public API; the Java 6 code uses internal interfaces within the compiler, which was +necessary because the public APIs use platform classes not available in the command-line package. +A pleasant consequence is that the Java 6 annotation processing code is somewhat easier +to understand.

+

+The main challenge of introducing APT into Eclipse is that annotation processors can contribute +additional Java types, which must in turn be compiled; this compilation can affect previously +compiled types, because a formerly unresolved reference can be resolved. Because of this, it +is necessary for annotation processing to be implemented within the compile process, rather than +as a later build step.

+

+TODO: overview of build process, i.e., when Java 5 processors are called relative to Java 6 processors +

+

Java 5 Build-time Processing

+

+The invocation path for Java 5 processors is quite complex, in part because when Java 5 processing +was implemented it was not possible to integrate it closely with the compiler, and in part for +silly historical reasons that serve no current purpose. It is ripe for refactoring.

+

+A typical call stack when a Java 5 processor is invoked looks like this:

+
+	SomeProcessor.process() line: xxx	
+	APTDispatchRunnable.dispatchToFileBasedProcessor(AbstractCompilationEnv, boolean, boolean) line: 628	
+	APTDispatchRunnable.runAPTInFileBasedMode(BuildEnv) line: 317	
+	APTDispatchRunnable.build(BuildEnv) line: 655	
+	APTDispatchRunnable.access$1(APTDispatchRunnable, BuildEnv) line: 647	
+	APTDispatchRunnable$1.run(AbstractCompilationEnv) line: 265	
+	BuildEnv$CallbackRequestor.acceptBinding(String, IBinding) line: 611	
+	CompilationUnitResolver.resolve(ICompilationUnit[], String[], ASTRequestor, int, Map, WorkingCopyOwner, int) line: 766	
+	CompilationUnitResolver.resolve(ICompilationUnit[], String[], ASTRequestor, int, Map, IJavaProject, WorkingCopyOwner, int, IProgressMonitor) line: 478	
+	ASTParser.createASTs(ICompilationUnit[], String[], ASTRequestor, IProgressMonitor) line: 737	
+	BaseProcessorEnv.createASTs(IJavaProject, ICompilationUnit[], ASTRequestor) line: 856	
+	BuildEnv.createASTs(BuildContext[]) line: 356	
+	AbstractCompilationEnv.newBuildEnv(BuildContext[], BuildContext[], IJavaProject, AbstractCompilationEnv$EnvCallback) line: 111	
+	APTDispatchRunnable.build() line: 271	
+	APTDispatchRunnable.run(IProgressMonitor) line: 217	
+	Workspace.run(IWorkspaceRunnable, ISchedulingRule, int, IProgressMonitor) line: 1800	
+	APTDispatchRunnable.runAPTDuringBuild(BuildContext[], BuildContext[], Map<IFile,CategorizedProblem[]>, AptProject, Map<AnnotationProcessorFactory,Attributes>, Set<AnnotationProcessorFactory>, boolean) line: 142	
+	AptCompilationParticipant.processAnnotations(BuildContext[]) line: 193	
+	IncrementalImageBuilder(AbstractImageBuilder).processAnnotations(CompilationParticipantResult[]) line: 627	
+	IncrementalImageBuilder(AbstractImageBuilder).compile(SourceFile[]) line: 338	
+	IncrementalImageBuilder.build(SimpleLookupTable) line: 134	
+	JavaBuilder.buildDeltas(SimpleLookupTable) line: 265	
+	JavaBuilder.build(int, Map, IProgressMonitor) line: 193	
+	[higher calls omitted for brevity]
+
+

+Java 5 processors are invoked via the CompilationParticipant interface. The Java compiler calls +AptCompilationParticipant.processAnnotations(), passing in a list of all the files being built. +Note that the compiler may break large projects into multiple groups of files, resulting in +multiple calls to processAnnotations(). Files are marked with whether or not they contain annotations.

+

+Within processAnnotations(), annotation processor factories are discovered from the processor +factory path (and cached for subsequent invocations); factories and files are then passed in to +APTDispatchRunnable.runAPTDuringBuild(). This in turn stores the information in a new instance of +APTDispatchRunnable, and invokes its run() method within a workspace.run() operation.

+

+The run() method invokes BuildEnv.newBuildEnv(), passing in the AptDispatchRunnable as a callback. +The newBuildEnv() method creates a BuildEnv, gets compilation units for each of the files being +compiled, and then requests ASTs for each of the files. The parser is passed an ASTRequestor +callback that is implemented by an inner class of the BuildEnv; in this way, when the ASTs are +ready for consumption, APTDispatchRunnable.build(BuildEnv) is ultimately called, within the +ASTRequestor callback.

+

+Finally, within build(), processors are selected on the basis of the +annotations they support, and each processor's process() method is called on each appropriate file, +configuring the BuildEnv before each process() invocation so that it will provide the correct data. +The details of this vary depending on whether the processor is normal (file-based) or is marked +as requiring batch mode.

+

Batch-mode Processors

+

Processors can be marked in the Advanced Factory Path Options dialog as requiring batch mode. +If any of the processors on the project's factory path require batch mode, +AptDispatchRunnable.build(BuildEnv) calls runAPTInMixedMode(); if none of the processors +requires batch mode, runAPTInFileBasedMode() is called instead. The chief difference is that +batch-mode processors are only run during a full build, and that the batch-mode implementation of +AnnotationProcessorEnvironment.getTypeDeclarations() returns all the compilation units in the +build, whereas the normal implementation returns only a single compilation unit at a time.

+

+Additionally, a separate classloader is used to load batch-mode processors, and it is +discarded after each build; thus the classes are reloaded for each build, and static variables +are reinitialized. This is important because some processors written with command-line +(non-incremental) compilation in mind store dynamic state in static variables and thus cannot +be invoked multiple times. +

+

File-mode Processors

+

Most processors are designed (or at least should be designed) to support incremental compilation, +meaning that within the AnnotationProcessor.process() invocation, if the processor calls +AnnotationProcessorEnvironment.getTypeDeclarations(), it will only retrieve a single type at a +time; the process() method will be called repeatedly during the course of a build so that all +files are eventually processed. +

+

Java 6 Build-time Processing

+

+The invocation process for Java 6 processors is more straightforward. A typical call stack looks +like this:

+
+	ModelTesterProc.process(Set<TypeElement>, RoundEnvironment) line: 107	
+	RoundDispatcher.handleProcessor(ProcessorInfo) line: 139	
+	RoundDispatcher.round() line: 121	
+	IdeAnnotationProcessorManager(BaseAnnotationProcessorManager).processAnnotations(CompilationUnitDeclaration[], ReferenceBinding[], boolean) line: 159	
+	IdeAnnotationProcessorManager.processAnnotations(CompilationUnitDeclaration[], ReferenceBinding[], boolean) line: 134	
+	Compiler.processAnnotations() line: 810	
+	Compiler.compile(ICompilationUnit[]) line: 428	
+	IncrementalImageBuilder(AbstractImageBuilder).compile(SourceFile[], SourceFile[], boolean) line: 364	
+	IncrementalImageBuilder.compile(SourceFile[], SourceFile[], boolean) line: 321	
+	IncrementalImageBuilder(AbstractImageBuilder).compile(SourceFile[]) line: 301	
+	IncrementalImageBuilder.build(SimpleLookupTable) line: 134	
+	JavaBuilder.buildDeltas(SimpleLookupTable) line: 265	
+	JavaBuilder.build(int, Map, IProgressMonitor) line: 193	
+	[higher calls omitted for brevity]
+
+

+Note that the processing is performed by an IdeAnnotationProcessorManager; this is distinguished +from the BatchAnnotationProcessorManager, which would be used if processing was invoked from a +command line (ecj.jar) compilation. Command-line compilation with ecj.jar uses the same typesystem +implementation as IDE compilation, but somewhat different Messager and Filer implementations. +

+

Reconcile-time Processing

+

+Reconcile-time processing is only supported for Java 5 processors. This is chiefly because, after +developing the Java 5 processing implementation, it became clear that writing highly-performant +annotation processors requires a level of compiler experience that most programmers do not have, +and if less-performant processors are inserted into the reconcile step, reconcile can become +painfully and confusingly slow. Thus when the Java 6 processing implementation was added it was +decided to not support reconcile-time processing. Eclipse's effectiveness as an IDE depends on +reconcile being an extremely fast operation. In hindsight, edit-time processing should have been +limited to reporting errors, and should have been implemented as a background validation task +rather than within the reconcile step.

+

+TODO: describe practical differences between reconcile and build.

+

+The stack trace of a typical reconcile-time invocation looks like this:

+
+	SomeProcessor.process() line: xxx	
+	APTDispatchRunnable.dispatchToFileBasedProcessor(AbstractCompilationEnv, boolean, boolean) line: 628	
+	APTDispatchRunnable.access$0(APTDispatchRunnable, AbstractCompilationEnv, boolean, boolean) line: 598	
+	APTDispatchRunnable$ReconcileEnvCallback.run(AbstractCompilationEnv) line: 77	
+	ReconcileEnv$CallbackRequestor.acceptBinding(String, IBinding) line: 135	
+	CompilationUnitResolver.resolve(ICompilationUnit[], String[], ASTRequestor, int, Map, WorkingCopyOwner, int) line: 766	
+	CompilationUnitResolver.resolve(ICompilationUnit[], String[], ASTRequestor, int, Map, IJavaProject, WorkingCopyOwner, int, IProgressMonitor) line: 478	
+	ASTParser.createASTs(ICompilationUnit[], String[], ASTRequestor, IProgressMonitor) line: 737	
+	BaseProcessorEnv.createASTs(IJavaProject, ICompilationUnit[], ASTRequestor) line: 856	
+	ReconcileEnv.openPipeline() line: 108	
+	AbstractCompilationEnv.newReconcileEnv(ReconcileContext, AbstractCompilationEnv$EnvCallback) line: 97	
+	APTDispatchRunnable.reconcile(ReconcileContext, IJavaProject) line: 211	
+	APTDispatchRunnable.runAPTDuringReconcile(ReconcileContext, AptProject, Map<AnnotationProcessorFactory,Attributes>) line: 159	
+	AptCompilationParticipant.reconcile(ReconcileContext) line: 223	
+	ReconcileWorkingCopyOperation$1.run() line: 257	
+	SafeRunner.run(ISafeRunnable) line: 42	
+	ReconcileWorkingCopyOperation.notifyParticipants(CompilationUnit) line: 244	
+	ReconcileWorkingCopyOperation.executeOperation() line: 94	
+	ReconcileWorkingCopyOperation(JavaModelOperation).run(IProgressMonitor) line: 728	
+	ReconcileWorkingCopyOperation(JavaModelOperation).runOperation(IProgressMonitor) line: 788	
+	CompilationUnit.reconcile(int, int, WorkingCopyOwner, IProgressMonitor) line: 1242	
+	JavaReconcilingStrategy.reconcile(ICompilationUnit, boolean) line: 126	
+	[higher calls omitted for brevity]
+
+ +

Processor Callbacks

+

When annotation processors are invoked, they can in turn call back into the compiler through various +interfaces in order to generate new files and report errors. The interfaces are naturally not the same as +those used within the JDT compiler, so wrappers and proxies are employed to glue the different systems +together. The most significant difference in systems is that, in both the Java 5 and Java 6 processor +interfaces, the typesystem is separated into Type and Element hierarchies, in which a Type object +represents a particular reification of a type while an Element represents a declaration in code. The +distinction is easiest to understand in the context of generics: for example, the following code sample +contains declarations of classes Lister and Test, which contain declarations of method get() and fields +'strings' and 'numbers' respectively. The type of the return of get() is List<T>, the type of strings is +Lister<String>, and the type of numbers is Lister<Number>. Note that the single declaration of Lister<T> +was able to generate multiple Types. +

+
+  import java.util.List;
+  class Lister<T> {
+    List<T> get() { ... }
+  }
+  class Test {
+    Lister<String> strings;
+    Lister<Number> numbers;
+  }
+
+ +

Java 5 Type System

+

TODO

+ +

Java 5 Filer and Messager

+

TODO

+ +

Java 6 Type System

+

TODO

+ +

Java 6 Filer and Messager

+

TODO

+ + + \ No newline at end of file diff --git a/org.eclipse.jdt.core/build.properties b/org.eclipse.jdt.core/build.properties index 00d84d380fb..8c9fd1e1937 100644 --- a/org.eclipse.jdt.core/build.properties +++ b/org.eclipse.jdt.core/build.properties @@ -34,7 +34,8 @@ source.. = codeassist/,\ formatter/,\ dom/,\ search/,\ - model/ + model/,\ + apt/ output.. = bin/ output.jdtCompilerAdapter.jar = antbin/ source.jdtCompilerAdapter.jar = antadapter/ diff --git a/org.eclipse.jdt.core/mirror-api-license.txt b/org.eclipse.jdt.core/mirror-api-license.txt new file mode 100644 index 00000000000..32b9f303169 --- /dev/null +++ b/org.eclipse.jdt.core/mirror-api-license.txt @@ -0,0 +1,28 @@ +Copyright (c) 2004, Sun Microsystems, Inc.All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of the Sun Microsystems, Inc. nor the names of + its contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java index 0dc0eb2c53b..4ce65004579 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java @@ -158,6 +158,7 @@ import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.jdt.apt.core.internal.AptPlugin; import org.eclipse.jdt.core.compiler.CharOperation; import org.eclipse.jdt.core.compiler.IProblem; import org.eclipse.jdt.core.search.IJavaSearchConstants; @@ -3527,6 +3528,8 @@ public static boolean isSupportedJavaVersion(String version) { */ public static final String JAVA_FORMATTER_EXTENSION_POINT_ID = "javaFormatter" ; //$NON-NLS-1$ + private AptPlugin aptPlugin = null; + /** * Creates the Java core plug-in. *

@@ -3539,6 +3542,7 @@ public static boolean isSupportedJavaVersion(String version) { public JavaCore() { super(); JAVA_CORE_PLUGIN = this; + this.aptPlugin = new AptPlugin(); } /** @@ -6634,6 +6638,7 @@ public static Set getRequiredModulesFromJar(File file) { @Override public void stop(BundleContext context) throws Exception { try { + this.aptPlugin.start(context); JavaModelManager.unregisterDebugOptionsListener(); JavaModelManager.getJavaModelManager().shutdown(); } finally { @@ -6657,5 +6662,6 @@ public void start(BundleContext context) throws Exception { JavaModelManager.getJavaModelManager().startup(); // New index is disabled, see bug 544898 // Indexer.getInstance().rescanAll(); + this.aptPlugin.start(context); } } diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java index fc2ea679229..2b30b6e64b4 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java @@ -827,7 +827,8 @@ protected void storeProblemsFor(SourceFile sourceFile, CategorizedProblem[] prob attributes.put(extraAttributeNames[j], extraAttributeValues[j]); } } - resource.createMarker(markerType, attributes); + IMarker mark = resource.createMarker(markerType, attributes); + mark.exists(); if (!this.keepStoringProblemMarkers) return; // only want the one error recorded on this source file } diff --git a/org.eclipse.jdt.core/plugin.properties b/org.eclipse.jdt.core/plugin.properties index 7611e97e290..15888f9fcb3 100644 --- a/org.eclipse.jdt.core/plugin.properties +++ b/org.eclipse.jdt.core/plugin.properties @@ -32,3 +32,11 @@ jarManifestName=JAR Manifest File traceComponentLabel=JDT Core javaFormatterName=Java Formatter defaultJavaFormatterName=Eclipse [built-in] +# APT +annotationProcessorFactoriesName=Annotation Processor Factories +annotationProcessingName=Annotation Processing +aptBatchMarkerName=Annotation Problem +aptNonreconcileBatchMarkerName=Annotation Problem (build-only processor) +aptBuildMarkerName=APT Build Problem +aptConfigurationMarkerName=APT Configuration Problem +traceComponentLabel=JDT APT Core diff --git a/org.eclipse.jdt.core/plugin.xml b/org.eclipse.jdt.core/plugin.xml index 0569dff3f86..b8fb5cdbe76 100644 --- a/org.eclipse.jdt.core/plugin.xml +++ b/org.eclipse.jdt.core/plugin.xml @@ -300,4 +300,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jdt.core/pom.xml b/org.eclipse.jdt.core/pom.xml index a72549fd659..dea58410b7c 100644 --- a/org.eclipse.jdt.core/pom.xml +++ b/org.eclipse.jdt.core/pom.xml @@ -17,7 +17,7 @@ 4.33.0-SNAPSHOT org.eclipse.jdt.core - 3.38.100-SNAPSHOT + 3.39.0-SNAPSHOT eclipse-plugin diff --git a/org.eclipse.jdt.core/schema/annotationProcessorFactory.exsd b/org.eclipse.jdt.core/schema/annotationProcessorFactory.exsd new file mode 100644 index 00000000000..c3eea9d4402 --- /dev/null +++ b/org.eclipse.jdt.core/schema/annotationProcessorFactory.exsd @@ -0,0 +1,184 @@ + + + + + + + + + Plug-ins which contribute JSR-175 annotation processors should extend this extension point in order to participate in compilation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true if this processor should be enabled by default. This value +may be overridden via the annotation processing configuration settings. If not +present this value defaults to true. + + + + + + + + + + + + Qualified name of a class that implements com.sun.mirror.apt.AnnotationProcessorFactory and has a no-argument constructor. + + + + + + + + + + Reserved. Do not use this attribute. + + + + + + + + + + + + + + + + + + true if this processor should be enabled by default. This value +may be overridden via the annotation processing configuration settings. If not +present this value defaults to true. + + + + + + + + + + + + Qualified name of a class that implements javax.annotation.processing.Processor and has a no-argument constructor. + + + + + + + + + + + + + + + 3.39 + + + + + + + + + Example of a declaration of an <code>annotationProcessorFactory</code>: <pre> + <extension + point="org.eclipse.jdt.core.annotationProcessorFactory"> + <factories enableDefault="true"> + <factory + class="org.xyz.HelloWorldAnnotationProcessorFactory"> + </factory> + <factory + class="org.xyz.GoodNightMoonAnnotationProcessorFactory"> + </factory> + </factories> + </extension> +</pre> + + + + + + + + + Annotation processors must implement com.sun.mirror.apt.AnnotationProcessorFactory, or a subclass thereof. + + + + + + + + + + + + + + + + + + Copyright (c) 2005 BEA Systems, Inc and others.<br> + +This program and the accompanying materials +are made available under the terms of the Eclipse Public License 2.0 +which accompanies this distribution, and is available at +<a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-v20.html</a>/ + +SPDX-License-Identifier: EPL-2.0 + + + +