Attachment #94730 for bug #181421

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 181421
Collapse All | Expand All




<!-- ACTUAL CHANGES BEGIN HERE: -->

<changes>
        <change id="ap-query-processoroptions">
            <api name="classpath"/>
            <summary>Introducing AnnotationProcessingQuery.Result.processorOptions</summary>
            <version major="1" minor="26"/>
            <date day="3" month="3" year="2010"/>
            <author login="dbalek"/>
            <compatibility addition="yes" modification="no" semantic="compatible" source="compatible" binary="compatible"/>
            <description>
                <p>Adding AnnotationProcessingQuery.Result.processorOptions() to return options passed to annotation processors (-Akey=value).
                </p>
            </description>
            <class package="org.netbeans.api.java.queries" name="AnnotationProcessingQuery" />
            <issue number="181421"/>
        </change>
        <change id="ap-query">
            <api name="classpath"/>
            <summary>Introducing AnnotationProcessingQuery</summary>

Lines 1-6 Link Here

(-)a/api.java/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.api.java/1	2	OpenIDE-Module: org.netbeans.api.java/1
3	OpenIDE-Module-Specification-Version: 1.25	3	OpenIDE-Module-Specification-Version: 1.26
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties
5	AutoUpdate-Show-In-Client: false	5	AutoUpdate-Show-In-Client: false
6		6

Lines 40-45 Link Here

(-)a/api.java/src/org/netbeans/api/java/queries/AnnotationProcessingQuery.java (+13 lines)
40	package org.netbeans.api.java.queries;	40	package org.netbeans.api.java.queries;
41		41
42	import java.net.URL;	42	import java.net.URL;
		43	import java.util.Collections;
		44	import java.util.Map;
43	import javax.swing.event.ChangeListener;	45	import javax.swing.event.ChangeListener;
44	import org.netbeans.api.annotations.common.CheckForNull;	46	import org.netbeans.api.annotations.common.CheckForNull;
45	import org.netbeans.api.annotations.common.NonNull;	47	import org.netbeans.api.annotations.common.NonNull;
Lines 103-108 Link Here
103	*/	105	*/
104	public @CheckForNull URL sourceOutputDirectory();	106	public @CheckForNull URL sourceOutputDirectory();
105		107
		108	/**Returns options passed to annotation processors (-Akey=value)
		109	*
		110	* @return a map of key=value options passed to annotation processors
		111	* @since org.netbeans.api.java/1 1.26
		112	*/
		113	public @NonNull Map<? extends String, ? extends String> processorOptions();
		114
106	/**Add a {@link ChangeListener}.	115	/**Add a {@link ChangeListener}.
107	*	116	*
108	* @param l the listener	117	* @param l the listener
Lines 129-134 Link Here
129	return null;	138	return null;
130	}	139	}
131		140
		141	public Map<? extends String, ? extends String> processorOptions() {
		142	return Collections.emptyMap();
		143	}
		144
132	public void addChangeListener(ChangeListener l) {}	145	public void addChangeListener(ChangeListener l) {}
133	public void removeChangeListener(ChangeListener l) {}	146	public void removeChangeListener(ChangeListener l) {}
134		147

Lines 6-10 Link Here

(-)a/apisupport.project/manifest.mf (-1 / +1 lines)
6	org.netbeans.api.javahelp.Help	6	org.netbeans.api.javahelp.Help
7	OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/resources/layer.xml	7	OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/resources/layer.xml
8	AutoUpdate-Show-In-Client: false	8	AutoUpdate-Show-In-Client: false
9	OpenIDE-Module-Specification-Version: 1.39	9	OpenIDE-Module-Specification-Version: 1.40
10		10

Lines 70-76 Link Here

(-)a/apisupport.project/nbproject/project.xml (-1 / +1 lines)
70	<compile-dependency/>	70	<compile-dependency/>
71	<run-dependency>	71	<run-dependency>
72	<release-version>1</release-version>	72	<release-version>1</release-version>
73	<specification-version>1.25</specification-version>	73	<specification-version>1.26</specification-version>
74	</run-dependency>	74	</run-dependency>
75	</dependency>	75	</dependency>
76	<dependency>	76	<dependency>

Lines 40-45 Link Here

(-)a/apisupport.project/src/org/netbeans/modules/apisupport/project/queries/AnnotationProcessingQueryImpl.java (+7 lines)
40	package org.netbeans.modules.apisupport.project.queries;	40	package org.netbeans.modules.apisupport.project.queries;
41		41
42	import java.net.URL;	42	import java.net.URL;
		43	import java.util.Collections;
		44	import java.util.Map;
43	import javax.swing.event.ChangeListener;	45	import javax.swing.event.ChangeListener;
44	import org.netbeans.api.java.queries.AnnotationProcessingQuery.Result;	46	import org.netbeans.api.java.queries.AnnotationProcessingQuery.Result;
45	import org.netbeans.modules.apisupport.project.NbModuleProject;	47	import org.netbeans.modules.apisupport.project.NbModuleProject;
Lines 95-100 Link Here
95	}	97	}
96		98
97	@Override	99	@Override
		100	public Map<? extends String, ? extends String> processorOptions() {
		101	return Collections.emptyMap();
		102	}
		103
		104	@Override
98	public void addChangeListener(ChangeListener l) {}	105	public void addChangeListener(ChangeListener l) {}
99		106
100	@Override	107	@Override

Lines 1-4 Link Here

(-)a/java.api.common/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.java.api.common/0	2	OpenIDE-Module: org.netbeans.modules.java.api.common/0
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.14	4	OpenIDE-Module-Specification-Version: 1.15

Lines 20-26 Link Here

(-)a/java.api.common/nbproject/project.xml (-1 / +1 lines)
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<release-version>1</release-version>	22	<release-version>1</release-version>
23	<specification-version>1.18</specification-version>	23	<specification-version>1.26</specification-version>
24	</run-dependency>	24	</run-dependency>
25	</dependency>	25	</dependency>
26	<dependency>	26	<dependency>

Lines 73-78 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java (+4 lines)
73	* @since org.netbeans.modules.java.api.common/0 1.14	73	* @since org.netbeans.modules.java.api.common/0 1.14
74	*/	74	*/
75	public static final String ANNOTATION_PROCESSING_SOURCE_OUTPUT = "annotation.processing.source.output"; //NOI18N	75	public static final String ANNOTATION_PROCESSING_SOURCE_OUTPUT = "annotation.processing.source.output"; //NOI18N
		76	/**
		77	* @since org.netbeans.modules.java.api.common/0 1.15
		78	*/
		79	public static final String ANNOTATION_PROCESSING_PROCESSOR_OPTIONS = "annotation.processing.processor.options"; //NOI18N
76	public static final String JAVAC_CLASSPATH = "javac.classpath"; //NOI18N	80	public static final String JAVAC_CLASSPATH = "javac.classpath"; //NOI18N
77	/**	81	/**
78	* @since org.netbeans.modules.java.api.common/0 1.14	82	* @since org.netbeans.modules.java.api.common/0 1.14




import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;

    private final String annotationProcessorsProperty;
    private final Set<String> properties;
    private final String sourceOutputProperty;
    private final String processorOptionsProperty;

    public AnnotationProcessingQueryImpl(AntProjectHelper helper, PropertyEvaluator evaluator, String annotationProcessingEnabledProperty, String annotationProcessingEnabledInEditorProperty, String runAllAnnotationProcessorsProperty, String annotationProcessorsProperty, String sourceOutputProperty, String processorOptionsProperty) {
        this.helper = helper;
        this.evaluator = evaluator;
        this.annotationProcessingEnabledProperty = annotationProcessingEnabledProperty;
        this.annotationProcessingEnabledInEditorProperty = annotationProcessingEnabledInEditorProperty;
        this.runAllAnnotationProcessorsProperty = runAllAnnotationProcessorsProperty;
        this.annotationProcessorsProperty = annotationProcessorsProperty;
        this.properties = new HashSet<String>(Arrays.asList(annotationProcessingEnabledProperty, annotationProcessingEnabledInEditorProperty, runAllAnnotationProcessorsProperty, annotationProcessorsProperty, sourceOutputProperty, processorOptionsProperty));
        this.sourceOutputProperty = sourceOutputProperty;
        this.processorOptionsProperty = processorOptionsProperty;
    }

    private Reference<Result> cache;

            return null;
        }

        @Override
        public Map<? extends String, ? extends String> processorOptions() {
            Map<String, String> options = new LinkedHashMap<String, String>();
            String prop = evaluator.getProperty(processorOptionsProperty);
            if (prop != null) {
                for (String option : prop.split("\\s")) { //NOI18N
                    if (option.startsWith("-A") && option.length() > 2) { //NOI18N
                        int sepIndex = option.indexOf('='); //NOI18N
                        String key = null;
                        String value = null;
                        if (sepIndex == -1)
                            key = option.substring(2);
                        else if (sepIndex >= 3) {
                            key = option.substring(2, sepIndex);
                            value = (sepIndex < option.length() - 1) ? option.substring(sepIndex + 1) : null;
                        }
                        options.put(key, value);
                    }
                }
            }
            return options;
        }

        public void addChangeListener(ChangeListener l) {
            cs.addChangeListener(l);
        }




     * @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()})
     * @param processorOptionsProperty options passed to the annotation processors (-Akey=value)
     * @return a {@link AnnotationProcessingQueryImplementation} to provide annotation processing configuration data for this project.
     * @since org.netbeans.modules.java.api.common/0 1.14
     */
    public static AnnotationProcessingQueryImplementation createAnnotationProcessingQuery(AntProjectHelper helper, PropertyEvaluator evaluator,
            String annotationProcessingEnabledProperty, String annotationProcessingEnabledInEditorProperty, String runAllAnnotationProcessorsProperty, String annotationProcessorsProperty, String sourceOutputProperty, String processorOptionsProperty) {
        return new AnnotationProcessingQueryImpl(helper, evaluator, annotationProcessingEnabledProperty, annotationProcessingEnabledInEditorProperty, runAllAnnotationProcessorsProperty, annotationProcessorsProperty, sourceOutputProperty, processorOptionsProperty);
    }
}

Lines 1-6 Link Here

(-)a/java.freeform/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.java.freeform/1	2	OpenIDE-Module: org.netbeans.modules.java.freeform/1
3	OpenIDE-Module-Specification-Version: 1.14	3	OpenIDE-Module-Specification-Version: 1.15
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/freeform/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/freeform/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/java/freeform/resources/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/java/freeform/resources/layer.xml
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 61-67 Link Here

(-)a/java.freeform/nbproject/project.xml (-1 / +1 lines)
61	<compile-dependency/>	61	<compile-dependency/>
62	<run-dependency>	62	<run-dependency>
63	<release-version>1</release-version>	63	<release-version>1</release-version>
64	<specification-version>1.25</specification-version>	64	<specification-version>1.26</specification-version>
65	</run-dependency>	65	</run-dependency>
66	</dependency>	66	</dependency>
67	<dependency>	67	<dependency>

Lines 40-45 Link Here

(-)a/java.freeform/src/org/netbeans/modules/java/freeform/AnnotationProcessingQueryImpl.java (+6 lines)
40	package org.netbeans.modules.java.freeform;	40	package org.netbeans.modules.java.freeform;
41		41
42	import java.net.URL;	42	import java.net.URL;
		43	import java.util.Collections;
		44	import java.util.Map;
43	import javax.swing.event.ChangeListener;	45	import javax.swing.event.ChangeListener;
44	import org.netbeans.api.java.queries.AnnotationProcessingQuery.Result;	46	import org.netbeans.api.java.queries.AnnotationProcessingQuery.Result;
45	import org.netbeans.spi.java.queries.AnnotationProcessingQueryImplementation;	47	import org.netbeans.spi.java.queries.AnnotationProcessingQueryImplementation;
Lines 63-70 Link Here
63	public @Override URL sourceOutputDirectory() {	65	public @Override URL sourceOutputDirectory() {
64	return null;	66	return null;
65	}	67	}
		68	public @Override Map<? extends String, ? extends String> processorOptions() {
		69	return Collections.emptyMap();
		70	}
66	public @Override void addChangeListener(ChangeListener l) {}	71	public @Override void addChangeListener(ChangeListener l) {}
67	public @Override void removeChangeListener(ChangeListener l) {}	72	public @Override void removeChangeListener(ChangeListener l) {}
		73
68	};	74	};
69	}	75	}
70		76

Lines 39-45 Link Here

(-)a/java.j2seproject/nbproject/project.properties (-1 / +1 lines)
39		39
40	javac.compilerargs=-Xlint -Xlint:-serial	40	javac.compilerargs=-Xlint -Xlint:-serial
41	javac.source=1.6	41	javac.source=1.6
42	spec.version.base=1.35.0	42	spec.version.base=1.36.0
43		43
44	javadoc.arch=${basedir}/arch.xml	44	javadoc.arch=${basedir}/arch.xml
45	javadoc.apichanges=${basedir}/apichanges.xml	45	javadoc.apichanges=${basedir}/apichanges.xml

Lines 70-76 Link Here

(-)a/java.j2seproject/nbproject/project.xml (-2 / +2 lines)
70	<compile-dependency/>	70	<compile-dependency/>
71	<run-dependency>	71	<run-dependency>
72	<release-version>1</release-version>	72	<release-version>1</release-version>
73	<specification-version>1.25</specification-version>	73	<specification-version>1.26</specification-version>
74	</run-dependency>	74	</run-dependency>
75	</dependency>	75	</dependency>
76	<dependency>	76	<dependency>
Lines 131-137 Link Here
131	<compile-dependency/>	131	<compile-dependency/>
132	<run-dependency>	132	<run-dependency>
133	<release-version>0-1</release-version>	133	<release-version>0-1</release-version>
134	<specification-version>1.14</specification-version>	134	<specification-version>1.15</specification-version>
135	</run-dependency>	135	</run-dependency>
136	</dependency>	136	</dependency>
137	<dependency>	137	<dependency>

Lines 361-367 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java (-1 / +1 lines)
361	ExtraSourceJavadocSupport.createExtraJavadocQueryImplementation(this, helper, eval),	361	ExtraSourceJavadocSupport.createExtraJavadocQueryImplementation(this, helper, eval),
362	LookupMergerSupport.createJFBLookupMerger(),	362	LookupMergerSupport.createJFBLookupMerger(),
363	QuerySupport.createBinaryForSourceQueryImplementation(this.sourceRoots, this.testRoots, this.helper, this.eval), //Does not use APH to get/put properties/cfgdata	363	QuerySupport.createBinaryForSourceQueryImplementation(this.sourceRoots, this.testRoots, this.helper, this.eval), //Does not use APH to get/put properties/cfgdata
364	QuerySupport.createAnnotationProcessingQuery(this.helper, this.eval, ProjectProperties.ANNOTATION_PROCESSING_ENABLED, ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR, ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT)	364	QuerySupport.createAnnotationProcessingQuery(this.helper, this.eval, ProjectProperties.ANNOTATION_PROCESSING_ENABLED, ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR, ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT, ProjectProperties.ANNOTATION_PROCESSING_PROCESSOR_OPTIONS)
365	);	365	);
366	lookup = base; // in case LookupProvider's call Project.getLookup	366	lookup = base; // in case LookupProvider's call Project.getLookup
367	return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-java-j2seproject/Lookup"); //NOI18N	367	return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-java-j2seproject/Lookup"); //NOI18N

Lines 252-257 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectGenerator.java (+1 lines)
252	ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, "true"); // NOI18N	252	ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, "true"); // NOI18N
253	ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ""); // NOI18N	253	ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ""); // NOI18N
254	ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT, "${build.generated.sources.dir}/ap-source-output"); // NOI18N	254	ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT, "${build.generated.sources.dir}/ap-source-output"); // NOI18N
		255	ep.setProperty(ProjectProperties.ANNOTATION_PROCESSING_PROCESSOR_OPTIONS, ""); // NOI18N
255	ep.setProperty("dist.dir", "dist"); // NOI18N	256	ep.setProperty("dist.dir", "dist"); // NOI18N
256	ep.setComment("dist.dir", new String[] {"# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_dist.dir")}, false); // NOI18N	257	ep.setComment("dist.dir", new String[] {"# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_dist.dir")}, false); // NOI18N
257	ep.setProperty("dist.jar", "${dist.dir}/" + validatePropertyValue(name) + ".jar"); // NOI18N	258	ep.setProperty("dist.jar", "${dist.dir}/" + validatePropertyValue(name) + ".jar"); // NOI18N

Lines 192-197 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java (+1 lines)
192	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, "true"); //NOI18N	192	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, "true"); //NOI18N
193	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ""); //NOI18N	193	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ""); //NOI18N
194	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT, "${build.generated.sources.dir}/ap-source-output"); //NOI18N	194	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT, "${build.generated.sources.dir}/ap-source-output"); //NOI18N
		195	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_PROCESSOR_OPTIONS, ""); //NOI18N
195	ensureValueExists(cachedProperties, ProjectProperties.JAVAC_PROCESSORPATH,"${" + ProjectProperties.JAVAC_CLASSPATH + "}"); //NOI18N	196	ensureValueExists(cachedProperties, ProjectProperties.JAVAC_PROCESSORPATH,"${" + ProjectProperties.JAVAC_CLASSPATH + "}"); //NOI18N
196	ensureValueExists(cachedProperties, "javac.test.processorpath","${" + ProjectProperties.JAVAC_TEST_CLASSPATH + "}"); //NOI18N	197	ensureValueExists(cachedProperties, "javac.test.processorpath","${" + ProjectProperties.JAVAC_TEST_CLASSPATH + "}"); //NOI18N
197	return cachedProperties;	198	return cachedProperties;

Lines 86-92 Link Here

(-)a/web.project/nbproject/project.xml (-2 / +2 lines)
86	<compile-dependency/>	86	<compile-dependency/>
87	<run-dependency>	87	<run-dependency>
88	<release-version>1</release-version>	88	<release-version>1</release-version>
89	<specification-version>1.18</specification-version>	89	<specification-version>1.26</specification-version>
90	</run-dependency>	90	</run-dependency>
91	</dependency>	91	</dependency>
92	<dependency>	92	<dependency>
Lines 236-242 Link Here
236	<compile-dependency/>	236	<compile-dependency/>
237	<run-dependency>	237	<run-dependency>
238	<release-version>0-1</release-version>	238	<release-version>0-1</release-version>
239	<specification-version>1.7</specification-version>	239	<specification-version>1.15</specification-version>
240	</run-dependency>	240	</run-dependency>
241	</dependency>	241	</dependency>
242	<dependency>	242	<dependency>

Lines 536-542 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/WebProject.java (-1 / +1 lines)
536	QuerySupport.createCompiledSourceForBinaryQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots(),	536	QuerySupport.createCompiledSourceForBinaryQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots(),
537	new String[]{"build.classes.dir", "dist.war"}, new String[]{"build.test.classes.dir"}),	537	new String[]{"build.classes.dir", "dist.war"}, new String[]{"build.test.classes.dir"}),
538	QuerySupport.createJavadocForBinaryQuery(helper, evaluator(), new String[]{"build.classes.dir", "dist.war"}),	538	QuerySupport.createJavadocForBinaryQuery(helper, evaluator(), new String[]{"build.classes.dir", "dist.war"}),
539	QuerySupport.createAnnotationProcessingQuery(helper, eval, ProjectProperties.ANNOTATION_PROCESSING_ENABLED, ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR, ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT),	539	QuerySupport.createAnnotationProcessingQuery(helper, eval, ProjectProperties.ANNOTATION_PROCESSING_ENABLED, ProjectProperties.ANNOTATION_PROCESSING_ENABLED_IN_EDITOR, ProjectProperties.ANNOTATION_PROCESSING_RUN_ALL_PROCESSORS, ProjectProperties.ANNOTATION_PROCESSING_PROCESSORS_LIST, ProjectProperties.ANNOTATION_PROCESSING_SOURCE_OUTPUT, ProjectProperties.ANNOTATION_PROCESSING_PROCESSOR_OPTIONS),
540	new AntArtifactProviderImpl(),	540	new AntArtifactProviderImpl(),
541	new ProjectXmlSavedHookImpl(),	541	new ProjectXmlSavedHookImpl(),
542	UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()),	542	UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()),

Return to bug 181421

Lines 293-303 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/QuerySupport.java (-2 / +3 lines)
293	* @param runAllAnnotationProcessorsProperty when true, {@link Result#annotationProcessorsToRun()} will return null	293	* @param runAllAnnotationProcessorsProperty when true, {@link Result#annotationProcessorsToRun()} will return null
294	* @param annotationProcessorsProperty should contain comma separated list of annotation processors to run (will be returned from {@link Result#annotationProcessorsToRun()})	294	* @param annotationProcessorsProperty should contain comma separated list of annotation processors to run (will be returned from {@link Result#annotationProcessorsToRun()})
295	* @param sourceOutputProperty directory to which the annotation processors generate source files (will be returned from {@link Result#sourceOutputProperty()})	295	* @param sourceOutputProperty directory to which the annotation processors generate source files (will be returned from {@link Result#sourceOutputProperty()})
		296	* @param processorOptionsProperty options passed to the annotation processors (-Akey=value)
296	* @return a {@link AnnotationProcessingQueryImplementation} to provide annotation processing configuration data for this project.	297	* @return a {@link AnnotationProcessingQueryImplementation} to provide annotation processing configuration data for this project.
297	* @since org.netbeans.modules.java.api.common/0 1.14	298	* @since org.netbeans.modules.java.api.common/0 1.14
298	*/	299	*/
299	public static AnnotationProcessingQueryImplementation createAnnotationProcessingQuery(AntProjectHelper helper, PropertyEvaluator evaluator,	300	public static AnnotationProcessingQueryImplementation createAnnotationProcessingQuery(AntProjectHelper helper, PropertyEvaluator evaluator,
300	String annotationProcessingEnabledProperty, String annotationProcessingEnabledInEditorProperty, String runAllAnnotationProcessorsProperty, String annotationProcessorsProperty, String sourceOutputProperty) {	301	String annotationProcessingEnabledProperty, String annotationProcessingEnabledInEditorProperty, String runAllAnnotationProcessorsProperty, String annotationProcessorsProperty, String sourceOutputProperty, String processorOptionsProperty) {
301	return new AnnotationProcessingQueryImpl(helper, evaluator, annotationProcessingEnabledProperty, annotationProcessingEnabledInEditorProperty, runAllAnnotationProcessorsProperty, annotationProcessorsProperty, sourceOutputProperty);	302	return new AnnotationProcessingQueryImpl(helper, evaluator, annotationProcessingEnabledProperty, annotationProcessingEnabledInEditorProperty, runAllAnnotationProcessorsProperty, annotationProcessorsProperty, sourceOutputProperty, processorOptionsProperty);
302	}	303	}
303	}	304	}

Lines 73-78 Link Here

(-)a/api.java/apichanges.xml (+14 lines)
73	<!-- ACTUAL CHANGES BEGIN HERE: -->	73	<!-- ACTUAL CHANGES BEGIN HERE: -->
74		74
75	<changes>	75	<changes>
		76	<change id="ap-query-processoroptions">
		77	<api name="classpath"/>
		78	<summary>Introducing AnnotationProcessingQuery.Result.processorOptions</summary>
		79	<version major="1" minor="26"/>
		80	<date day="3" month="3" year="2010"/>
		81	<author login="dbalek"/>
		82	<compatibility addition="yes" modification="no" semantic="compatible" source="compatible" binary="compatible"/>
		83	<description>
		84	<p>Adding AnnotationProcessingQuery.Result.processorOptions() to return options passed to annotation processors (-Akey=value).
		85	</p>
		86	</description>
		87	<class package="org.netbeans.api.java.queries" name="AnnotationProcessingQuery" />
		88	<issue number="181421"/>
		89	</change>
76	<change id="ap-query">	90	<change id="ap-query">
77	<api name="classpath"/>	91	<api name="classpath"/>
78	<summary>Introducing AnnotationProcessingQuery</summary>	92	<summary>Introducing AnnotationProcessingQuery</summary>

Lines 47-53 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/AnnotationProcessingQueryImpl.java (-2 / +30 lines)
47	import java.net.MalformedURLException;	47	import java.net.MalformedURLException;
48	import java.net.URL;	48	import java.net.URL;
49	import java.util.Arrays;	49	import java.util.Arrays;
		50	import java.util.Collections;
50	import java.util.HashSet;	51	import java.util.HashSet;
		52	import java.util.LinkedHashMap;
		53	import java.util.Map;
51	import java.util.Set;	54	import java.util.Set;
52	import java.util.logging.Level;	55	import java.util.logging.Level;
53	import java.util.logging.Logger;	56	import java.util.logging.Logger;
Lines 74-89 Link Here
74	private final String annotationProcessorsProperty;	77	private final String annotationProcessorsProperty;
75	private final Set<String> properties;	78	private final Set<String> properties;
76	private final String sourceOutputProperty;	79	private final String sourceOutputProperty;
		80	private final String processorOptionsProperty;
77		81
78	public AnnotationProcessingQueryImpl(AntProjectHelper helper, PropertyEvaluator evaluator, String annotationProcessingEnabledProperty, String annotationProcessingEnabledInEditorProperty, String runAllAnnotationProcessorsProperty, String annotationProcessorsProperty, String sourceOutputProperty) {	82	public AnnotationProcessingQueryImpl(AntProjectHelper helper, PropertyEvaluator evaluator, String annotationProcessingEnabledProperty, String annotationProcessingEnabledInEditorProperty, String runAllAnnotationProcessorsProperty, String annotationProcessorsProperty, String sourceOutputProperty, String processorOptionsProperty) {
79	this.helper = helper;	83	this.helper = helper;
80	this.evaluator = evaluator;	84	this.evaluator = evaluator;
81	this.annotationProcessingEnabledProperty = annotationProcessingEnabledProperty;	85	this.annotationProcessingEnabledProperty = annotationProcessingEnabledProperty;
82	this.annotationProcessingEnabledInEditorProperty = annotationProcessingEnabledInEditorProperty;	86	this.annotationProcessingEnabledInEditorProperty = annotationProcessingEnabledInEditorProperty;
83	this.runAllAnnotationProcessorsProperty = runAllAnnotationProcessorsProperty;	87	this.runAllAnnotationProcessorsProperty = runAllAnnotationProcessorsProperty;
84	this.annotationProcessorsProperty = annotationProcessorsProperty;	88	this.annotationProcessorsProperty = annotationProcessorsProperty;
85	this.properties = new HashSet<String>(Arrays.asList(annotationProcessingEnabledProperty, annotationProcessingEnabledInEditorProperty, runAllAnnotationProcessorsProperty, annotationProcessorsProperty, sourceOutputProperty));	89	this.properties = new HashSet<String>(Arrays.asList(annotationProcessingEnabledProperty, annotationProcessingEnabledInEditorProperty, runAllAnnotationProcessorsProperty, annotationProcessorsProperty, sourceOutputProperty, processorOptionsProperty));
86	this.sourceOutputProperty = sourceOutputProperty;	90	this.sourceOutputProperty = sourceOutputProperty;
		91	this.processorOptionsProperty = processorOptionsProperty;
87	}	92	}
88		93
89	private Reference<Result> cache;	94	private Reference<Result> cache;
Lines 146-151 Link Here
146	return null;	151	return null;
147	}	152	}
148		153
		154	@Override
		155	public Map<? extends String, ? extends String> processorOptions() {
		156	Map<String, String> options = new LinkedHashMap<String, String>();
		157	String prop = evaluator.getProperty(processorOptionsProperty);
		158	if (prop != null) {
		159	for (String option : prop.split("\\s")) { //NOI18N
		160	if (option.startsWith("-A") && option.length() > 2) { //NOI18N
		161	int sepIndex = option.indexOf('='); //NOI18N
		162	String key = null;
		163	String value = null;
		164	if (sepIndex == -1)
		165	key = option.substring(2);
		166	else if (sepIndex >= 3) {
		167	key = option.substring(2, sepIndex);
		168	value = (sepIndex < option.length() - 1) ? option.substring(sepIndex + 1) : null;
		169	}
		170	options.put(key, value);
		171	}
		172	}
		173	}
		174	return options;
		175	}
		176
149	public void addChangeListener(ChangeListener l) {	177	public void addChangeListener(ChangeListener l) {
150	cs.addChangeListener(l);	178	cs.addChangeListener(l);
151	}	179	}

Lines 432-437 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl (+2 lines)
432	<compilerarg value="-processorpath" />	432	<compilerarg value="-processorpath" />
433	<compilerarg path="@{{processorpath}}" />	433	<compilerarg path="@{{processorpath}}" />
434	<compilerarg line="${{ap.processors.internal}}" />	434	<compilerarg line="${{ap.processors.internal}}" />
		435	<compilerarg line="${{annotation.processing.processor.options}}" />
435	<compilerarg value="-s" />	436	<compilerarg value="-s" />
436	<compilerarg path="@{{apgeneratedsrcdir}}" />	437	<compilerarg path="@{{apgeneratedsrcdir}}" />
437	<compilerarg line="${{ap.proc.none.internal}}" />	438	<compilerarg line="${{ap.proc.none.internal}}" />
Lines 854-859 Link Here
854	<target name="-init-ap-cmdline-properties">	855	<target name="-init-ap-cmdline-properties">
855	<property name="annotation.processing.enabled" value="true" />	856	<property name="annotation.processing.enabled" value="true" />
856	<property name="annotation.processing.processors.list" value="" />	857	<property name="annotation.processing.processors.list" value="" />
		858	<property name="annotation.processing.processor.options" value="" />
857	<property name="annotation.processing.run.all.processors" value="true" />	859	<property name="annotation.processing.run.all.processors" value="true" />
858	<property name="javac.processorpath" value="${{javac.classpath}}" />	860	<property name="javac.processorpath" value="${{javac.classpath}}" />
859	<property name="javac.test.processorpath" value="${{javac.test.classpath}}"/>	861	<property name="javac.test.processorpath" value="${{javac.test.classpath}}"/>