Attachment #140959 for bug #236960

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 236960
Collapse All | Expand All





    <!-- ACTUAL CHANGES BEGIN HERE: -->
    <changes>
        <change id="ProjectProperties">
            <api name="java-api-common"/>
            <summary>Extended <code>ProjectProperties</code> by additional common project properties</summary>
            <version major="1" minor="60"/>
            <date day="9" month="10" year="2013"/>
            <author login="tzezula"/>
            <compatibility addition="yes"/>
            <description>
                <p>
                    Extended <code>ProjectProperties</code> by additional common project properties used by shared queries and
                    project generators.
                </p>
            </description>
            <class package="org.netbeans.modules.java.api.common.project" name="ProjectProperties"/>
        </change>
        <change id="BootClassPathImplementation-platform-type">
            <api name="java-api-common"/>
            <summary>Extended <code>BootClassPathImplementation</code> and <code>ClassPathProviderImpl</code> to support non j2se platforms</summary>

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.59	4	OpenIDE-Module-Specification-Version: 1.60




    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


    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 */

Lines 142-148 Link Here

(-)a/java.j2seproject/nbproject/project.xml (-1 / +1 lines)
142	<compile-dependency/>	142	<compile-dependency/>
143	<run-dependency>	143	<run-dependency>
144	<release-version>0-1</release-version>	144	<release-version>0-1</release-version>
145	<specification-version>1.58</specification-version>	145	<specification-version>1.60</specification-version>
146	</run-dependency>	146	</run-dependency>
147	</dependency>	147	</dependency>
148	<dependency>	148	<dependency>




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;

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.

    }

    private Lookup createLookup(final AuxiliaryConfiguration aux, final J2SEProjectOperations ops) {
        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,

            UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()),
            QuerySupport.createUnitTestForSourceQuery(getSourceRoots(), getTestSourceRoots()),
            QuerySupport.createSourceLevelQuery2(evaluator()),
            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),

            LookupProviderSupport.createActionProviderMerger(),
            WhiteListQueryMergerSupport.createWhiteListQueryMerger(),
            BrokenReferencesSupport.createReferenceProblemsProvider(helper, refHelper, eval, lvp.getBreakableProperties(), lvp.getPlatformProperties()),
            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)
        );

            } catch (IOException e) {
                Exceptions.printStackTrace(e);
            }
            String prop = evaluator().getProperty(ProjectProperties.SOURCE_ENCODING);
            if (prop != null) {
                try {
                    Charset.forName(prop);

        @Override
        public AntArtifact[] getBuildArtifacts() {
            return new AntArtifact[] {
                helper.createSimpleAntArtifact(JavaProjectConstants.ARTIFACT_TYPE_JAR, "dist.jar", evaluator(), "jar", "clean", ProjectProperties.BUILD_SCRIPT), // NOI18N
            };
        }





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;

            @Override
            public JavaPlatform run() {
                return CommonProjectUtils.getActivePlatform(
                    project.evaluator().getProperty(ProjectProperties.PLATFORM_ACTIVE));
            }
        });
    }

                    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(ProjectProperties.PLATFORM_ACTIVE, platformId);
                    uh.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
                    updateProjectXml(platform, uh);
                    ProjectManager.getDefault().saveProject(project);

    @Override
    public void propertyChange(@NonNull final PropertyChangeEvent event) {
        final String propName = event.getPropertyName();
        if (propName == null || ProjectProperties.PLATFORM_ACTIVE.equals(propName)) {
            support.firePropertyChange(PROP_PROJECT_PLATFORM, null, null);
        }
    }

Lines 52-58 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectUtil.java (-2 / +1 lines)
52	import java.util.logging.Logger;	52	import java.util.logging.Logger;
53	import org.netbeans.api.project.Project;	53	import org.netbeans.api.project.Project;
54	import org.netbeans.modules.java.api.common.project.ProjectProperties;	54	import org.netbeans.modules.java.api.common.project.ProjectProperties;
55	import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
56	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;	55	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
57	import org.openide.filesystems.FileObject;	56	import org.openide.filesystems.FileObject;
58	import org.openide.filesystems.FileUtil;	57	import org.openide.filesystems.FileUtil;
Lines 114-120 Link Here
114		113
115	public static String getBuildXmlName (final J2SEProject project) {	114	public static String getBuildXmlName (final J2SEProject project) {
116	assert project != null;	115	assert project != null;
117	String buildScriptPath = project.evaluator().getProperty(J2SEProjectProperties.BUILD_SCRIPT);	116	String buildScriptPath = project.evaluator().getProperty(ProjectProperties.BUILD_SCRIPT);
118	if (buildScriptPath == null) {	117	if (buildScriptPath == null) {
119	buildScriptPath = GeneratedFilesHelper.BUILD_XML_PATH;	118	buildScriptPath = GeneratedFilesHelper.BUILD_XML_PATH;
120	}	119	}




            "# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_run.jvmargs_3"), // NOI18N
        }, false);

        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(ProjectProperties.SOURCE_ENCODING, enc.name());
        if (manifestFile != null) {
            ep.setProperty("manifest.file", manifestFile); // NOI18N
        }
        if (buildXmlName != null) {
            ep.put(ProjectProperties.BUILD_SCRIPT, buildXmlName);
        }
        ep.setProperty(J2SEProjectProperties.MKDIST_DISABLED, isLibrary ? "true" : "false");
        ep.setProperty(ProjectProperties.DIST_ARCHIVE_EXCLUDES,""); //NOI18N
        ep.setComment(ProjectProperties.DIST_ARCHIVE_EXCLUDES,
                new String[] {
                    "# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_dist.archive.excludes") //NOI18N
                },




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;

        Parameters.notNull("evt", evt); //NOI18N
        final String propName = evt.getPropertyName();
        if (JavaPlatformManager.PROP_INSTALLED_PLATFORMS.equals(propName) ||
            ProjectProperties.JAVAC_TARGET.equals(propName) ||
            ProjectProperties.JAVAC_PROFILE.equals(propName)) {
            resetAndFire();
        }
    }

                    final J2SEProject j2sePrj = prj.getLookup().lookup(J2SEProject.class);
                    if (j2sePrj != null) {
                        final EditableProperties props = j2sePrj.getUpdateHelper().getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
                        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(ProjectProperties.JAVAC_PROFILE);
                        } else {
                            props.setProperty(ProjectProperties.JAVAC_PROFILE, profile.getName());
                        }
                        j2sePrj.getUpdateHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
                        ProjectManager.getDefault().saveProject(prj);




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;

    private static final String[] BREAKABLE_PROPERTIES = {
        ProjectProperties.JAVAC_CLASSPATH,
        ProjectProperties.RUN_CLASSPATH,
        ProjectProperties.DEBUG_CLASSPATH,
        ProjectProperties.RUN_TEST_CLASSPATH,
        ProjectProperties.DEBUG_TEST_CLASSPATH,
        ProjectProperties.ENDORSED_CLASSPATH,
        ProjectProperties.JAVAC_TEST_CLASSPATH,
    };

    }

    public String[] getPlatformProperties() {
        return new String[] {ProjectProperties.PLATFORM_ACTIVE};
    }
    
    private boolean isCompileOnSaveDisabled() {




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;

        this.profile.setRenderer(uiProperties.JAVAC_PROFILE_RENDERER);
        enableSourceLevel ();
        enableProfiles();
        this.originalEncoding = this.uiProperties.getProject().evaluator().getProperty(ProjectProperties.SOURCE_ENCODING);
        if (this.originalEncoding == null) {
            this.originalEncoding = Charset.defaultCharset().name();
        }

                        NbBundle.getMessage(CustomizerSources.class,"MSG_EncodingWarning"), NotifyDescriptor.WARNING_MESSAGE));
                notified=true;
            }
            this.uiProperties.putAdditionalProperty(ProjectProperties.SOURCE_ENCODING, encName);
    }

    public HelpCtx getHelpCtx() {




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

    
    // Special properties of the project
    public static final String J2SE_PROJECT_NAME = "j2se.project.name"; // NOI18N
    // Properties stored in the PROJECT.PROPERTIES

    // 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
    
    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


        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<? extends PlatformFilter> filters = project.getLookup().lookupAll(PlatformFilter.class);
        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 ();

                PROCESSOR_OPTIONS_MODEL.addRow(new String[] {key, value});
            }
        }
        JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILERARGS );
        
        // CustomizerJar
        DIST_JAR_MODEL = projectGroup.createStringDocument( evaluator, DIST_JAR );




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 {

        ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction<Void>() {
            public Void run() throws Exception {
                EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
                ep.setProperty(ProjectProperties.SOURCE_ENCODING, CP1252.name());
                helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep);
                ProjectManager.getDefault().saveProject(prj);
                return null;

Return to bug 236960

Lines 105-110 Link Here

(-)a/java.api.common/apichanges.xml (+15 lines)
105		105
106	<!-- ACTUAL CHANGES BEGIN HERE: -->	106	<!-- ACTUAL CHANGES BEGIN HERE: -->
107	<changes>	107	<changes>
		108	<change id="ProjectProperties">
		109	<api name="java-api-common"/>
		110	<summary>Extended <code>ProjectProperties</code> by additional common project properties</summary>
		111	<version major="1" minor="60"/>
		112	<date day="9" month="10" year="2013"/>
		113	<author login="tzezula"/>
		114	<compatibility addition="yes"/>
		115	<description>
		116	<p>
		117	Extended <code>ProjectProperties</code> by additional common project properties used by shared queries and
		118	project generators.
		119	</p>
		120	</description>
		121	<class package="org.netbeans.modules.java.api.common.project" name="ProjectProperties"/>
		122	</change>
108	<change id="BootClassPathImplementation-platform-type">	123	<change id="BootClassPathImplementation-platform-type">
109	<api name="java-api-common"/>	124	<api name="java-api-common"/>
110	<summary>Extended <code>BootClassPathImplementation</code> and <code>ClassPathProviderImpl</code> to support non j2se platforms</summary>	125	<summary>Extended <code>BootClassPathImplementation</code> and <code>ClassPathProviderImpl</code> to support non j2se platforms</summary>

Lines 126-131 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java (+180 lines)
126	public static final String INCLUDES = "includes"; // NOI18N	126	public static final String INCLUDES = "includes"; // NOI18N
127	public static final String EXCLUDES = "excludes"; // NOI18N	127	public static final String EXCLUDES = "excludes"; // NOI18N
128		128
		129	//General
		130	/**
		131	* Name of the property holding the project sources encoding.
		132	* @since 1.60
		133	*/
		134	public static final String SOURCE_ENCODING="source.encoding"; // NOI18N
		135	/**
		136	* Name of the property holding the active project platform.
		137	* @since 1.60
		138	*/
		139	public static final String PLATFORM_ACTIVE = "platform.active"; //NOI18N
		140	/**
		141	* Name of the property holding the project main build script reference.
		142	* @since 1.60
		143	*/
		144	public static final String BUILD_SCRIPT ="buildfile"; //NOI18N
		145	/**
		146	* Name of the property holding the project license.
		147	* @since 1.60
		148	*/
		149	public static final String LICENSE_NAME = "project.license";
		150	/**
		151	* Name of the property holding the path to project license.
		152	* @since 1.60
		153	*/
		154	public static final String LICENSE_PATH = "project.licensePath";
		155
		156	//Build & Run
		157	/**
		158	* Name of the property disabling dependency tracking.
		159	* @since 1.60
		160	*/
		161	public static final String NO_DEPENDENCIES="no.dependencies"; // NOI18N
		162	/**
		163	* Name of the property holding the debug project classpath.
		164	* @since 1.60
		165	*/
		166	public static final String DEBUG_CLASSPATH = "debug.classpath"; //NOI18N
		167	/**
		168	* Name of the property holding the debug test classpath.
		169	* @since 1.60
		170	*/
		171	public static final String DEBUG_TEST_CLASSPATH = "debug.test.classpath"; // NOI18N
		172	/**
		173	* Name of the property holding the reference to folder where test results should be generated.
		174	* @since 1.60
		175	*/
		176	public static final String BUILD_TEST_RESULTS_DIR = "build.test.results.dir"; // NOI18N
		177	/**
		178	* Name of the property holding the reference to build generated sources.
		179	* @since 1.60
		180	*/
		181	public static final String BUILD_GENERATED_SOURCES_DIR = "build.generated.sources.dir"; //NOI18N
		182	/**
		183	* Name of the property holding the build excludes.
		184	* @since 1.60
		185	*/
		186	public static final String BUILD_CLASSES_EXCLUDES = "build.classes.excludes"; //NOI18N
129	public static final String RUN_JVM_ARGS = "run.jvmargs"; // NOI18N	187	public static final String RUN_JVM_ARGS = "run.jvmargs"; // NOI18N
130	static final String RUN_JVM_ARGS_IDE = "run.jvmargs.ide"; // NOI18N	188	static final String RUN_JVM_ARGS_IDE = "run.jvmargs.ide"; // NOI18N
131	public static final String RUNTIME_ENCODING="runtime.encoding"; //NOI18N	189	public static final String RUNTIME_ENCODING="runtime.encoding"; //NOI18N
Lines 139-144 Link Here
139		197
140	public static final String PROP_PROJECT_CONFIGURATION_CONFIG = "config"; // NOI18N	198	public static final String PROP_PROJECT_CONFIGURATION_CONFIG = "config"; // NOI18N
141		199
		200	//Javac
		201	/**
		202	* Name of the property holding the javac extra args.
		203	* @since 1.60
		204	*/
		205	public static final String JAVAC_COMPILERARGS = "javac.compilerargs"; //NOI18N
		206	/**
		207	* Name of the property holding the javac source.
		208	* @since 1.60
		209	*/
		210	public static final String JAVAC_SOURCE = "javac.source"; //NOI18N
		211	/**
		212	* Name of the property holding the javac target.
		213	* @since 1.60
		214	*/
		215	public static final String JAVAC_TARGET = "javac.target"; //NOI18N
		216	/**
		217	* Name of the property enabling javac deprecation.
		218	* @since 1.60
		219	*/
		220	public static final String JAVAC_DEPRECATION = "javac.deprecation"; //NOI18N
		221	/**
		222	* Name of the property holding the javac profile.
		223	* @since 1.60
		224	*/
		225	public static final String JAVAC_PROFILE = "javac.profile"; // NOI18N
		226	/**
		227	* Name of the property turning on javac debug info generation.
		228	* @since 1.60
		229	*/
		230	public static final String JAVAC_DEBUG = "javac.debug"; // NOI18N
		231
		232	//Jar
		233	/**
		234	* Name of the property holding the reference to built jar file.
		235	* @since 1.60
		236	*/
		237	public static final String DIST_JAR ="dist.jar"; //NOI18N
		238	/**
		239	* Name of the property holding the reference to distribution directory.
		240	* @since 1.60
		241	*/
		242	public static final String DIST_DIR ="dist.dir"; //NOI18N
		243	/**
		244	* Name of the property enabling jar compression.
		245	* @since 1.60
		246	*/
		247	public static final String JAR_COMPRESS = "jar.compress"; //NOI18N
		248	/**
		249	* Name of the property holding files excluded from jar file.
		250	* @since 1.60
		251	*/
		252	public static final String DIST_ARCHIVE_EXCLUDES = "dist.archive.excludes"; //NOI18N
		253
		254	//Javadoc
		255	/**
		256	* Name of property holding reference to folder where JavaDoc is genered.
		257	* @since 1.60
		258	*/
		259	public static final String DIST_JAVADOC_DIR = "dist.javadoc.dir"; // NOI18N
		260	/**
		261	* Name of property enabling JavaDoc for non public classes.
		262	* @since 1.60
		263	*/
264	public static final String JAVADOC_PRIVATE="javadoc.private"; // NOI18N
265	/**
266	* Name of property disabling javadoc class hierarchy generation.
267	* @since 1.60
268	*/
269	public static final String JAVADOC_NO_TREE="javadoc.notree"; // NOI18N
270	/**
271	* Name of property enabling creation of javadoc class and package usage pages.
272	* @since 1.60
273	*/
274	public static final String JAVADOC_USE="javadoc.use"; // NOI18N
275	/**
276	* Name of property disabling creation of javadoc navigation bar.
277	* @since 1.60
278	*/
279	public static final String JAVADOC_NO_NAVBAR="javadoc.nonavbar"; // NOI18N
280	/**
281	* Name of property disabling creation of javadoc index.
282	* @since 1.60
283	*/
284	public static final String JAVADOC_NO_INDEX="javadoc.noindex"; // NOI18N
285	/**
286	* Name of property enabling of javadoc split index.
287	* @since 1.60
288	*/
289	public static final String JAVADOC_SPLIT_INDEX="javadoc.splitindex"; // NOI18N
290	/**
291	* Name of property holding the javadoc author.
292	* @since 1.60
293	*/
294	public static final String JAVADOC_AUTHOR="javadoc.author"; // NOI18N
295	/**
296	* Name of property holding the javadoc version.
297	* @since 1.60
298	*/
299	public static final String JAVADOC_VERSION="javadoc.version"; // NOI18N
300	/**
301	* Name of property holding the javadoc window title.
302	* @since 1.60
303	*/
304	public static final String JAVADOC_WINDOW_TITLE="javadoc.windowtitle"; // NOI18N
305	/**
306	* Name of property holding the javadoc encoding.
307	* @since 1.60
308	*/
309	public static final String JAVADOC_ENCODING="javadoc.encoding"; // NOI18N
310	/**
311	* Name of property holding the javadoc additional parameters.
312	* @since 1.60
313	*/
314	public static final String JAVADOC_ADDITIONALPARAM="javadoc.additionalparam"; // NOI18N
315	//Javadoc stored in the PRIVATE.PROPERTIES
316	/**
317	* Name of property enabling javadoc preview.
318	* @since 1.60
319	*/
320	public static final String JAVADOC_PREVIEW="javadoc.preview"; // NOI18N
321
142	/** @since org.netbeans.modules.java.j2seproject/1 1.12 */	322	/** @since org.netbeans.modules.java.j2seproject/1 1.12 */
143	public static final String DO_DEPEND = "do.depend"; // NOI18N	323	public static final String DO_DEPEND = "do.depend"; // NOI18N
144	/** @since org.netbeans.modules.java.j2seproject/1 1.12 */	324	/** @since org.netbeans.modules.java.j2seproject/1 1.12 */

Lines 51-56 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectPlatformImpl.java (-3 / +4 lines)
51	import org.netbeans.api.java.platform.JavaPlatformManager;	51	import org.netbeans.api.java.platform.JavaPlatformManager;
52	import org.netbeans.api.project.ProjectManager;	52	import org.netbeans.api.project.ProjectManager;
53	import org.netbeans.modules.java.api.common.ant.UpdateHelper;	53	import org.netbeans.modules.java.api.common.ant.UpdateHelper;
		54	import org.netbeans.modules.java.api.common.project.ProjectProperties;
54	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;	55	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
55	import org.netbeans.modules.java.j2seproject.api.J2SEProjectPlatform;	56	import org.netbeans.modules.java.j2seproject.api.J2SEProjectPlatform;
56	import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;	57	import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
Lines 91-97 Link Here
91	@Override	92	@Override
92	public JavaPlatform run() {	93	public JavaPlatform run() {
93	return CommonProjectUtils.getActivePlatform(	94	return CommonProjectUtils.getActivePlatform(
94	project.evaluator().getProperty(J2SEProjectProperties.JAVA_PLATFORM));	95	project.evaluator().getProperty(ProjectProperties.PLATFORM_ACTIVE));
95	}	96	}
96	});	97	});
97	}	98	}
Lines 119-125 Link Here
119	final String platformId = platform.getProperties().get(J2SEProjectProperties.PROP_PLATFORM_ANT_NAME);	120	final String platformId = platform.getProperties().get(J2SEProjectProperties.PROP_PLATFORM_ANT_NAME);
120	final UpdateHelper uh = project.getUpdateHelper();	121	final UpdateHelper uh = project.getUpdateHelper();
121	final EditableProperties props = uh.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);	122	final EditableProperties props = uh.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
122	props.setProperty(J2SEProjectProperties.JAVA_PLATFORM, platformId);	123	props.setProperty(ProjectProperties.PLATFORM_ACTIVE, platformId);
123	uh.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);	124	uh.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
124	updateProjectXml(platform, uh);	125	updateProjectXml(platform, uh);
125	ProjectManager.getDefault().saveProject(project);	126	ProjectManager.getDefault().saveProject(project);
Lines 146-152 Link Here
146	@Override	147	@Override
147	public void propertyChange(@NonNull final PropertyChangeEvent event) {	148	public void propertyChange(@NonNull final PropertyChangeEvent event) {
148	final String propName = event.getPropertyName();	149	final String propName = event.getPropertyName();
149	if (propName == null \|\| J2SEProjectProperties.JAVA_PLATFORM.equals(propName)) {	150	if (propName == null \|\| ProjectProperties.PLATFORM_ACTIVE.equals(propName)) {
150	support.firePropertyChange(PROP_PROJECT_PLATFORM, null, null);	151	support.firePropertyChange(PROP_PROJECT_PLATFORM, null, null);
151	}	152	}
152	}	153	}

Lines 506-533 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectBuilder.java (-15 / +15 lines)
506	"# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_run.jvmargs_3"), // NOI18N	506	"# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_run.jvmargs_3"), // NOI18N
507	}, false);	507	}, false);
508		508
509	ep.setProperty(J2SEProjectProperties.JAVADOC_PRIVATE, "false"); // NOI18N	509	ep.setProperty(ProjectProperties.JAVADOC_PRIVATE, "false"); // NOI18N
510	ep.setProperty(J2SEProjectProperties.JAVADOC_NO_TREE, "false"); // NOI18N	510	ep.setProperty(ProjectProperties.JAVADOC_NO_TREE, "false"); // NOI18N
511	ep.setProperty(J2SEProjectProperties.JAVADOC_USE, "true"); // NOI18N	511	ep.setProperty(ProjectProperties.JAVADOC_USE, "true"); // NOI18N
512	ep.setProperty(J2SEProjectProperties.JAVADOC_NO_NAVBAR, "false"); // NOI18N	512	ep.setProperty(ProjectProperties.JAVADOC_NO_NAVBAR, "false"); // NOI18N
513	ep.setProperty(J2SEProjectProperties.JAVADOC_NO_INDEX, "false"); // NOI18N	513	ep.setProperty(ProjectProperties.JAVADOC_NO_INDEX, "false"); // NOI18N
514	ep.setProperty(J2SEProjectProperties.JAVADOC_SPLIT_INDEX, "true"); // NOI18N	514	ep.setProperty(ProjectProperties.JAVADOC_SPLIT_INDEX, "true"); // NOI18N
515	ep.setProperty(J2SEProjectProperties.JAVADOC_AUTHOR, "false"); // NOI18N	515	ep.setProperty(ProjectProperties.JAVADOC_AUTHOR, "false"); // NOI18N
516	ep.setProperty(J2SEProjectProperties.JAVADOC_VERSION, "false"); // NOI18N	516	ep.setProperty(ProjectProperties.JAVADOC_VERSION, "false"); // NOI18N
517	ep.setProperty(J2SEProjectProperties.JAVADOC_WINDOW_TITLE, ""); // NOI18N	517	ep.setProperty(ProjectProperties.JAVADOC_WINDOW_TITLE, ""); // NOI18N
518	ep.setProperty(J2SEProjectProperties.JAVADOC_ENCODING, "${"+J2SEProjectProperties.SOURCE_ENCODING+"}"); // NOI18N	518	ep.setProperty(ProjectProperties.JAVADOC_ENCODING, "${"+ProjectProperties.SOURCE_ENCODING+"}"); // NOI18N
519	ep.setProperty(J2SEProjectProperties.JAVADOC_ADDITIONALPARAM, ""); // NOI18N	519	ep.setProperty(ProjectProperties.JAVADOC_ADDITIONALPARAM, ""); // NOI18N
520	Charset enc = FileEncodingQuery.getDefaultEncoding();	520	Charset enc = FileEncodingQuery.getDefaultEncoding();
521	ep.setProperty(J2SEProjectProperties.SOURCE_ENCODING, enc.name());	521	ep.setProperty(ProjectProperties.SOURCE_ENCODING, enc.name());
522	if (manifestFile != null) {	522	if (manifestFile != null) {
523	ep.setProperty("manifest.file", manifestFile); // NOI18N	523	ep.setProperty("manifest.file", manifestFile); // NOI18N
524	}	524	}
525	if (buildXmlName != null) {	525	if (buildXmlName != null) {
526	ep.put(J2SEProjectProperties.BUILD_SCRIPT, buildXmlName);	526	ep.put(ProjectProperties.BUILD_SCRIPT, buildXmlName);
527	}	527	}
528	ep.setProperty(J2SEProjectProperties.MKDIST_DISABLED, isLibrary ? "true" : "false");	528	ep.setProperty(J2SEProjectProperties.MKDIST_DISABLED, isLibrary ? "true" : "false");
529	ep.setProperty(J2SEProjectProperties.DIST_ARCHIVE_EXCLUDES,""); //NOI18N	529	ep.setProperty(ProjectProperties.DIST_ARCHIVE_EXCLUDES,""); //NOI18N
530	ep.setComment(J2SEProjectProperties.DIST_ARCHIVE_EXCLUDES,	530	ep.setComment(ProjectProperties.DIST_ARCHIVE_EXCLUDES,
531	new String[] {	531	new String[] {
532	"# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_dist.archive.excludes") //NOI18N	532	"# " + NbBundle.getMessage(J2SEProjectGenerator.class, "COMMENT_dist.archive.excludes") //NOI18N
533	},	533	},

Lines 57-62 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerSources.java (-2 / +3 lines)
57	import javax.swing.event.ListDataListener;	57	import javax.swing.event.ListDataListener;
58	import javax.swing.table.TableColumn;	58	import javax.swing.table.TableColumn;
59	import javax.swing.table.TableModel;	59	import javax.swing.table.TableModel;
		60	import org.netbeans.modules.java.api.common.project.ProjectProperties;
60	import org.netbeans.modules.java.api.common.project.ui.customizer.SourceRootsUi;	61	import org.netbeans.modules.java.api.common.project.ui.customizer.SourceRootsUi;
61	import org.netbeans.modules.java.api.common.ui.PlatformUiSupport;	62	import org.netbeans.modules.java.api.common.ui.PlatformUiSupport;
62	import org.netbeans.spi.java.project.support.ui.IncludeExcludeVisualizer;	63	import org.netbeans.spi.java.project.support.ui.IncludeExcludeVisualizer;
Lines 146-152 Link Here
146	this.profile.setRenderer(uiProperties.JAVAC_PROFILE_RENDERER);	147	this.profile.setRenderer(uiProperties.JAVAC_PROFILE_RENDERER);
147	enableSourceLevel ();	148	enableSourceLevel ();
148	enableProfiles();	149	enableProfiles();
149	this.originalEncoding = this.uiProperties.getProject().evaluator().getProperty(J2SEProjectProperties.SOURCE_ENCODING);	150	this.originalEncoding = this.uiProperties.getProject().evaluator().getProperty(ProjectProperties.SOURCE_ENCODING);
150	if (this.originalEncoding == null) {	151	if (this.originalEncoding == null) {
151	this.originalEncoding = Charset.defaultCharset().name();	152	this.originalEncoding = Charset.defaultCharset().name();
152	}	153	}
Lines 244-250 Link Here
244	NbBundle.getMessage(CustomizerSources.class,"MSG_EncodingWarning"), NotifyDescriptor.WARNING_MESSAGE));	245	NbBundle.getMessage(CustomizerSources.class,"MSG_EncodingWarning"), NotifyDescriptor.WARNING_MESSAGE));
245	notified=true;	246	notified=true;
246	}	247	}
247	this.uiProperties.putAdditionalProperty(J2SEProjectProperties.SOURCE_ENCODING, encName);	248	this.uiProperties.putAdditionalProperty(ProjectProperties.SOURCE_ENCODING, encName);
248	}	249	}
249		250
250	public HelpCtx getHelpCtx() {	251	public HelpCtx getHelpCtx() {

Lines 51-68 Link Here

(-)a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/queries/FileEncodingQueryTest.java (-4 / +2 lines)
51	import org.netbeans.api.project.Project;	51	import org.netbeans.api.project.Project;
52	import org.netbeans.api.project.ProjectManager;	52	import org.netbeans.api.project.ProjectManager;
53	import org.netbeans.junit.NbTestCase;	53	import org.netbeans.junit.NbTestCase;
		54	import org.netbeans.modules.java.api.common.project.ProjectProperties;
54	import org.netbeans.modules.java.j2seproject.J2SEProject;	55	import org.netbeans.modules.java.j2seproject.J2SEProject;
55	import org.netbeans.modules.java.j2seproject.J2SEProjectGenerator;	56	import org.netbeans.modules.java.j2seproject.J2SEProjectGenerator;
56	import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
57	import org.openide.filesystems.FileObject;	57	import org.openide.filesystems.FileObject;
58	import org.netbeans.spi.queries.FileEncodingQueryImplementation;	58	import org.netbeans.spi.queries.FileEncodingQueryImplementation;
59	import org.netbeans.spi.project.support.ant.AntProjectHelper;	59	import org.netbeans.spi.project.support.ant.AntProjectHelper;
60	import org.netbeans.spi.project.support.ant.EditableProperties;	60	import org.netbeans.spi.project.support.ant.EditableProperties;
61	import org.openide.filesystems.FileUtil;	61	import org.openide.filesystems.FileUtil;
62	import org.openide.filesystems.FileUtil;
63	import org.openide.modules.SpecificationVersion;	62	import org.openide.modules.SpecificationVersion;
64	import org.openide.util.Mutex;	63	import org.openide.util.Mutex;
65	import org.openide.util.lookup.Lookups;
66	import org.openide.util.test.MockLookup;	64	import org.openide.util.test.MockLookup;
67		65
68	public class FileEncodingQueryTest extends NbTestCase {	66	public class FileEncodingQueryTest extends NbTestCase {
Lines 109-115 Link Here
109	ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction<Void>() {	107	ProjectManager.mutex().writeAccess(new Mutex.ExceptionAction<Void>() {
110	public Void run() throws Exception {	108	public Void run() throws Exception {
111	EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);	109	EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
112	ep.setProperty(J2SEProjectProperties.SOURCE_ENCODING, CP1252.name());	110	ep.setProperty(ProjectProperties.SOURCE_ENCODING, CP1252.name());
113	helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep);	111	helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep);
114	ProjectManager.getDefault().saveProject(prj);	112	ProjectManager.getDefault().saveProject(prj);
115	return null;	113	return null;

Lines 48-54 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java (-2 / +1 lines)
48	import org.netbeans.api.project.ProjectManager;	48	import org.netbeans.api.project.ProjectManager;
49	import org.netbeans.modules.java.api.common.ant.UpdateImplementation;	49	import org.netbeans.modules.java.api.common.ant.UpdateImplementation;
50	import org.netbeans.modules.java.api.common.project.ProjectProperties;	50	import org.netbeans.modules.java.api.common.project.ProjectProperties;
51	import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
52	import org.netbeans.spi.project.AuxiliaryConfiguration;	51	import org.netbeans.spi.project.AuxiliaryConfiguration;
53	import org.netbeans.spi.project.support.ant.AntProjectHelper;	52	import org.netbeans.spi.project.support.ant.AntProjectHelper;
54	import org.netbeans.spi.project.support.ant.EditableProperties;	53	import org.netbeans.spi.project.support.ant.EditableProperties;
Lines 191-197 Link Here
191	public synchronized EditableProperties getUpdatedProjectProperties () {	190	public synchronized EditableProperties getUpdatedProjectProperties () {
192	EditableProperties cachedProperties = this.helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);	191	EditableProperties cachedProperties = this.helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
193	//The javadoc.additionalparam was not in NB 4.0	192	//The javadoc.additionalparam was not in NB 4.0
194	ensureValueExists(cachedProperties, J2SEProjectProperties.JAVADOC_ADDITIONALPARAM,""); //NOI18N	193	ensureValueExists(cachedProperties, ProjectProperties.JAVADOC_ADDITIONALPARAM,""); //NOI18N
195	ensureValueExists(cachedProperties, "build.generated.dir","${build.dir}/generated"); //NOI18N	194	ensureValueExists(cachedProperties, "build.generated.dir","${build.dir}/generated"); //NOI18N
196	ensureValueExists(cachedProperties, "meta.inf.dir","${src.dir}/META-INF"); //NOI18N	195	ensureValueExists(cachedProperties, "meta.inf.dir","${src.dir}/META-INF"); //NOI18N
197	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_ENABLED, "true"); //NOI18N	196	ensureValueExists(cachedProperties, ProjectProperties.ANNOTATION_PROCESSING_ENABLED, "true"); //NOI18N