Attachment #140928 for bug #236921

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





    <!-- ACTUAL CHANGES BEGIN HERE: -->
    <changes>
        <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>
            <version major="1" minor="59"/>
            <date day="9" month="10" year="2013"/>
            <author login="tzezula"/>
            <compatibility addition="yes"/>
            <description>
                <p>
                    Extended <code>BootClassPathImplementation</code> and <code>ClassPathProviderImpl</code> to support non j2se platforms.
                </p>
            </description>
            <class package="org.netbeans.modules.java.api.common.classpath" name="ClassPathProviderImpl"/>
            <class package="org.netbeans.modules.java.api.common.classpath" name="ClassPathSupportFactory"/>
            <class package="org.netbeans.modules.java.api.common.util" name="CommonProjectUtils"/>
        </change>
        <change id="BaseActionProvider.Callback3">
            <api name="java-api-common"/>
            <summary>Added <code>BaseActionProvider.Callback3</code> with a method providing additional build properties.</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.58	4	OpenIDE-Module-Specification-Version: 1.59

Lines 54-59 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/BootClassPathImplementation.java (-1 / +8 lines)
54	import java.util.List;	54	import java.util.List;
55	import java.util.ArrayList;	55	import java.util.ArrayList;
56	import java.util.Collections;	56	import java.util.Collections;
		57	import org.netbeans.api.annotations.common.NonNull;
		58	import org.netbeans.api.annotations.common.NullAllowed;
57	import org.netbeans.api.java.classpath.ClassPath;	59	import org.netbeans.api.java.classpath.ClassPath;
58	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;	60	import org.netbeans.modules.java.api.common.util.CommonProjectUtils;
59	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	61	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
Lines 70-75 Link Here
70	private static final String PLATFORM_ACTIVE = "platform.active"; // NOI18N	72	private static final String PLATFORM_ACTIVE = "platform.active"; // NOI18N
71		73
72	private final PropertyEvaluator evaluator;	74	private final PropertyEvaluator evaluator;
		75	private final String platformType;
73	private JavaPlatformManager platformManager;	76	private JavaPlatformManager platformManager;
74	// name of project active platform	77	// name of project active platform
75	private String activePlatformName;	78	private String activePlatformName;
Lines 80-89 Link Here
80	private PropertyChangeSupport support = new PropertyChangeSupport(this);	83	private PropertyChangeSupport support = new PropertyChangeSupport(this);
81	private ClassPath endorsedClassPath;	84	private ClassPath endorsedClassPath;
82		85
83	BootClassPathImplementation(PropertyEvaluator evaluator, ClassPath endorsedClassPath) {	86	BootClassPathImplementation(
		87	@NonNull final PropertyEvaluator evaluator,
		88	@NullAllowed final ClassPath endorsedClassPath,
		89	@NullAllowed final String platformType) {
84	assert evaluator != null;	90	assert evaluator != null;
85	this.endorsedClassPath = endorsedClassPath;	91	this.endorsedClassPath = endorsedClassPath;
86	this.evaluator = evaluator;	92	this.evaluator = evaluator;
		93	this.platformType = platformType;
87	evaluator.addPropertyChangeListener(WeakListeners.propertyChange(this, evaluator));	94	evaluator.addPropertyChangeListener(WeakListeners.propertyChange(this, evaluator));
88	if (endorsedClassPath != null) {	95	if (endorsedClassPath != null) {
89	endorsedClassPath.addPropertyChangeListener(this);	96	endorsedClassPath.addPropertyChangeListener(this);




 */
package org.netbeans.modules.java.api.common.classpath;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.util.Arrays;
import java.util.Map;
import java.util.HashMap;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.classpath.JavaClassPathConstants;
import org.netbeans.api.java.platform.JavaPlatform;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.modules.java.api.common.SourceRoots;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Mutex;
import org.openide.util.Parameters;

/**
 * Defines the various class paths for a J2SE project.

 */
public final class ClassPathProviderImpl implements ClassPathProvider {

    private String buildClassesDir = "build.classes.dir"; // NOI18N
    private static final String buildGeneratedDir = "build.generated.sources.dir"; // NOI18N
    private static final String[] processorTestClasspath = new String[]{"javac.test.processorpath"};  //NOI18N
    private String buildTestClassesDir = "build.test.classes.dir"; // NOI18N
    private String[] javacClasspath = new String[]{"javac.classpath"};    //NOI18N
    private String[] processorClasspath = new String[]{ProjectProperties.JAVAC_PROCESSORPATH};    //NOI18N
    private String[] javacTestClasspath = new String[]{"javac.test.classpath"};  //NOI18N
    private String[] processorTestClasspath = new String[]{"javac.test.processorpath"};  //NOI18N
    private String[] runClasspath = new String[]{"run.classpath"};    //NOI18N
    private String[] runTestClasspath = new String[]{"run.test.classpath"};  //NOI18N
    private String[] endorsedClasspath = new String[]{ProjectProperties.ENDORSED_CLASSPATH};  //NOI18N

    private final AntProjectHelper helper;
    private final File projectDirectory;
    private final PropertyEvaluator evaluator;
    private final SourceRoots sourceRoots;
    private final SourceRoots testSourceRoots;
    private final String buildClassesDir;
    private final String distJar;
    private final String buildTestClassesDir;
    private final String[] javacClasspath;
    private final String[] processorClasspath;
    private final String[] javacTestClasspath;
    private final String[] runClasspath;
    private final String[] runTestClasspath;
    private final String[] endorsedClasspath;
    private final String platformType;
    /**
     * ClassPaths cache
     * Index -> CP mapping


    public ClassPathProviderImpl(AntProjectHelper helper, PropertyEvaluator evaluator, SourceRoots sourceRoots,
                                 SourceRoots testSourceRoots) {
        this(
            helper,
            evaluator,
            sourceRoots,
            testSourceRoots,
            Builder.DEFAULT_BUILD_CLASSES_DIR,
            Builder.DEFAULT_DIST_JAR,
            Builder.DEFAULT_BUILD_TEST_CLASSES_DIR,
            Builder.DEFAULT_JAVAC_CLASS_PATH,
            Builder.DEFAULT_JAVAC_TEST_CLASS_PATH,
            Builder.DEFAULT_RUN_CLASS_PATH,
            Builder.DEFAULT_RUN_TEST_CLASS_PATH);
    }

    public ClassPathProviderImpl(AntProjectHelper helper, PropertyEvaluator evaluator,

            String buildClassesDir, String distJar, String buildTestClassesDir,
            String[] javacClasspath, String[] javacTestClasspath, String[] runClasspath,
            String[] runTestClasspath) {
        this(
            helper,
            evaluator,
            sourceRoots,
            testSourceRoots,

            javacTestClasspath,
            runClasspath,
            runTestClasspath,
            Builder.DEFAULT_ENDORSED_CLASSPATH);
    }
    /**
     * Constructor allowing customization of endorsedClasspath property names.

            String buildClassesDir, String distJar, String buildTestClassesDir,
            String[] javacClasspath, String[] javacTestClasspath, String[] runClasspath,
            String[] runTestClasspath, String[] endorsedClasspath) {
        this(
            helper,
            evaluator,
            sourceRoots,
            testSourceRoots,

            distJar,
            buildTestClassesDir,
            javacClasspath,
            Builder.DEFAULT_PROCESSOR_PATH,
            javacTestClasspath,
            runClasspath,
            runTestClasspath,
            endorsedClasspath);
    }

    /**

            String buildClassesDir, String distJar, String buildTestClassesDir,
            String[] javacClasspath, String[] processorPath, String[] javacTestClasspath, String[] runClasspath,
            String[] runTestClasspath, String[] endorsedClasspath) {
        this(
            helper,
            evaluator,
            sourceRoots,
            testSourceRoots,
            buildClassesDir,
            distJar,
            buildTestClassesDir,
            javacClasspath,
            processorPath,
            javacTestClasspath,
            runClasspath,
            runTestClasspath,
            endorsedClasspath,
            Builder.DEFAULT_PLATFORM_TYPE
            );
    }

    private ClassPathProviderImpl(
        @NonNull final AntProjectHelper helper,
        @NonNull final PropertyEvaluator evaluator,
        @NonNull final SourceRoots sourceRoots,
        @NonNull final SourceRoots testSourceRoots,
        @NonNull final String buildClassesDir,
        @NonNull final String distJar,
        @NonNull final String buildTestClassesDir,
        @NonNull final String[] javacClasspath,
        @NonNull final String[] processorPath,
        @NonNull final String[] javacTestClasspath,
        @NonNull final String[] runClasspath,
        @NonNull final String[] runTestClasspath,
        @NonNull final String[] endorsedClasspath,
        @NonNull final String platformType) {
        Parameters.notNull("helper", helper);   //NOI18N
        Parameters.notNull("evaluator", evaluator); //NOI18N
        Parameters.notNull("sourceRoots", sourceRoots); //NOI18N
        Parameters.notNull("testSourceRoots", testSourceRoots); //NOI18N
        Parameters.notNull("buildClassesDir", buildClassesDir); //NOI18N
        Parameters.notNull("distJar", distJar); //NOI18N
        Parameters.notNull("buildTestClassesDir", buildTestClassesDir); //NOI18N
        Parameters.notNull("javacClasspath", javacClasspath);   //NOI18N
        Parameters.notNull("processorPath", processorPath); //NOI18N
        Parameters.notNull("javacTestClasspath", javacTestClasspath);   //NOI18N
        Parameters.notNull("runClasspath", runClasspath);   //NOI18N
        Parameters.notNull("runTestClasspath", runTestClasspath);   //NOI18N
        Parameters.notNull("endorsedClasspath", endorsedClasspath); //NOI18N
        Parameters.notNull("platformType", platformType);   //NOI18N
        this.helper = helper;
        this.projectDirectory = FileUtil.toFile(helper.getProjectDirectory());
        assert this.projectDirectory != null;
        this.evaluator = evaluator;
        this.sourceRoots = sourceRoots;
        this.testSourceRoots = testSourceRoots;
        this.buildClassesDir = buildClassesDir;
        this.distJar = distJar;
        this.buildTestClassesDir = buildTestClassesDir;

        this.runClasspath = runClasspath;
        this.runTestClasspath = runTestClasspath;
        this.endorsedClasspath = endorsedClasspath;
        this.platformType = platformType;

    }

    /**
     * Builder to create ClassPathProviderImpl.
     * @since 1.59
     */
    public static final class Builder {

        private static final String DEFAULT_PLATFORM_TYPE = "j2se";   //NOI18N
        private static final String DEFAULT_BUILD_CLASSES_DIR = "build.classes.dir";   //NOI18N
        private static final String DEFAULT_BUILD_TEST_CLASSES_DIR = "build.test.classes.dir"; // NOI18N
        private static final String DEFAULT_DIST_JAR = "dist.jar"; // NOI18N
        private static final String[] DEFAULT_JAVAC_CLASS_PATH = new String[]{"javac.classpath"};    //NOI18N
        private static final String[] DEFAULT_PROCESSOR_PATH = new String[]{ProjectProperties.JAVAC_PROCESSORPATH};    //NOI18N
        private static final String[] DEFAULT_JAVAC_TEST_CLASS_PATH = new String[]{"javac.test.classpath"};  //NOI18N
        private static final String[] DEFAULT_RUN_CLASS_PATH = new String[]{"run.classpath"};    //NOI18N
        private static final String[] DEFAULT_RUN_TEST_CLASS_PATH = new String[]{"run.test.classpath"};  //NOI18N
        private static final String[] DEFAULT_ENDORSED_CLASSPATH = new String[]{ProjectProperties.ENDORSED_CLASSPATH};  //NOI18N

        private final AntProjectHelper helper;
        private final PropertyEvaluator evaluator;
        private final SourceRoots sourceRoots;
        private final SourceRoots testSourceRoots;

        private String platformType = DEFAULT_PLATFORM_TYPE;
        private String buildClassesDir = DEFAULT_BUILD_CLASSES_DIR;
        private String buildTestClassesDir = DEFAULT_BUILD_TEST_CLASSES_DIR;
        private String distJar = DEFAULT_DIST_JAR;
        private String[] javacClasspath = DEFAULT_JAVAC_CLASS_PATH;
        private String[] processorPath = DEFAULT_PROCESSOR_PATH;
        private String[] javacTestClasspath = DEFAULT_JAVAC_TEST_CLASS_PATH;
        private String[] runClasspath = DEFAULT_RUN_CLASS_PATH;
        private String[] runTestClasspath = DEFAULT_RUN_TEST_CLASS_PATH;
        private String[] endorsedClasspath = DEFAULT_ENDORSED_CLASSPATH;

        private Builder(
            @NonNull final AntProjectHelper helper,
            @NonNull final PropertyEvaluator evaluator,
            @NonNull final SourceRoots sourceRoots,
            @NonNull final SourceRoots testSourceRoots) {
            Parameters.notNull("helper", helper);   //NOI18N
            Parameters.notNull("evaluator", evaluator); //NOI18N
            Parameters.notNull("sourceRoots", sourceRoots); //NOI18N
            Parameters.notNull("testSourceRoots", testSourceRoots); //NOI18N
            this.helper = helper;
            this.evaluator = evaluator;
            this.sourceRoots = sourceRoots;
            this.testSourceRoots = testSourceRoots;
        }

        /**
         * Sets a {@link JavaPlatform} type for boot classpath lookup.
         * @param platformType the type of {@link JavaPlatform}, by default "j2se"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setPlatformType(@NonNull final String platformType) {
            Parameters.notNull("platformType", platformType);   //NOI18N
            this.platformType = platformType;
            return this;
        }

        /**
         * Sets a property name containing build classes directory.
         * @param buildClassesDirProperty the name of property containing the build classes directory, by default "build.classes.dir"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setBuildClassesDirProperty(@NonNull final String buildClassesDirProperty) {
            Parameters.notNull("buildClassesDirProperty", buildClassesDirProperty); //NOI18N
            this.buildClassesDir = buildClassesDirProperty;
            return this;
        }

        /**
         * Sets a property name containing build test classes directory.
         * @param buildTestClassesDirProperty the name of property containing the build test classes directory, by default "build.test.classes.dir"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setBuildTestClassesDirProperty(@NonNull final String buildTestClassesDirProperty) {
            Parameters.notNull("buildTestClassesDirProperty", buildTestClassesDirProperty); //NOI18N
            this.buildTestClassesDir = buildTestClassesDirProperty;
            return this;
        }

        /**
         * Sets a property name containing the distribution jar.
         * @param distJarProperty the name of property containing the distribution jar reference, by default "dist.jar"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setDistJarProperty(@NonNull final String distJarProperty) {
            Parameters.notNull("distJarProperty", distJarProperty); //NOI18N
            this.distJar = distJarProperty;
            return this;
        }

        /**
         * Sets javac classpath properties for source roots.
         * @param javacClassPathProperties the names of properties containing the compiler classpath for sources, by default "javac.classpath"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setJavacClassPathProperties(@NonNull final String[] javacClassPathProperties) {
            Parameters.notNull("javacClassPathProperties", javacClassPathProperties);   //NOI18N
            this.javacClasspath = Arrays.copyOf(javacClassPathProperties, javacClassPathProperties.length);
            return this;
        }

        /**
         * Sets javac processor path properties for source roots.
         * @param processorPathProperties the names of properties containing the compiler processor path for sources, by default "javac.processorpath"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setProcessorPathProperties(@NonNull final String[] processorPathProperties) {
            Parameters.notNull("processorPathProperties", processorPathProperties);
            this.processorPath = Arrays.copyOf(processorPathProperties, processorPathProperties.length);
            return this;
        }

        /**
         * Sets javac classpath properties for test roots.
         * @param javacTestClasspathProperties  the names of properties containing the compiler classpath for tests, by default "javac.test.classpath"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setJavacTestClasspathProperties(@NonNull final String[] javacTestClasspathProperties) {
            Parameters.notNull("javacTestClasspathProperties", javacTestClasspathProperties);   //NOI18N
            this.javacTestClasspath = Arrays.copyOf(javacTestClasspathProperties, javacTestClasspathProperties.length);
            return this;
        }

        /**
         * Sets runtime classpath properties for source roots.
         * @param runClasspathProperties the names of properties containing the runtime classpath for sources, by default "run.classpath"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setRunClasspathProperties(@NonNull final String[] runClasspathProperties) {
            Parameters.notNull("runClasspathProperties", runClasspathProperties);   //NOI18N
            this.runClasspath = Arrays.copyOf(runClasspathProperties, runClasspathProperties.length);
            return this;
        }

        /**
         * Sets runtime classpath properties for test roots.
         * @param runTestClasspathProperties  the names of properties containing the runtime classpath for tests, by default "run.test.classpath"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setRunTestClasspathProperties(@NonNull final String[] runTestClasspathProperties) {
            Parameters.notNull("runTestClasspathProperties", runTestClasspathProperties);   //NOI18N
            this.runTestClasspath = Arrays.copyOf(runTestClasspathProperties, runTestClasspathProperties.length);
            return this;
        }

        /**
         * Sets endorsed classpath properties.
         * @param endorsedClasspathProperties the names of properties containing the endorsed classpath, by default "endorsed.classpath"
         * @return {@link Builder}
         */
        @NonNull
        public Builder setEndorsedClasspathProperties(@NonNull final String[] endorsedClasspathProperties) {
            Parameters.notNull("endorsedClasspathProperties", endorsedClasspathProperties); //NOI18N
            this.endorsedClasspath = Arrays.copyOf(endorsedClasspathProperties, endorsedClasspathProperties.length);
            return this;
        }


        /**
         * Creates a configured {@link ClassPathProviderImpl}.
         * @return the {@link ClassPathProviderImpl}
         */
        @NonNull
        public ClassPathProviderImpl build() {
            return new ClassPathProviderImpl (
                helper,
                evaluator,
                sourceRoots,
                testSourceRoots,
                buildClassesDir,
                distJar,
                buildTestClassesDir,
                javacClasspath,
                processorPath,
                javacTestClasspath,
                runClasspath,
                runTestClasspath,
                endorsedClasspath,
                platformType);
        }

        @NonNull
        public static Builder create(
            @NonNull final AntProjectHelper helper,
            @NonNull final PropertyEvaluator evaluator,
            @NonNull final SourceRoots sourceRoots,
            @NonNull final SourceRoots testSourceRoots) {
            return new Builder(helper, evaluator, sourceRoots, testSourceRoots);
        }

    }

    

Lines 42-48 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupportFactory.java (-2 / +21 lines)
42		42
43	package org.netbeans.modules.java.api.common.classpath;	43	package org.netbeans.modules.java.api.common.classpath;
44		44
		45	import org.netbeans.api.annotations.common.NonNull;
		46	import org.netbeans.api.annotations.common.NullAllowed;
45	import org.netbeans.api.java.classpath.ClassPath;	47	import org.netbeans.api.java.classpath.ClassPath;
		48	import org.netbeans.api.java.platform.JavaPlatform;
46	import org.netbeans.modules.java.api.common.SourceRoots;	49	import org.netbeans.modules.java.api.common.SourceRoots;
47	import org.netbeans.spi.java.classpath.ClassPathImplementation;	50	import org.netbeans.spi.java.classpath.ClassPathImplementation;
48	import org.netbeans.spi.project.support.ant.AntProjectHelper;	51	import org.netbeans.spi.project.support.ant.AntProjectHelper;
Lines 64-70 Link Here
64	* @return classpath implementation	67	* @return classpath implementation
65	*/	68	*/
66	public static ClassPathImplementation createBootClassPathImplementation(PropertyEvaluator evaluator) {	69	public static ClassPathImplementation createBootClassPathImplementation(PropertyEvaluator evaluator) {
67	return new BootClassPathImplementation(evaluator, null);	70	return createBootClassPathImplementation(evaluator, null, null);
68	}	71	}
69		72
70	/**	73	/**
Lines 76-82 Link Here
76	* @since org.netbeans.modules.java.api.common/0 1.11	79	* @since org.netbeans.modules.java.api.common/0 1.11
77	*/	80	*/
78	public static ClassPathImplementation createBootClassPathImplementation(PropertyEvaluator evaluator, ClassPath endorsedClassPath) {	81	public static ClassPathImplementation createBootClassPathImplementation(PropertyEvaluator evaluator, ClassPath endorsedClassPath) {
79	return new BootClassPathImplementation(evaluator, endorsedClassPath);	82	return createBootClassPathImplementation(evaluator, endorsedClassPath, null);
		83	}
		84
		85	/**
		86	* Creates implementation of BOOT classpath based on project's <code>platform.active</code>
		87	* property and given endorsed classpath which will have precedence of platform classpath.
		88	* @param evaluator project's property evaluator
		89	* @param endorsedClassPath endorsed classpath to prepend to boot classpath
		90	* @param platformType the type of {@link JavaPlatform}
		91	* @return classpath implementation
		92	* @since 1.59
		93	*/
		94	public static ClassPathImplementation createBootClassPathImplementation(
		95	@NonNull final PropertyEvaluator evaluator,
		96	@NullAllowed final ClassPath endorsedClassPath,
		97	@NullAllowed final String platformType) {
		98	return new BootClassPathImplementation(evaluator, endorsedClassPath, platformType);
80	}	99	}
81		100
82	/**	101	/**




import java.util.HashMap;
import java.util.Map;
import javax.lang.model.element.TypeElement;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.platform.JavaPlatform;
import org.netbeans.api.java.platform.JavaPlatformManager;

     * @return active {@link JavaPlatform} or null if the project's platform
     * is broken
     */
    @CheckForNull
    public static JavaPlatform getActivePlatform(final String activePlatformId) {
        return getActivePlatform(activePlatformId, null);
    }

    /**
     * Returns the active platform used by the project or null if the active
     * project platform is broken.
     * @param activePlatformId the name of platform used by Ant script or null
     * for default platform.
     * @param platformType the type of {@link JavaPlatform}
     * @return active {@link JavaPlatform} or null if the project's platform
     * is broken
     * @since 1.59
     */
    @CheckForNull
    public static JavaPlatform getActivePlatform(
        @NullAllowed final String activePlatformId,
        @NullAllowed String platformType) {
        if (platformType == null) {
            platformType = "j2se";  //NOI18N
        }
        final JavaPlatformManager pm = JavaPlatformManager.getDefault();
        if (activePlatformId == null) {
            final JavaPlatform candidate = pm.getDefaultPlatform();
            return candidate == null || !platformType.equals(candidate.getSpecification().getName()) ?
                null :
                candidate;
        }
        JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification(platformType, null)); //NOI18N
        JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification("j2se", null)); //NOI18N
        for (JavaPlatform javaPlatform : installedPlatforms) {
            String antName = javaPlatform.getProperties().get("platform.ant.name"); //NOI18N
            if (antName != null && antName.equals(activePlatformId)) {

Return to bug 236921

Lines 105-110 Link Here

(-)a/java.api.common/apichanges.xml (+16 lines)
105		105
106	<!-- ACTUAL CHANGES BEGIN HERE: -->	106	<!-- ACTUAL CHANGES BEGIN HERE: -->
107	<changes>	107	<changes>
		108	<change id="BootClassPathImplementation-platform-type">
		109	<api name="java-api-common"/>
		110	<summary>Extended <code>BootClassPathImplementation</code> and <code>ClassPathProviderImpl</code> to support non j2se platforms</summary>
		111	<version major="1" minor="59"/>
		112	<date day="9" month="10" year="2013"/>
		113	<author login="tzezula"/>
		114	<compatibility addition="yes"/>
		115	<description>
		116	<p>
		117	Extended <code>BootClassPathImplementation</code> and <code>ClassPathProviderImpl</code> to support non j2se platforms.
		118	</p>
		119	</description>
		120	<class package="org.netbeans.modules.java.api.common.classpath" name="ClassPathProviderImpl"/>
		121	<class package="org.netbeans.modules.java.api.common.classpath" name="ClassPathSupportFactory"/>
		122	<class package="org.netbeans.modules.java.api.common.util" name="CommonProjectUtils"/>
		123	</change>
108	<change id="BaseActionProvider.Callback3">	124	<change id="BaseActionProvider.Callback3">
109	<api name="java-api-common"/>	125	<api name="java-api-common"/>
110	<summary>Added <code>BaseActionProvider.Callback3</code> with a method providing additional build properties.</summary>	126	<summary>Added <code>BaseActionProvider.Callback3</code> with a method providing additional build properties.</summary>

Lines 49-55 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/util/CommonProjectUtils.java (-3 / +28 lines)
49	import java.util.HashMap;	49	import java.util.HashMap;
50	import java.util.Map;	50	import java.util.Map;
51	import javax.lang.model.element.TypeElement;	51	import javax.lang.model.element.TypeElement;
		52	import org.netbeans.api.annotations.common.CheckForNull;
52	import org.netbeans.api.annotations.common.NonNull;	53	import org.netbeans.api.annotations.common.NonNull;
		54	import org.netbeans.api.annotations.common.NullAllowed;
53	import org.netbeans.api.java.classpath.ClassPath;	55	import org.netbeans.api.java.classpath.ClassPath;
54	import org.netbeans.api.java.platform.JavaPlatform;	56	import org.netbeans.api.java.platform.JavaPlatform;
55	import org.netbeans.api.java.platform.JavaPlatformManager;	57	import org.netbeans.api.java.platform.JavaPlatformManager;
Lines 81-93 Link Here
81	* @return active {@link JavaPlatform} or null if the project's platform	83	* @return active {@link JavaPlatform} or null if the project's platform
82	* is broken	84	* is broken
83	*/	85	*/
		86	@CheckForNull
84	public static JavaPlatform getActivePlatform(final String activePlatformId) {	87	public static JavaPlatform getActivePlatform(final String activePlatformId) {
		88	return getActivePlatform(activePlatformId, null);
		89	}
		90
		91	/**
		92	* Returns the active platform used by the project or null if the active
		93	* project platform is broken.
		94	* @param activePlatformId the name of platform used by Ant script or null
		95	* for default platform.
		96	* @param platformType the type of {@link JavaPlatform}
		97	* @return active {@link JavaPlatform} or null if the project's platform
		98	* is broken
		99	* @since 1.59
		100	*/
		101	@CheckForNull
		102	public static JavaPlatform getActivePlatform(
		103	@NullAllowed final String activePlatformId,
		104	@NullAllowed String platformType) {
		105	if (platformType == null) {
		106	platformType = "j2se"; //NOI18N
		107	}
85	final JavaPlatformManager pm = JavaPlatformManager.getDefault();	108	final JavaPlatformManager pm = JavaPlatformManager.getDefault();
86	if (activePlatformId == null) {	109	if (activePlatformId == null) {
87	return pm.getDefaultPlatform();	110	final JavaPlatform candidate = pm.getDefaultPlatform();
		111	return candidate == null \|\| !platformType.equals(candidate.getSpecification().getName()) ?
		112	null :
		113	candidate;
88	}	114	}
89		115	JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification(platformType, null)); //NOI18N
90	JavaPlatform[] installedPlatforms = pm.getPlatforms(null, new Specification("j2se", null)); //NOI18N
91	for (JavaPlatform javaPlatform : installedPlatforms) {	116	for (JavaPlatform javaPlatform : installedPlatforms) {
92	String antName = javaPlatform.getProperties().get("platform.ant.name"); //NOI18N	117	String antName = javaPlatform.getProperties().get("platform.ant.name"); //NOI18N
93	if (antName != null && antName.equals(activePlatformId)) {	118	if (antName != null && antName.equals(activePlatformId)) {