Merge pull request #1307 from tzezula/tzezula/mx_java_platform

Added support for per-project platform for mx projects.

Author: tzezula

java/java.project/apichanges.xml

@@ -85,6 +85,18 @@ is the proper place.
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="ProjectPlatformNoPE">
+            <api name="java_project"/>
+            <summary>Added support for per-project platform for projects which don't use PropertyEvaluator.</summary>
+            <version major="1" minor="77"/>
+            <date day="19" month="6" year="2019"/>
+            <author login="tzezula"/>
+            <compatibility addition="yes"/>
+            <description>
+                Added support for per-project platform for projects which don't use <code>PropertyEvaluator</code>.
+            </description>
+            <class package="org.netbeans.spi.java.project.support" name="ProjectPlatform"/>
+        </change>
         <change id="ProjectModulesModifier">
             <api name="java_project"/>
             <summary>Added a SPI to manipulate with project's <code>module-info.java</code> declarations</summary>

java/java.project/manifest.mf

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.java.project/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/project/Bundle.properties
 OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.76
+OpenIDE-Module-Specification-Version: 1.77
 AutoUpdate-Show-In-Client: false
 

java/java.project/src/org/netbeans/spi/java/project/support/ProjectPlatform.java

@@ -60,7 +60,6 @@ public final class ProjectPlatform {
     private ProjectPlatform() {
         throw new IllegalStateException("No instance allowed"); //NOI18N
     }
-    
     /**
      * Creates a transient {@link JavaPlatform} defined in given {@link Project}.
      * @param owner the project to return the {@link JavaPlatform} for
@@ -76,28 +75,53 @@ public static JavaPlatform forProject(
             @NonNull final String platformType) {
         Parameters.notNull("owner", owner); //NOI18N
         Parameters.notNull("eval", eval); //NOI18N
-        Parameters.notNull("platformType", platformType);   //NOI18N        
-        final String platformName = eval.getProperty(PLATFORM_ACTIVE);        
+        Parameters.notNull("platformType", platformType);   //NOI18N
+        final String platformName = eval.getProperty(PLATFORM_ACTIVE);
         final FileObject jdkHome = resolvePlatformHome(
                 platformName,
                 owner.getProjectDirectory(),
                 eval);
         if (jdkHome == null) {
             return null;
         }
+        return forProject(owner, jdkHome, platformName, platformType);
+    }
+
+    /**
+     * Creates a transient {@link JavaPlatform} defined in given {@link Project}.
+     * @param owner the project to return the {@link JavaPlatform} for
+     * @param platformHome the {@link JavaPlatform} install folder
+     * @param platformName the {@link JavaPlatform} system name uniquely identifying the platform.
+     * The name has to be valid property name, use the {@link PropertyUtils#getUsablePropertyName(java.lang.String)} to create the name.
+     * For the Ant based project the platform name is a value of {@code platform.active} property.
+     * @param platformType the type of the platform, eg. "j2se"
+     * @return a {@link JavaPlatform} for given project or null when platform cannot
+     * be created
+     * @since 1.77
+     */
+    @CheckForNull
+    public static JavaPlatform forProject(
+            @NonNull final Project owner,
+            @NonNull final FileObject platformHome,
+            @NonNull final String platformName,
+            @NonNull final String platformType) {
+        Parameters.notNull("owner", owner); //NOI18N
+        Parameters.notNull("platformHome", platformHome); //NOI18N
+        Parameters.notNull("platformName", platformName);   //NOI18N
+        Parameters.notNull("platformType", platformType);   //NOI18N
         JavaPlatform res;
-        JavaPlatform delegate;        
+        JavaPlatform delegate;
         synchronized (platformsByProject) {
-            res = platformsByProject.get(jdkHome);
+            res = platformsByProject.get(platformHome);
             delegate = res == null ?
-                    platformsByHome.get(jdkHome) :
+                    platformsByHome.get(platformHome) :
                     null;
         }
         if (res == null) {
             boolean newDelegate = false;
             if (delegate == null) {
-                delegate = Optional.ofNullable(findJavaPlatform(jdkHome, platformType))
-                        .orElseGet(() -> createJavaPlatform(jdkHome, platformType));
+                delegate = Optional.ofNullable(findJavaPlatform(platformHome, platformType))
+                        .orElseGet(() -> createJavaPlatform(platformHome, platformType));
                 newDelegate = true;
             }
             if (delegate != null) {
@@ -118,16 +142,16 @@ public Map<String, String> getProperties() {
                     @Override
                     public String getDisplayName() {
                         return platformName;
-                    }                
-                };                
+                    }
+                };
             }
             if (res != null) {
                 synchronized (platformsByProject) {
                     platformsByProject.put(owner, res);
                     assert delegate != null;
                     if (newDelegate) {
-                        homesByProject.put(owner, jdkHome);
-                        platformsByHome.put(jdkHome, delegate);
+                        homesByProject.put(owner, platformHome);
+                        platformsByHome.put(platformHome, delegate);
                     }
                 }
             }