diff --git a/java.api.common/apichanges.xml b/java.api.common/apichanges.xml --- a/java.api.common/apichanges.xml +++ b/java.api.common/apichanges.xml @@ -105,6 +105,21 @@ + + + Extended ProjectProperties by additional common project properties + + + + + +

+ Extended ProjectProperties by additional common project properties used by shared queries and + project generators. +

+ + + Extended BootClassPathImplementation and ClassPathProviderImpl to support non j2se platforms diff --git a/java.api.common/manifest.mf b/java.api.common/manifest.mf --- a/java.api.common/manifest.mf +++ b/java.api.common/manifest.mf @@ -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.59 +OpenIDE-Module-Specification-Version: 1.60 diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java b/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java --- a/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java +++ b/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java @@ -126,6 +126,64 @@ public static final String INCLUDES = "includes"; // NOI18N public static final String EXCLUDES = "excludes"; // NOI18N + //General + /** + * Name of the property holding the project sources encoding. + * @since 1.60 + */ + public static final String SOURCE_ENCODING="source.encoding"; // NOI18N + /** + * Name of the property holding the active project platform. + * @since 1.60 + */ + public static final String PLATFORM_ACTIVE = "platform.active"; //NOI18N + /** + * Name of the property holding the project main build script reference. + * @since 1.60 + */ + public static final String BUILD_SCRIPT ="buildfile"; //NOI18N + /** + * Name of the property holding the project license. + * @since 1.60 + */ + public static final String LICENSE_NAME = "project.license"; + /** + * Name of the property holding the path to project license. + * @since 1.60 + */ + public static final String LICENSE_PATH = "project.licensePath"; + + //Build & Run + /** + * Name of the property disabling dependency tracking. + * @since 1.60 + */ + public static final String NO_DEPENDENCIES="no.dependencies"; // NOI18N + /** + * Name of the property holding the debug project classpath. + * @since 1.60 + */ + public static final String DEBUG_CLASSPATH = "debug.classpath"; //NOI18N + /** + * Name of the property holding the debug test classpath. + * @since 1.60 + */ + public static final String DEBUG_TEST_CLASSPATH = "debug.test.classpath"; // NOI18N + /** + * Name of the property holding the reference to folder where test results should be generated. + * @since 1.60 + */ + public static final String BUILD_TEST_RESULTS_DIR = "build.test.results.dir"; // NOI18N + /** + * Name of the property holding the reference to build generated sources. + * @since 1.60 + */ + public static final String BUILD_GENERATED_SOURCES_DIR = "build.generated.sources.dir"; //NOI18N + /** + * Name of the property holding the build excludes. + * @since 1.60 + */ + public static final String BUILD_CLASSES_EXCLUDES = "build.classes.excludes"; //NOI18N public static final String RUN_JVM_ARGS = "run.jvmargs"; // NOI18N static final String RUN_JVM_ARGS_IDE = "run.jvmargs.ide"; // NOI18N public static final String RUNTIME_ENCODING="runtime.encoding"; //NOI18N @@ -139,6 +197,128 @@ public static final String PROP_PROJECT_CONFIGURATION_CONFIG = "config"; // NOI18N + //Javac + /** + * Name of the property holding the javac extra args. + * @since 1.60 + */ + public static final String JAVAC_COMPILERARGS = "javac.compilerargs"; //NOI18N + /** + * Name of the property holding the javac source. + * @since 1.60 + */ + public static final String JAVAC_SOURCE = "javac.source"; //NOI18N + /** + * Name of the property holding the javac target. + * @since 1.60 + */ + public static final String JAVAC_TARGET = "javac.target"; //NOI18N + /** + * Name of the property enabling javac deprecation. + * @since 1.60 + */ + public static final String JAVAC_DEPRECATION = "javac.deprecation"; //NOI18N + /** + * Name of the property holding the javac profile. + * @since 1.60 + */ + public static final String JAVAC_PROFILE = "javac.profile"; // NOI18N + /** + * Name of the property turning on javac debug info generation. + * @since 1.60 + */ + public static final String JAVAC_DEBUG = "javac.debug"; // NOI18N + + //Jar + /** + * Name of the property holding the reference to built jar file. + * @since 1.60 + */ + public static final String DIST_JAR ="dist.jar"; //NOI18N + /** + * Name of the property holding the reference to distribution directory. + * @since 1.60 + */ + public static final String DIST_DIR ="dist.dir"; //NOI18N + /** + * Name of the property enabling jar compression. + * @since 1.60 + */ + public static final String JAR_COMPRESS = "jar.compress"; //NOI18N + /** + * Name of the property holding files excluded from jar file. + * @since 1.60 + */ + public static final String DIST_ARCHIVE_EXCLUDES = "dist.archive.excludes"; //NOI18N + + //Javadoc + /** + * Name of property holding reference to folder where JavaDoc is genered. + * @since 1.60 + */ + public static final String DIST_JAVADOC_DIR = "dist.javadoc.dir"; // NOI18N + /** + * Name of property enabling JavaDoc for non public classes. + * @since 1.60 + */ + public static final String JAVADOC_PRIVATE="javadoc.private"; // NOI18N + /** + * Name of property disabling javadoc class hierarchy generation. + * @since 1.60 + */ + public static final String JAVADOC_NO_TREE="javadoc.notree"; // NOI18N + /** + * Name of property enabling creation of javadoc class and package usage pages. + * @since 1.60 + */ + public static final String JAVADOC_USE="javadoc.use"; // NOI18N + /** + * Name of property disabling creation of javadoc navigation bar. + * @since 1.60 + */ + public static final String JAVADOC_NO_NAVBAR="javadoc.nonavbar"; // NOI18N + /** + * Name of property disabling creation of javadoc index. + * @since 1.60 + */ + public static final String JAVADOC_NO_INDEX="javadoc.noindex"; // NOI18N + /** + * Name of property enabling of javadoc split index. + * @since 1.60 + */ + public static final String JAVADOC_SPLIT_INDEX="javadoc.splitindex"; // NOI18N + /** + * Name of property holding the javadoc author. + * @since 1.60 + */ + public static final String JAVADOC_AUTHOR="javadoc.author"; // NOI18N + /** + * Name of property holding the javadoc version. + * @since 1.60 + */ + public static final String JAVADOC_VERSION="javadoc.version"; // NOI18N + /** + * Name of property holding the javadoc window title. + * @since 1.60 + */ + public static final String JAVADOC_WINDOW_TITLE="javadoc.windowtitle"; // NOI18N + /** + * Name of property holding the javadoc encoding. + * @since 1.60 + */ + public static final String JAVADOC_ENCODING="javadoc.encoding"; // NOI18N + /** + * Name of property holding the javadoc additional parameters. + * @since 1.60 + */ + public static final String JAVADOC_ADDITIONALPARAM="javadoc.additionalparam"; // NOI18N + //Javadoc stored in the PRIVATE.PROPERTIES + /** + * Name of property enabling javadoc preview. + * @since 1.60 + */ + public static final String JAVADOC_PREVIEW="javadoc.preview"; // NOI18N + /** @since org.netbeans.modules.java.j2seproject/1 1.12 */ public static final String DO_DEPEND = "do.depend"; // NOI18N /** @since org.netbeans.modules.java.j2seproject/1 1.12 */ diff --git a/java.j2seproject/nbproject/project.xml b/java.j2seproject/nbproject/project.xml --- a/java.j2seproject/nbproject/project.xml +++ b/java.j2seproject/nbproject/project.xml @@ -142,7 +142,7 @@ 0-1 - 1.58 + 1.60 diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java @@ -98,7 +98,6 @@ import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator; import org.netbeans.modules.java.j2seproject.ui.J2SELogicalViewProvider; import org.netbeans.modules.java.j2seproject.ui.customizer.CustomizerProviderImpl; -import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties; import org.netbeans.modules.project.ui.spi.TemplateCategorySorter; import org.netbeans.spi.java.project.support.ExtraSourceJavadocSupport; import org.netbeans.spi.java.project.support.LookupMergerSupport; @@ -151,7 +150,6 @@ import org.openide.loaders.DataObject; import org.openide.modules.SpecificationVersion; import org.openide.util.RequestProcessor; -import org.openide.xml.XMLUtil; /** * Represents one plain J2SE project. * @author Jesse Glick, et al. @@ -362,7 +360,7 @@ } private Lookup createLookup(final AuxiliaryConfiguration aux, final J2SEProjectOperations ops) { - final FileEncodingQueryImplementation encodingQuery = QuerySupport.createFileEncodingQuery(evaluator(), J2SEProjectProperties.SOURCE_ENCODING); + final FileEncodingQueryImplementation encodingQuery = QuerySupport.createFileEncodingQuery(evaluator(), ProjectProperties.SOURCE_ENCODING); final J2SELogicalViewProvider lvp = new J2SELogicalViewProvider(this, this.updateHelper, evaluator(), refHelper); final Lookup base = Lookups.fixed( J2SEProject.this, @@ -382,7 +380,7 @@ UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()), QuerySupport.createUnitTestForSourceQuery(getSourceRoots(), getTestSourceRoots()), QuerySupport.createSourceLevelQuery2(evaluator()), - QuerySupport.createSources(this, helper, evaluator(), getSourceRoots(), getTestSourceRoots(), Roots.nonSourceRoots(ProjectProperties.BUILD_DIR, J2SEProjectProperties.DIST_DIR)), + QuerySupport.createSources(this, helper, evaluator(), getSourceRoots(), getTestSourceRoots(), Roots.nonSourceRoots(ProjectProperties.BUILD_DIR, ProjectProperties.DIST_DIR)), QuerySupport.createSharabilityQuery2(helper, evaluator(), getSourceRoots(), getTestSourceRoots()), new CoSAwareFileBuiltQueryImpl(QuerySupport.createFileBuiltQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots()), this), new RecommendedTemplatesImpl (this.updateHelper), @@ -407,8 +405,8 @@ LookupProviderSupport.createActionProviderMerger(), WhiteListQueryMergerSupport.createWhiteListQueryMerger(), BrokenReferencesSupport.createReferenceProblemsProvider(helper, refHelper, eval, lvp.getBreakableProperties(), lvp.getPlatformProperties()), - BrokenReferencesSupport.createPlatformVersionProblemProvider(helper, eval, new PlatformChangedHook(), JavaPlatform.getDefault().getSpecification().getName(), J2SEProjectProperties.JAVA_PLATFORM, J2SEProjectProperties.JAVAC_SOURCE, J2SEProjectProperties.JAVAC_TARGET), - BrokenReferencesSupport.createProfileProblemProvider(helper, refHelper, eval, J2SEProjectProperties.JAVAC_PROFILE, ProjectProperties.RUN_CLASSPATH, ProjectProperties.ENDORSED_CLASSPATH), + BrokenReferencesSupport.createPlatformVersionProblemProvider(helper, eval, new PlatformChangedHook(), JavaPlatform.getDefault().getSpecification().getName(), ProjectProperties.PLATFORM_ACTIVE, ProjectProperties.JAVAC_SOURCE, ProjectProperties.JAVAC_TARGET), + BrokenReferencesSupport.createProfileProblemProvider(helper, refHelper, eval, ProjectProperties.JAVAC_PROFILE, ProjectProperties.RUN_CLASSPATH, ProjectProperties.ENDORSED_CLASSPATH), UILookupMergerSupport.createProjectProblemsProviderMerger(), new J2SEProjectPlatformImpl(this) ); @@ -672,7 +670,7 @@ } catch (IOException e) { Exceptions.printStackTrace(e); } - String prop = evaluator().getProperty(J2SEProjectProperties.SOURCE_ENCODING); + String prop = evaluator().getProperty(ProjectProperties.SOURCE_ENCODING); if (prop != null) { try { Charset.forName(prop); @@ -737,7 +735,7 @@ @Override public AntArtifact[] getBuildArtifacts() { return new AntArtifact[] { - helper.createSimpleAntArtifact(JavaProjectConstants.ARTIFACT_TYPE_JAR, "dist.jar", evaluator(), "jar", "clean", J2SEProjectProperties.BUILD_SCRIPT), // NOI18N + helper.createSimpleAntArtifact(JavaProjectConstants.ARTIFACT_TYPE_JAR, "dist.jar", evaluator(), "jar", "clean", ProjectProperties.BUILD_SCRIPT), // NOI18N }; } diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectPlatformImpl.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectPlatformImpl.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectPlatformImpl.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectPlatformImpl.java @@ -51,6 +51,7 @@ import org.netbeans.api.java.platform.JavaPlatformManager; import org.netbeans.api.project.ProjectManager; import org.netbeans.modules.java.api.common.ant.UpdateHelper; +import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.util.CommonProjectUtils; import org.netbeans.modules.java.j2seproject.api.J2SEProjectPlatform; import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties; @@ -91,7 +92,7 @@ @Override public JavaPlatform run() { return CommonProjectUtils.getActivePlatform( - project.evaluator().getProperty(J2SEProjectProperties.JAVA_PLATFORM)); + project.evaluator().getProperty(ProjectProperties.PLATFORM_ACTIVE)); } }); } @@ -119,7 +120,7 @@ final String platformId = platform.getProperties().get(J2SEProjectProperties.PROP_PLATFORM_ANT_NAME); final UpdateHelper uh = project.getUpdateHelper(); final EditableProperties props = uh.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - props.setProperty(J2SEProjectProperties.JAVA_PLATFORM, platformId); + props.setProperty(ProjectProperties.PLATFORM_ACTIVE, platformId); uh.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props); updateProjectXml(platform, uh); ProjectManager.getDefault().saveProject(project); @@ -146,7 +147,7 @@ @Override public void propertyChange(@NonNull final PropertyChangeEvent event) { final String propName = event.getPropertyName(); - if (propName == null || J2SEProjectProperties.JAVA_PLATFORM.equals(propName)) { + if (propName == null || ProjectProperties.PLATFORM_ACTIVE.equals(propName)) { support.firePropertyChange(PROP_PROJECT_PLATFORM, null, null); } } diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectUtil.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectUtil.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectUtil.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectUtil.java @@ -52,7 +52,6 @@ import java.util.logging.Logger; import org.netbeans.api.project.Project; import org.netbeans.modules.java.api.common.project.ProjectProperties; -import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties; import org.netbeans.spi.project.support.ant.GeneratedFilesHelper; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; @@ -114,7 +113,7 @@ public static String getBuildXmlName (final J2SEProject project) { assert project != null; - String buildScriptPath = project.evaluator().getProperty(J2SEProjectProperties.BUILD_SCRIPT); + String buildScriptPath = project.evaluator().getProperty(ProjectProperties.BUILD_SCRIPT); if (buildScriptPath == null) { buildScriptPath = GeneratedFilesHelper.BUILD_XML_PATH; } diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java @@ -48,7 +48,6 @@ import org.netbeans.api.project.ProjectManager; import org.netbeans.modules.java.api.common.ant.UpdateImplementation; import org.netbeans.modules.java.api.common.project.ProjectProperties; -import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties; import org.netbeans.spi.project.AuxiliaryConfiguration; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; @@ -191,7 +190,7 @@ public synchronized EditableProperties getUpdatedProjectProperties () { EditableProperties cachedProperties = this.helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); //The javadoc.additionalparam was not in NB 4.0 - ensureValueExists(cachedProperties, J2SEProjectProperties.JAVADOC_ADDITIONALPARAM,""); //NOI18N + ensureValueExists(cachedProperties, ProjectProperties.JAVADOC_ADDITIONALPARAM,""); //NOI18N ensureValueExists(cachedProperties, "build.generated.dir","${build.dir}/generated"); //NOI18N ensureValueExists(cachedProperties, "meta.inf.dir","${src.dir}/META-INF"); //NOI18N ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_ENABLED, "true"); //NOI18N diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectBuilder.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectBuilder.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectBuilder.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectBuilder.java @@ -506,28 +506,28 @@ "# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_run.jvmargs_3"), // NOI18N }, false); - ep.setProperty(J2SEProjectProperties.JAVADOC_PRIVATE, "false"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_NO_TREE, "false"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_USE, "true"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_NO_NAVBAR, "false"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_NO_INDEX, "false"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_SPLIT_INDEX, "true"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_AUTHOR, "false"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_VERSION, "false"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_WINDOW_TITLE, ""); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_ENCODING, "${"+J2SEProjectProperties.SOURCE_ENCODING+"}"); // NOI18N - ep.setProperty(J2SEProjectProperties.JAVADOC_ADDITIONALPARAM, ""); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_PRIVATE, "false"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_NO_TREE, "false"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_USE, "true"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_NO_NAVBAR, "false"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_NO_INDEX, "false"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_SPLIT_INDEX, "true"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_AUTHOR, "false"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_VERSION, "false"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_WINDOW_TITLE, ""); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_ENCODING, "${"+ProjectProperties.SOURCE_ENCODING+"}"); // NOI18N + ep.setProperty(ProjectProperties.JAVADOC_ADDITIONALPARAM, ""); // NOI18N Charset enc = FileEncodingQuery.getDefaultEncoding(); - ep.setProperty(J2SEProjectProperties.SOURCE_ENCODING, enc.name()); + ep.setProperty(ProjectProperties.SOURCE_ENCODING, enc.name()); if (manifestFile != null) { ep.setProperty("manifest.file", manifestFile); // NOI18N } if (buildXmlName != null) { - ep.put(J2SEProjectProperties.BUILD_SCRIPT, buildXmlName); + ep.put(ProjectProperties.BUILD_SCRIPT, buildXmlName); } ep.setProperty(J2SEProjectProperties.MKDIST_DISABLED, isLibrary ? "true" : "false"); - ep.setProperty(J2SEProjectProperties.DIST_ARCHIVE_EXCLUDES,""); //NOI18N - ep.setComment(J2SEProjectProperties.DIST_ARCHIVE_EXCLUDES, + ep.setProperty(ProjectProperties.DIST_ARCHIVE_EXCLUDES,""); //NOI18N + ep.setComment(ProjectProperties.DIST_ARCHIVE_EXCLUDES, new String[] { "# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_dist.archive.excludes") //NOI18N }, diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/problems/RuntimePlatformProblemsProvider.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/problems/RuntimePlatformProblemsProvider.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/problems/RuntimePlatformProblemsProvider.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/problems/RuntimePlatformProblemsProvider.java @@ -72,6 +72,7 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.api.project.ProjectUtils; +import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.j2seproject.J2SEProject; import org.netbeans.modules.java.j2seproject.api.J2SECustomPropertySaver; import org.netbeans.modules.java.j2seproject.api.J2SERuntimePlatformProvider; @@ -167,8 +168,8 @@ Parameters.notNull("evt", evt); //NOI18N final String propName = evt.getPropertyName(); if (JavaPlatformManager.PROP_INSTALLED_PLATFORMS.equals(propName) || - J2SEProjectProperties.JAVAC_TARGET.equals(propName) || - J2SEProjectProperties.JAVAC_PROFILE.equals(propName)) { + ProjectProperties.JAVAC_TARGET.equals(propName) || + ProjectProperties.JAVAC_PROFILE.equals(propName)) { resetAndFire(); } } @@ -527,13 +528,13 @@ final J2SEProject j2sePrj = prj.getLookup().lookup(J2SEProject.class); if (j2sePrj != null) { final EditableProperties props = j2sePrj.getUpdateHelper().getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - props.setProperty(J2SEProjectProperties.JAVAC_SOURCE, jp.getSpecification().getVersion().toString()); - props.setProperty(J2SEProjectProperties.JAVAC_TARGET, jp.getSpecification().getVersion().toString()); + props.setProperty(ProjectProperties.JAVAC_SOURCE, jp.getSpecification().getVersion().toString()); + props.setProperty(ProjectProperties.JAVAC_TARGET, jp.getSpecification().getVersion().toString()); final SourceLevelQuery.Profile profile = getPlatformProfile(jp); if (profile == SourceLevelQuery.Profile.DEFAULT) { - props.remove(J2SEProjectProperties.JAVAC_PROFILE); + props.remove(ProjectProperties.JAVAC_PROFILE); } else { - props.setProperty(J2SEProjectProperties.JAVAC_PROFILE, profile.getName()); + props.setProperty(ProjectProperties.JAVAC_PROFILE, profile.getName()); } j2sePrj.getUpdateHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props); ProjectManager.getDefault().saveProject(prj); diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java @@ -68,7 +68,6 @@ import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.project.ui.LogicalViewProvider2; import org.netbeans.modules.java.j2seproject.J2SEProjectUtil; -import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties; import org.netbeans.modules.java.j2seproject.J2SEProject; import org.netbeans.spi.java.project.support.ui.PackageView; import org.netbeans.spi.project.support.ant.PropertyEvaluator; @@ -113,9 +112,9 @@ private static final String[] BREAKABLE_PROPERTIES = { ProjectProperties.JAVAC_CLASSPATH, ProjectProperties.RUN_CLASSPATH, - J2SEProjectProperties.DEBUG_CLASSPATH, + ProjectProperties.DEBUG_CLASSPATH, ProjectProperties.RUN_TEST_CLASSPATH, - J2SEProjectProperties.DEBUG_TEST_CLASSPATH, + ProjectProperties.DEBUG_TEST_CLASSPATH, ProjectProperties.ENDORSED_CLASSPATH, ProjectProperties.JAVAC_TEST_CLASSPATH, }; @@ -319,7 +318,7 @@ } public String[] getPlatformProperties() { - return new String[] {J2SEProjectProperties.JAVA_PLATFORM}; + return new String[] {ProjectProperties.PLATFORM_ACTIVE}; } private boolean isCompileOnSaveDisabled() { diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerSources.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerSources.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerSources.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerSources.java @@ -57,6 +57,7 @@ import javax.swing.event.ListDataListener; import javax.swing.table.TableColumn; import javax.swing.table.TableModel; +import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.api.common.project.ui.customizer.SourceRootsUi; import org.netbeans.modules.java.api.common.ui.PlatformUiSupport; import org.netbeans.spi.java.project.support.ui.IncludeExcludeVisualizer; @@ -146,7 +147,7 @@ this.profile.setRenderer(uiProperties.JAVAC_PROFILE_RENDERER); enableSourceLevel (); enableProfiles(); - this.originalEncoding = this.uiProperties.getProject().evaluator().getProperty(J2SEProjectProperties.SOURCE_ENCODING); + this.originalEncoding = this.uiProperties.getProject().evaluator().getProperty(ProjectProperties.SOURCE_ENCODING); if (this.originalEncoding == null) { this.originalEncoding = Charset.defaultCharset().name(); } @@ -244,7 +245,7 @@ NbBundle.getMessage(CustomizerSources.class,"MSG_EncodingWarning"), NotifyDescriptor.WARNING_MESSAGE)); notified=true; } - this.uiProperties.putAdditionalProperty(J2SEProjectProperties.SOURCE_ENCODING, encName); + this.uiProperties.putAdditionalProperty(ProjectProperties.SOURCE_ENCODING, encName); } public HelpCtx getHelpCtx() { diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java --- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java +++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java @@ -111,6 +111,7 @@ import org.openide.filesystems.FileUtil; import org.openide.util.*; import org.openide.util.lookup.Lookups; +import static org.netbeans.modules.java.api.common.project.ProjectProperties.*; /** * @author Petr Hrebejk @@ -130,68 +131,14 @@ // Special properties of the project public static final String J2SE_PROJECT_NAME = "j2se.project.name"; // NOI18N - public static final String JAVA_PLATFORM = "platform.active"; // NOI18N - - // folowing properties have moved to ProjectProperties in java.api.common module: - //public static final String JAVAC_CLASSPATH = "javac.classpath"; // NOI18N - //public static final String RUN_CLASSPATH = "run.classpath"; // NOI18N - //public static final String JAVAC_TEST_CLASSPATH = "javac.test.classpath"; // NOI18N - //public static final String RUN_TEST_CLASSPATH = "run.test.classpath"; // NOI18N - //public static final String BUILD_CLASSES_DIR = "build.classes.dir"; // NOI18N - //public static final String BUILD_TEST_CLASSES_DIR = "build.test.classes.dir"; // NOI18N - //public static final String INCLUDES = "includes"; // NOI18N - //public static final String EXCLUDES = "excludes"; // NOI18N - //public static final String[] WELL_KNOWN_PATHS = new String[] { - //public static final String ANT_ARTIFACT_PREFIX = "${reference."; // NOI18N - - // Properties stored in the PROJECT.PROPERTIES - public static final String DIST_DIR = "dist.dir"; // NOI18N - public static final String DIST_JAR = "dist.jar"; // NOI18N - public static final String DEBUG_CLASSPATH = "debug.classpath"; // NOI18N - public static final String JAR_COMPRESS = "jar.compress"; // NOI18N - public static final String JAVAC_SOURCE = "javac.source"; // NOI18N - public static final String JAVAC_TARGET = "javac.target"; // NOI18N - public static final String JAVAC_PROFILE = "javac.profile"; // NOI18N - public static final String JAVAC_DEBUG = "javac.debug"; // NOI18N - public static final String JAVAC_DEPRECATION = "javac.deprecation"; // NOI18N - public static final String JAVAC_COMPILER_ARG = "javac.compilerargs"; //NOI18N - public static final String BUILD_TEST_RESULTS_DIR = "build.test.results.dir"; // NOI18N - public static final String BUILD_CLASSES_EXCLUDES = "build.classes.excludes"; // NOI18N - public static final String DIST_JAVADOC_DIR = "dist.javadoc.dir"; // NOI18N - public static final String NO_DEPENDENCIES="no.dependencies"; // NOI18N - public static final String DEBUG_TEST_CLASSPATH = "debug.test.classpath"; // NOI18N - public static final String SOURCE_ENCODING="source.encoding"; // NOI18N - - - public static final String JAVADOC_PRIVATE="javadoc.private"; // NOI18N - public static final String JAVADOC_NO_TREE="javadoc.notree"; // NOI18N - public static final String JAVADOC_USE="javadoc.use"; // NOI18N - public static final String JAVADOC_NO_NAVBAR="javadoc.nonavbar"; // NOI18N - public static final String JAVADOC_NO_INDEX="javadoc.noindex"; // NOI18N - public static final String JAVADOC_SPLIT_INDEX="javadoc.splitindex"; // NOI18N - public static final String JAVADOC_AUTHOR="javadoc.author"; // NOI18N - public static final String JAVADOC_VERSION="javadoc.version"; // NOI18N - public static final String JAVADOC_WINDOW_TITLE="javadoc.windowtitle"; // NOI18N - public static final String JAVADOC_ENCODING="javadoc.encoding"; // NOI18N - public static final String JAVADOC_ADDITIONALPARAM="javadoc.additionalparam"; // NOI18N - + // Properties stored in the PROJECT.PROPERTIES public static final String APPLICATION_TITLE ="application.title"; // NOI18N public static final String APPLICATION_VENDOR ="application.vendor"; // NOI18N public static final String APPLICATION_DESC ="application.desc"; // NOI18N public static final String APPLICATION_HOMEPAGE ="application.homepage"; // NOI18N public static final String APPLICATION_SPLASH ="application.splash"; // NOI18N - - public static final String LICENSE_NAME = "project.license"; - public static final String LICENSE_PATH = "project.licensePath"; - - // Properties stored in the PRIVATE.PROPERTIES - public static final String JAVADOC_PREVIEW="javadoc.preview"; // NOI18N - // Main build.xml location - public static final String BUILD_SCRIPT ="buildfile"; //NOI18N //Disables copying of dependencies to dist folder public static final String MKDIST_DISABLED = "mkdist.disabled"; //NOI18N - //Files excluded from dist.jar - public static final String DIST_ARCHIVE_EXCLUDES = "dist.archive.excludes"; //NOI18N //Runtime platform public static final String PLATFORM_RUNTIME = "platform.runtime"; //NOI18N @@ -358,8 +305,8 @@ RUN_TEST_CLASSPATH_MODEL = ClassPathUiSupport.createListModel(cs.itemsIterator(projectProperties.get(ProjectProperties.RUN_TEST_CLASSPATH))); ENDORSED_CLASSPATH_MODEL = ClassPathUiSupport.createListModel(cs.itemsIterator(projectProperties.get(ProjectProperties.ENDORSED_CLASSPATH))); final Collection filters = project.getLookup().lookupAll(PlatformFilter.class); - PLATFORM_MODEL = filters == null ? PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)) : - PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM), filters); + PLATFORM_MODEL = filters == null ? PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(PLATFORM_ACTIVE)) : + PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(PLATFORM_ACTIVE), filters); PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer(); JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel (PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET)); JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer (); @@ -419,7 +366,7 @@ PROCESSOR_OPTIONS_MODEL.addRow(new String[] {key, value}); } } - JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILER_ARG ); + JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILERARGS ); // CustomizerJar DIST_JAR_MODEL = projectGroup.createStringDocument( evaluator, DIST_JAR ); diff --git a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/queries/FileEncodingQueryTest.java b/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/queries/FileEncodingQueryTest.java --- a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/queries/FileEncodingQueryTest.java +++ b/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/queries/FileEncodingQueryTest.java @@ -51,18 +51,16 @@ import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectManager; import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.java.j2seproject.J2SEProject; import org.netbeans.modules.java.j2seproject.J2SEProjectGenerator; -import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties; import org.openide.filesystems.FileObject; import org.netbeans.spi.queries.FileEncodingQueryImplementation; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; import org.openide.filesystems.FileUtil; -import org.openide.filesystems.FileUtil; import org.openide.modules.SpecificationVersion; import org.openide.util.Mutex; -import org.openide.util.lookup.Lookups; import org.openide.util.test.MockLookup; public class FileEncodingQueryTest extends NbTestCase { @@ -109,7 +107,7 @@ ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction() { public Void run() throws Exception { EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); - ep.setProperty(J2SEProjectProperties.SOURCE_ENCODING, CP1252.name()); + ep.setProperty(ProjectProperties.SOURCE_ENCODING, CP1252.name()); helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep); ProjectManager.getDefault().saveProject(prj); return null;