diff -r 36a8c469f74c api.java/apichanges.xml --- a/api.java/apichanges.xml Thu Apr 08 11:55:53 2010 +0200 +++ b/api.java/apichanges.xml Fri Apr 09 19:24:35 2010 +0200 @@ -73,6 +73,20 @@ + + + Introducing AnnotationProcessingQuery.Result.annotationProcessingEnabledInEditor + + + + + +

Adding AnnotationProcessingQuery.Result.annotationProcessingEnabledInEditor() to inform whether the annotation processors should be run inside Java editor. +

+ + + + Introducing AnnotationProcessingQuery.Result.processorOptions diff -r 36a8c469f74c api.java/manifest.mf --- a/api.java/manifest.mf Thu Apr 08 11:55:53 2010 +0200 +++ b/api.java/manifest.mf Fri Apr 09 19:24:35 2010 +0200 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.api.java/1 -OpenIDE-Module-Specification-Version: 1.26 +OpenIDE-Module-Specification-Version: 1.27 OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties AutoUpdate-Show-In-Client: false diff -r 36a8c469f74c api.java/src/org/netbeans/api/java/queries/AnnotationProcessingQuery.java --- a/api.java/src/org/netbeans/api/java/queries/AnnotationProcessingQuery.java Thu Apr 08 11:55:53 2010 +0200 +++ b/api.java/src/org/netbeans/api/java/queries/AnnotationProcessingQuery.java Fri Apr 09 19:24:35 2010 +0200 @@ -85,11 +85,18 @@ */ public static interface Result { + /**Whether the annotation processors should be run. + * + * @return true if and only if the annotation processors should be run + */ + public boolean annotationProcessingEnabled(); + /**Whether the annotation processors should be run inside Java editor. * * @return true if and only if the annotation processors should be run inside the Java editor + * @since org.netbeans.api.java/1 1.27 */ - public boolean annotationProcessingEnabled(); + public boolean annotationProcessingEnabledInEditor(); /**Which annotation processors should be run. * @@ -133,6 +140,10 @@ return false; } + public boolean annotationProcessingEnabledInEditor() { + return false; + } + public Iterable annotationProcessorsToRun() { return null; } diff -r 36a8c469f74c apisupport.project/manifest.mf --- a/apisupport.project/manifest.mf Thu Apr 08 11:55:53 2010 +0200 +++ b/apisupport.project/manifest.mf Fri Apr 09 19:24:35 2010 +0200 @@ -6,5 +6,5 @@ org.netbeans.api.javahelp.Help OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/resources/layer.xml AutoUpdate-Show-In-Client: false -OpenIDE-Module-Specification-Version: 1.40 +OpenIDE-Module-Specification-Version: 1.41 diff -r 36a8c469f74c apisupport.project/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java --- a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java Thu Apr 08 11:55:53 2010 +0200 +++ b/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java Fri Apr 09 19:24:35 2010 +0200 @@ -87,6 +87,11 @@ } @Override + public boolean annotationProcessingEnabledInEditor() { + return true; + } + + @Override public Iterable annotationProcessorsToRun() { return null; } diff -r 36a8c469f74c java.api.common/manifest.mf --- a/java.api.common/manifest.mf Thu Apr 08 11:55:53 2010 +0200 +++ b/java.api.common/manifest.mf Fri Apr 09 19:24:35 2010 +0200 @@ -1,4 +1,4 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.java.api.common/0 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.15 +OpenIDE-Module-Specification-Version: 1.16 diff -r 36a8c469f74c java.api.common/src/org/netbeans/modules/java/api/common/queries/AnnotationProcessingQueryImpl.java --- a/java.api.common/src/org/netbeans/modules/java/api/common/queries/AnnotationProcessingQueryImpl.java Thu Apr 08 11:55:53 2010 +0200 +++ b/java.api.common/src/org/netbeans/modules/java/api/common/queries/AnnotationProcessingQueryImpl.java Fri Apr 09 19:24:35 2010 +0200 @@ -114,6 +114,10 @@ } public boolean annotationProcessingEnabled() { + return TRUE.contains(evaluator.getProperty(annotationProcessingEnabledProperty)); + } + + public boolean annotationProcessingEnabledInEditor() { return TRUE.contains(evaluator.getProperty(annotationProcessingEnabledProperty)) && TRUE.contains(evaluator.getProperty(annotationProcessingEnabledInEditorProperty)); } diff -r 36a8c469f74c java.api.common/src/org/netbeans/modules/java/api/common/queries/QuerySupport.java --- a/java.api.common/src/org/netbeans/modules/java/api/common/queries/QuerySupport.java Thu Apr 08 11:55:53 2010 +0200 +++ b/java.api.common/src/org/netbeans/modules/java/api/common/queries/QuerySupport.java Fri Apr 09 19:24:35 2010 +0200 @@ -288,8 +288,9 @@ * @param helper project's AntProjectHelper * @param evaluator project's evaluator * @param annotationProcessingEnabledProperty property whose value says whether the annotation processing is enabled for the given project at all + * (will be returned from {@link Result#annotationProcessingEnabled()}) * @param annotationProcessingEnabledInEditorProperty property whose value says whether the annotation processing should be enabled - * in the editor (will be returned from {@link Result#annotationProcessingEnabled())} + * in the editor (will be returned from {@link Result#annotationProcessingEnabledInEditor()}) * @param runAllAnnotationProcessorsProperty when true, {@link Result#annotationProcessorsToRun()} will return null * @param annotationProcessorsProperty should contain comma separated list of annotation processors to run (will be returned from {@link Result#annotationProcessorsToRun()}) * @param sourceOutputProperty directory to which the annotation processors generate source files (will be returned from {@link Result#sourceOutputProperty()}) diff -r 36a8c469f74c java.freeform/manifest.mf --- a/java.freeform/manifest.mf Thu Apr 08 11:55:53 2010 +0200 +++ b/java.freeform/manifest.mf Fri Apr 09 19:24:35 2010 +0200 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.java.freeform/1 -OpenIDE-Module-Specification-Version: 1.18 +OpenIDE-Module-Specification-Version: 1.19 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/freeform/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/java/freeform/resources/layer.xml AutoUpdate-Show-In-Client: false diff -r 36a8c469f74c java.freeform/src/org/netbeans/modules/java/freeform/AnnotationProcessingQueryImpl.java --- a/java.freeform/src/org/netbeans/modules/java/freeform/AnnotationProcessingQueryImpl.java Thu Apr 08 11:55:53 2010 +0200 +++ b/java.freeform/src/org/netbeans/modules/java/freeform/AnnotationProcessingQueryImpl.java Fri Apr 09 19:24:35 2010 +0200 @@ -59,6 +59,9 @@ public @Override boolean annotationProcessingEnabled() { return true; } + public @Override boolean annotationProcessingEnabledInEditor() { + return false; + } public @Override Iterable annotationProcessorsToRun() { return null; } diff -r 36a8c469f74c java.j2seproject/nbproject/project.properties --- a/java.j2seproject/nbproject/project.properties Thu Apr 08 11:55:53 2010 +0200 +++ b/java.j2seproject/nbproject/project.properties Fri Apr 09 19:24:35 2010 +0200 @@ -39,7 +39,7 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.6 -spec.version.base=1.37.0 +spec.version.base=1.38.0 javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml diff -r 36a8c469f74c java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEPersistenceProvider.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEPersistenceProvider.java Thu Apr 08 11:55:53 2010 +0200 +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEPersistenceProvider.java Fri Apr 09 19:24:35 2010 +0200 @@ -315,8 +315,8 @@ changed = true; } } - if (!J2SEProjectUtil.isTrue(prop.getProperty(ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR))) { - prop.setProperty(ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR, "true"); //NOI18N + if (!J2SEProjectUtil.isTrue(prop.getProperty(ProjectProperties.ANNOTATION_PROCESSING_ENABLED))) { + prop.setProperty(ProjectProperties.ANNOTATION_PROCESSING_ENABLED, "true"); //NOI18N changed = true; } if (changed) { diff -r 36a8c469f74c java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectGenerator.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectGenerator.java Thu Apr 08 11:55:53 2010 +0200 +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectGenerator.java Fri Apr 09 19:24:35 2010 +0200 @@ -248,7 +248,7 @@ data.appendChild (testRoots); h.putPrimaryConfigurationData(data, true); ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_ENABLED, "true"); // NOI18N - ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR, "true"); // NOI18N + ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR, "false"); // NOI18N ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, "true"); // NOI18N ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ""); // NOI18N ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT, "${build.generated.sources.dir}/ap-source-output"); // NOI18N diff -r 36a8c469f74c java.source/nbproject/project.properties --- a/java.source/nbproject/project.properties Thu Apr 08 11:55:53 2010 +0200 +++ b/java.source/nbproject/project.properties Fri Apr 09 19:24:35 2010 +0200 @@ -43,7 +43,7 @@ javadoc.title=Java Source javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml -spec.version.base=0.57.0 +spec.version.base=0.58.0 test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/javac-api-nb-7.0-b07.jar test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\ ${o.n.core.dir}/lib/boot.jar:\ diff -r 36a8c469f74c java.source/src/org/netbeans/modules/java/source/indexing/APTUtils.java --- a/java.source/src/org/netbeans/modules/java/source/indexing/APTUtils.java Thu Apr 08 11:55:53 2010 +0200 +++ b/java.source/src/org/netbeans/modules/java/source/indexing/APTUtils.java Fri Apr 09 19:24:35 2010 +0200 @@ -119,6 +119,10 @@ return aptOptions.annotationProcessingEnabled(); } + public boolean aptEnabledInEditor() { + return aptOptions.annotationProcessingEnabledInEditor(); + } + public Collection resolveProcessors() { List urls = new LinkedList(); for (Entry e : processorPath.entries()) { diff -r 36a8c469f74c java.source/src/org/netbeans/modules/java/source/parsing/JavacParser.java --- a/java.source/src/org/netbeans/modules/java/source/parsing/JavacParser.java Thu Apr 08 11:55:53 2010 +0200 +++ b/java.source/src/org/netbeans/modules/java/source/parsing/JavacParser.java Fri Apr 09 19:24:35 2010 +0200 @@ -662,7 +662,8 @@ options.add("-g:vars"); // NOI18N, Make the compiler to maintain local variables table options.add("-source"); // NOI18N options.add(validatedSourceLevel.name); - boolean aptEnabled = aptUtils != null && aptUtils.aptEnabled() && !ClasspathInfoAccessor.getINSTANCE().getCachedClassPath(cpInfo, PathKind.SOURCE).entries().isEmpty(); + boolean aptEnabled = aptUtils != null && (backgroundCompilation ? aptUtils.aptEnabled() : aptUtils.aptEnabledInEditor()) + && !ClasspathInfoAccessor.getINSTANCE().getCachedClassPath(cpInfo, PathKind.SOURCE).entries().isEmpty(); if (aptEnabled) { for (Map.Entry entry : aptUtils.processorOptions().entrySet()) { StringBuilder sb = new StringBuilder();