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

(-)a/java.api.common/apichanges.xml (+15 lines)
 Lines 105-110    Link Here 
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>
(-)a/java.api.common/manifest.mf (-1 / +1 lines)
 Lines 1-4    Link Here 
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
(-)a/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java (+180 lines)
 Lines 126-131    Link Here 
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 */
(-)a/java.j2seproject/nbproject/project.xml (-1 / +1 lines)
 Lines 142-148    Link Here 
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>
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java (-8 / +6 lines)
 Lines 98-104    Link Here 
98
import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
98
import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
99
import org.netbeans.modules.java.j2seproject.ui.J2SELogicalViewProvider;
99
import org.netbeans.modules.java.j2seproject.ui.J2SELogicalViewProvider;
100
import org.netbeans.modules.java.j2seproject.ui.customizer.CustomizerProviderImpl;
100
import org.netbeans.modules.java.j2seproject.ui.customizer.CustomizerProviderImpl;
101
import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
102
import org.netbeans.modules.project.ui.spi.TemplateCategorySorter;
101
import org.netbeans.modules.project.ui.spi.TemplateCategorySorter;
103
import org.netbeans.spi.java.project.support.ExtraSourceJavadocSupport;
102
import org.netbeans.spi.java.project.support.ExtraSourceJavadocSupport;
104
import org.netbeans.spi.java.project.support.LookupMergerSupport;
103
import org.netbeans.spi.java.project.support.LookupMergerSupport;
 Lines 151-157    Link Here 
151
import org.openide.loaders.DataObject;
150
import org.openide.loaders.DataObject;
152
import org.openide.modules.SpecificationVersion;
151
import org.openide.modules.SpecificationVersion;
153
import org.openide.util.RequestProcessor;
152
import org.openide.util.RequestProcessor;
154
import org.openide.xml.XMLUtil;
155
/**
153
/**
156
 * Represents one plain J2SE project.
154
 * Represents one plain J2SE project.
157
 * @author Jesse Glick, et al.
155
 * @author Jesse Glick, et al.
 Lines 362-368    Link Here 
362
    }
360
    }
363
361
364
    private Lookup createLookup(final AuxiliaryConfiguration aux, final J2SEProjectOperations ops) {
362
    private Lookup createLookup(final AuxiliaryConfiguration aux, final J2SEProjectOperations ops) {
365
        final FileEncodingQueryImplementation encodingQuery = QuerySupport.createFileEncodingQuery(evaluator(), J2SEProjectProperties.SOURCE_ENCODING);
363
        final FileEncodingQueryImplementation encodingQuery = QuerySupport.createFileEncodingQuery(evaluator(), ProjectProperties.SOURCE_ENCODING);
366
        final J2SELogicalViewProvider lvp = new J2SELogicalViewProvider(this, this.updateHelper, evaluator(), refHelper);
364
        final J2SELogicalViewProvider lvp = new J2SELogicalViewProvider(this, this.updateHelper, evaluator(), refHelper);
367
        final Lookup base = Lookups.fixed(
365
        final Lookup base = Lookups.fixed(
368
            J2SEProject.this,
366
            J2SEProject.this,
 Lines 382-388    Link Here 
382
            UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()),
380
            UILookupMergerSupport.createProjectOpenHookMerger(new ProjectOpenedHookImpl()),
383
            QuerySupport.createUnitTestForSourceQuery(getSourceRoots(), getTestSourceRoots()),
381
            QuerySupport.createUnitTestForSourceQuery(getSourceRoots(), getTestSourceRoots()),
384
            QuerySupport.createSourceLevelQuery2(evaluator()),
382
            QuerySupport.createSourceLevelQuery2(evaluator()),
385
            QuerySupport.createSources(this, helper, evaluator(), getSourceRoots(), getTestSourceRoots(), Roots.nonSourceRoots(ProjectProperties.BUILD_DIR, J2SEProjectProperties.DIST_DIR)),
383
            QuerySupport.createSources(this, helper, evaluator(), getSourceRoots(), getTestSourceRoots(), Roots.nonSourceRoots(ProjectProperties.BUILD_DIR, ProjectProperties.DIST_DIR)),
386
            QuerySupport.createSharabilityQuery2(helper, evaluator(), getSourceRoots(), getTestSourceRoots()),
384
            QuerySupport.createSharabilityQuery2(helper, evaluator(), getSourceRoots(), getTestSourceRoots()),
387
            new CoSAwareFileBuiltQueryImpl(QuerySupport.createFileBuiltQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots()), this),
385
            new CoSAwareFileBuiltQueryImpl(QuerySupport.createFileBuiltQuery(helper, evaluator(), getSourceRoots(), getTestSourceRoots()), this),
388
            new RecommendedTemplatesImpl (this.updateHelper),
386
            new RecommendedTemplatesImpl (this.updateHelper),
 Lines 407-414    Link Here 
407
            LookupProviderSupport.createActionProviderMerger(),
405
            LookupProviderSupport.createActionProviderMerger(),
408
            WhiteListQueryMergerSupport.createWhiteListQueryMerger(),
406
            WhiteListQueryMergerSupport.createWhiteListQueryMerger(),
409
            BrokenReferencesSupport.createReferenceProblemsProvider(helper, refHelper, eval, lvp.getBreakableProperties(), lvp.getPlatformProperties()),
407
            BrokenReferencesSupport.createReferenceProblemsProvider(helper, refHelper, eval, lvp.getBreakableProperties(), lvp.getPlatformProperties()),
410
            BrokenReferencesSupport.createPlatformVersionProblemProvider(helper, eval, new PlatformChangedHook(), JavaPlatform.getDefault().getSpecification().getName(), J2SEProjectProperties.JAVA_PLATFORM, J2SEProjectProperties.JAVAC_SOURCE, J2SEProjectProperties.JAVAC_TARGET),
408
            BrokenReferencesSupport.createPlatformVersionProblemProvider(helper, eval, new PlatformChangedHook(), JavaPlatform.getDefault().getSpecification().getName(), ProjectProperties.PLATFORM_ACTIVE, ProjectProperties.JAVAC_SOURCE, ProjectProperties.JAVAC_TARGET),
411
            BrokenReferencesSupport.createProfileProblemProvider(helper, refHelper, eval, J2SEProjectProperties.JAVAC_PROFILE, ProjectProperties.RUN_CLASSPATH, ProjectProperties.ENDORSED_CLASSPATH),
409
            BrokenReferencesSupport.createProfileProblemProvider(helper, refHelper, eval, ProjectProperties.JAVAC_PROFILE, ProjectProperties.RUN_CLASSPATH, ProjectProperties.ENDORSED_CLASSPATH),
412
            UILookupMergerSupport.createProjectProblemsProviderMerger(),
410
            UILookupMergerSupport.createProjectProblemsProviderMerger(),
413
            new J2SEProjectPlatformImpl(this)
411
            new J2SEProjectPlatformImpl(this)
414
        );
412
        );
 Lines 672-678    Link Here 
672
            } catch (IOException e) {
670
            } catch (IOException e) {
673
                Exceptions.printStackTrace(e);
671
                Exceptions.printStackTrace(e);
674
            }
672
            }
675
            String prop = evaluator().getProperty(J2SEProjectProperties.SOURCE_ENCODING);
673
            String prop = evaluator().getProperty(ProjectProperties.SOURCE_ENCODING);
676
            if (prop != null) {
674
            if (prop != null) {
677
                try {
675
                try {
678
                    Charset.forName(prop);
676
                    Charset.forName(prop);
 Lines 737-743    Link Here 
737
        @Override
735
        @Override
738
        public AntArtifact[] getBuildArtifacts() {
736
        public AntArtifact[] getBuildArtifacts() {
739
            return new AntArtifact[] {
737
            return new AntArtifact[] {
740
                helper.createSimpleAntArtifact(JavaProjectConstants.ARTIFACT_TYPE_JAR, "dist.jar", evaluator(), "jar", "clean", J2SEProjectProperties.BUILD_SCRIPT), // NOI18N
738
                helper.createSimpleAntArtifact(JavaProjectConstants.ARTIFACT_TYPE_JAR, "dist.jar", evaluator(), "jar", "clean", ProjectProperties.BUILD_SCRIPT), // NOI18N
741
            };
739
            };
742
        }
740
        }
743
741
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectPlatformImpl.java (-3 / +4 lines)
 Lines 51-56    Link Here 
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
    }
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProjectUtil.java (-2 / +1 lines)
 Lines 52-58    Link Here 
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
        }
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/UpdateProjectImpl.java (-2 / +1 lines)
 Lines 48-54    Link Here 
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
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectBuilder.java (-15 / +15 lines)
 Lines 506-533    Link Here 
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
                },
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/problems/RuntimePlatformProblemsProvider.java (-6 / +7 lines)
 Lines 72-77    Link Here 
72
import org.netbeans.api.project.Project;
72
import org.netbeans.api.project.Project;
73
import org.netbeans.api.project.ProjectManager;
73
import org.netbeans.api.project.ProjectManager;
74
import org.netbeans.api.project.ProjectUtils;
74
import org.netbeans.api.project.ProjectUtils;
75
import org.netbeans.modules.java.api.common.project.ProjectProperties;
75
import org.netbeans.modules.java.j2seproject.J2SEProject;
76
import org.netbeans.modules.java.j2seproject.J2SEProject;
76
import org.netbeans.modules.java.j2seproject.api.J2SECustomPropertySaver;
77
import org.netbeans.modules.java.j2seproject.api.J2SECustomPropertySaver;
77
import org.netbeans.modules.java.j2seproject.api.J2SERuntimePlatformProvider;
78
import org.netbeans.modules.java.j2seproject.api.J2SERuntimePlatformProvider;
 Lines 167-174    Link Here 
167
        Parameters.notNull("evt", evt); //NOI18N
168
        Parameters.notNull("evt", evt); //NOI18N
168
        final String propName = evt.getPropertyName();
169
        final String propName = evt.getPropertyName();
169
        if (JavaPlatformManager.PROP_INSTALLED_PLATFORMS.equals(propName) ||
170
        if (JavaPlatformManager.PROP_INSTALLED_PLATFORMS.equals(propName) ||
170
            J2SEProjectProperties.JAVAC_TARGET.equals(propName) ||
171
            ProjectProperties.JAVAC_TARGET.equals(propName) ||
171
            J2SEProjectProperties.JAVAC_PROFILE.equals(propName)) {
172
            ProjectProperties.JAVAC_PROFILE.equals(propName)) {
172
            resetAndFire();
173
            resetAndFire();
173
        }
174
        }
174
    }
175
    }
 Lines 527-539    Link Here 
527
                    final J2SEProject j2sePrj = prj.getLookup().lookup(J2SEProject.class);
528
                    final J2SEProject j2sePrj = prj.getLookup().lookup(J2SEProject.class);
528
                    if (j2sePrj != null) {
529
                    if (j2sePrj != null) {
529
                        final EditableProperties props = j2sePrj.getUpdateHelper().getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
530
                        final EditableProperties props = j2sePrj.getUpdateHelper().getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
530
                        props.setProperty(J2SEProjectProperties.JAVAC_SOURCE, jp.getSpecification().getVersion().toString());
531
                        props.setProperty(ProjectProperties.JAVAC_SOURCE, jp.getSpecification().getVersion().toString());
531
                        props.setProperty(J2SEProjectProperties.JAVAC_TARGET, jp.getSpecification().getVersion().toString());
532
                        props.setProperty(ProjectProperties.JAVAC_TARGET, jp.getSpecification().getVersion().toString());
532
                        final SourceLevelQuery.Profile profile = getPlatformProfile(jp);
533
                        final SourceLevelQuery.Profile profile = getPlatformProfile(jp);
533
                        if (profile == SourceLevelQuery.Profile.DEFAULT) {
534
                        if (profile == SourceLevelQuery.Profile.DEFAULT) {
534
                            props.remove(J2SEProjectProperties.JAVAC_PROFILE);
535
                            props.remove(ProjectProperties.JAVAC_PROFILE);
535
                        } else {
536
                        } else {
536
                            props.setProperty(J2SEProjectProperties.JAVAC_PROFILE, profile.getName());
537
                            props.setProperty(ProjectProperties.JAVAC_PROFILE, profile.getName());
537
                        }
538
                        }
538
                        j2sePrj.getUpdateHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
539
                        j2sePrj.getUpdateHelper().putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
539
                        ProjectManager.getDefault().saveProject(prj);
540
                        ProjectManager.getDefault().saveProject(prj);
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/J2SELogicalViewProvider.java (-4 / +3 lines)
 Lines 68-74    Link Here 
68
import org.netbeans.modules.java.api.common.project.ProjectProperties;
68
import org.netbeans.modules.java.api.common.project.ProjectProperties;
69
import org.netbeans.modules.java.api.common.project.ui.LogicalViewProvider2;
69
import org.netbeans.modules.java.api.common.project.ui.LogicalViewProvider2;
70
import org.netbeans.modules.java.j2seproject.J2SEProjectUtil;
70
import org.netbeans.modules.java.j2seproject.J2SEProjectUtil;
71
import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
72
import org.netbeans.modules.java.j2seproject.J2SEProject;
71
import org.netbeans.modules.java.j2seproject.J2SEProject;
73
import org.netbeans.spi.java.project.support.ui.PackageView;
72
import org.netbeans.spi.java.project.support.ui.PackageView;
74
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
73
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
 Lines 113-121    Link Here 
113
    private static final String[] BREAKABLE_PROPERTIES = {
112
    private static final String[] BREAKABLE_PROPERTIES = {
114
        ProjectProperties.JAVAC_CLASSPATH,
113
        ProjectProperties.JAVAC_CLASSPATH,
115
        ProjectProperties.RUN_CLASSPATH,
114
        ProjectProperties.RUN_CLASSPATH,
116
        J2SEProjectProperties.DEBUG_CLASSPATH,
115
        ProjectProperties.DEBUG_CLASSPATH,
117
        ProjectProperties.RUN_TEST_CLASSPATH,
116
        ProjectProperties.RUN_TEST_CLASSPATH,
118
        J2SEProjectProperties.DEBUG_TEST_CLASSPATH,
117
        ProjectProperties.DEBUG_TEST_CLASSPATH,
119
        ProjectProperties.ENDORSED_CLASSPATH,
118
        ProjectProperties.ENDORSED_CLASSPATH,
120
        ProjectProperties.JAVAC_TEST_CLASSPATH,
119
        ProjectProperties.JAVAC_TEST_CLASSPATH,
121
    };
120
    };
 Lines 319-325    Link Here 
319
    }
318
    }
320
319
321
    public String[] getPlatformProperties() {
320
    public String[] getPlatformProperties() {
322
        return new String[] {J2SEProjectProperties.JAVA_PLATFORM};
321
        return new String[] {ProjectProperties.PLATFORM_ACTIVE};
323
    }
322
    }
324
    
323
    
325
    private boolean isCompileOnSaveDisabled() {
324
    private boolean isCompileOnSaveDisabled() {
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerSources.java (-2 / +3 lines)
 Lines 57-62    Link Here 
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() {
(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java (-58 / +5 lines)
 Lines 111-116    Link Here 
111
import org.openide.filesystems.FileUtil;
111
import org.openide.filesystems.FileUtil;
112
import org.openide.util.*;
112
import org.openide.util.*;
113
import org.openide.util.lookup.Lookups;
113
import org.openide.util.lookup.Lookups;
114
import static org.netbeans.modules.java.api.common.project.ProjectProperties.*;
114
115
115
/**
116
/**
116
 * @author Petr Hrebejk
117
 * @author Petr Hrebejk
 Lines 130-197    Link Here 
130
    
131
    
131
    // Special properties of the project
132
    // Special properties of the project
132
    public static final String J2SE_PROJECT_NAME = "j2se.project.name"; // NOI18N
133
    public static final String J2SE_PROJECT_NAME = "j2se.project.name"; // NOI18N
133
    public static final String JAVA_PLATFORM = "platform.active"; // NOI18N
134
    // Properties stored in the PROJECT.PROPERTIES
134
135
    // folowing properties have moved to ProjectProperties in java.api.common module:
136
    //public static final String JAVAC_CLASSPATH = "javac.classpath"; // NOI18N
137
    //public static final String RUN_CLASSPATH = "run.classpath"; // NOI18N
138
    //public static final String JAVAC_TEST_CLASSPATH = "javac.test.classpath"; // NOI18N
139
    //public static final String RUN_TEST_CLASSPATH = "run.test.classpath"; // NOI18N
140
    //public static final String BUILD_CLASSES_DIR = "build.classes.dir"; // NOI18N
141
    //public static final String BUILD_TEST_CLASSES_DIR = "build.test.classes.dir"; // NOI18N
142
    //public static final String INCLUDES = "includes"; // NOI18N
143
    //public static final String EXCLUDES = "excludes"; // NOI18N
144
    //public static final String[] WELL_KNOWN_PATHS = new String[] {            
145
    //public static final String ANT_ARTIFACT_PREFIX = "${reference."; // NOI18N
146
    
147
    // Properties stored in the PROJECT.PROPERTIES    
148
    public static final String DIST_DIR = "dist.dir"; // NOI18N
149
    public static final String DIST_JAR = "dist.jar"; // NOI18N
150
    public static final String DEBUG_CLASSPATH = "debug.classpath"; // NOI18N
151
    public static final String JAR_COMPRESS = "jar.compress"; // NOI18N
152
    public static final String JAVAC_SOURCE = "javac.source"; // NOI18N
153
    public static final String JAVAC_TARGET = "javac.target"; // NOI18N
154
    public static final String JAVAC_PROFILE = "javac.profile"; // NOI18N
155
    public static final String JAVAC_DEBUG = "javac.debug"; // NOI18N
156
    public static final String JAVAC_DEPRECATION = "javac.deprecation"; // NOI18N
157
    public static final String JAVAC_COMPILER_ARG = "javac.compilerargs";    //NOI18N
158
    public static final String BUILD_TEST_RESULTS_DIR = "build.test.results.dir"; // NOI18N
159
    public static final String BUILD_CLASSES_EXCLUDES = "build.classes.excludes"; // NOI18N
160
    public static final String DIST_JAVADOC_DIR = "dist.javadoc.dir"; // NOI18N
161
    public static final String NO_DEPENDENCIES="no.dependencies"; // NOI18N
162
    public static final String DEBUG_TEST_CLASSPATH = "debug.test.classpath"; // NOI18N
163
    public static final String SOURCE_ENCODING="source.encoding"; // NOI18N
164
    
165
    
166
    public static final String JAVADOC_PRIVATE="javadoc.private"; // NOI18N
167
    public static final String JAVADOC_NO_TREE="javadoc.notree"; // NOI18N
168
    public static final String JAVADOC_USE="javadoc.use"; // NOI18N
169
    public static final String JAVADOC_NO_NAVBAR="javadoc.nonavbar"; // NOI18N
170
    public static final String JAVADOC_NO_INDEX="javadoc.noindex"; // NOI18N
171
    public static final String JAVADOC_SPLIT_INDEX="javadoc.splitindex"; // NOI18N
172
    public static final String JAVADOC_AUTHOR="javadoc.author"; // NOI18N
173
    public static final String JAVADOC_VERSION="javadoc.version"; // NOI18N
174
    public static final String JAVADOC_WINDOW_TITLE="javadoc.windowtitle"; // NOI18N
175
    public static final String JAVADOC_ENCODING="javadoc.encoding"; // NOI18N
176
    public static final String JAVADOC_ADDITIONALPARAM="javadoc.additionalparam"; // NOI18N
177
    
178
    public static final String APPLICATION_TITLE ="application.title"; // NOI18N
135
    public static final String APPLICATION_TITLE ="application.title"; // NOI18N
179
    public static final String APPLICATION_VENDOR ="application.vendor"; // NOI18N
136
    public static final String APPLICATION_VENDOR ="application.vendor"; // NOI18N
180
    public static final String APPLICATION_DESC ="application.desc"; // NOI18N
137
    public static final String APPLICATION_DESC ="application.desc"; // NOI18N
181
    public static final String APPLICATION_HOMEPAGE ="application.homepage"; // NOI18N
138
    public static final String APPLICATION_HOMEPAGE ="application.homepage"; // NOI18N
182
    public static final String APPLICATION_SPLASH ="application.splash"; // NOI18N
139
    public static final String APPLICATION_SPLASH ="application.splash"; // NOI18N
183
    
184
    public static final String LICENSE_NAME = "project.license";
185
    public static final String LICENSE_PATH = "project.licensePath";
186
    
187
    // Properties stored in the PRIVATE.PROPERTIES
188
    public static final String JAVADOC_PREVIEW="javadoc.preview"; // NOI18N
189
    // Main build.xml location
190
    public static final String BUILD_SCRIPT ="buildfile";      //NOI18N
191
    //Disables copying of dependencies to dist folder
140
    //Disables copying of dependencies to dist folder
192
    public static final String MKDIST_DISABLED = "mkdist.disabled"; //NOI18N
141
    public static final String MKDIST_DISABLED = "mkdist.disabled"; //NOI18N
193
    //Files excluded from dist.jar
194
    public static final String DIST_ARCHIVE_EXCLUDES = "dist.archive.excludes";   //NOI18N
195
    //Runtime platform
142
    //Runtime platform
196
    public static final String PLATFORM_RUNTIME = "platform.runtime";   //NOI18N
143
    public static final String PLATFORM_RUNTIME = "platform.runtime";   //NOI18N
197
144
 Lines 358-365    Link Here 
358
        RUN_TEST_CLASSPATH_MODEL = ClassPathUiSupport.createListModel(cs.itemsIterator(projectProperties.get(ProjectProperties.RUN_TEST_CLASSPATH)));
305
        RUN_TEST_CLASSPATH_MODEL = ClassPathUiSupport.createListModel(cs.itemsIterator(projectProperties.get(ProjectProperties.RUN_TEST_CLASSPATH)));
359
        ENDORSED_CLASSPATH_MODEL = ClassPathUiSupport.createListModel(cs.itemsIterator(projectProperties.get(ProjectProperties.ENDORSED_CLASSPATH)));
306
        ENDORSED_CLASSPATH_MODEL = ClassPathUiSupport.createListModel(cs.itemsIterator(projectProperties.get(ProjectProperties.ENDORSED_CLASSPATH)));
360
        final Collection<? extends PlatformFilter> filters = project.getLookup().lookupAll(PlatformFilter.class);
307
        final Collection<? extends PlatformFilter> filters = project.getLookup().lookupAll(PlatformFilter.class);
361
        PLATFORM_MODEL = filters == null ? PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM)) :
308
        PLATFORM_MODEL = filters == null ? PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(PLATFORM_ACTIVE)) :
362
                PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM), filters);
309
                PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(PLATFORM_ACTIVE), filters);
363
        PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer();
310
        PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer();
364
        JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel (PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET));
311
        JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel (PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET));
365
        JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer ();
312
        JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer ();
 Lines 419-425    Link Here 
419
                PROCESSOR_OPTIONS_MODEL.addRow(new String[] {key, value});
366
                PROCESSOR_OPTIONS_MODEL.addRow(new String[] {key, value});
420
            }
367
            }
421
        }
368
        }
422
        JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILER_ARG );
369
        JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILERARGS );
423
        
370
        
424
        // CustomizerJar
371
        // CustomizerJar
425
        DIST_JAR_MODEL = projectGroup.createStringDocument( evaluator, DIST_JAR );
372
        DIST_JAR_MODEL = projectGroup.createStringDocument( evaluator, DIST_JAR );
(-)a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/queries/FileEncodingQueryTest.java (-4 / +2 lines)
 Lines 51-68    Link Here 
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;

Return to bug 236960
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo