Merge branch 'jvmArch'

Author: basilevs

launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/internal/launching/ext/PDEUtils.java

@@ -11,12 +11,16 @@
 package org.eclipse.rcptt.internal.launching.ext;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.internal.build.IPDEBuildConstants;
@@ -73,5 +77,16 @@ public static IVMInstall getVMInstall(ILaunchConfiguration configuration, Set<IP
 	public static Stream<String> startupPackageNames() {
 		return Stream.of(IPDEBuildConstants.BUNDLE_EQUINOX_LAUNCHER);
 	}
+	
+	public static Optional<String> getExecutionEnvironmentId(ILaunchConfiguration configuration) throws CoreException {
+		String jre = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, (String) null);
+		if (jre == null) {
+			return Optional.empty();
+		}
+		
+		// Launch configuration has a JRE or EE set, throw exception if associated vm not found
+		IPath jrePath = IPath.fromPortableString(jre);
+		return Optional.ofNullable(JavaRuntime.getExecutionEnvironmentId(jrePath));
+	}
 
 }

launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/JvmTargetCompatibility.java

@@ -219,7 +219,10 @@ public String explainJvmRequirements() throws CoreException {
 		return result.toString();
 	}
 
-	
+	public Stream<VmInstallMetaData> findForEnvironment(String executionEnvironmentId) {
+		return VmInstallMetaData.forEnvironment(executionEnvironmentId).filter(this::isCompatible);
+	}
+
 
 	private static final String[] EMPTY = new String[0];
 	private static String[] getExecutionEnironments(IPluginModelBase plugin) {

launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/Q7ExternalLaunchDelegate.java

@@ -229,11 +229,13 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration,
 		info.target = target;
 
 
-		JvmTargetCompatibility compatibility = new JvmTargetCompatibility(target);
-
-		IVMInstall configuredJvm = getVMInstall(configuration, target);
+		try {
+			getVMInstall(configuration, target);
+		} catch (CoreException e) {
+			error.add(e.getStatus());
+			throw new CoreException(error);
+		}
 
-		error.add(compatibility.checkCompatibilty(configuredJvm));
 		if (error.matches(IStatus.CANCEL)) {
 			return false;
 		}
@@ -251,7 +253,25 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration,
 	}
 
 	public static IVMInstall getVMInstall(ILaunchConfiguration configuration, ITargetPlatformHelper target) throws CoreException {
-		return PDEUtils.getVMInstall(configuration, target.getModels().map(m -> m.model()).collect(Collectors.toSet()));
+		JvmTargetCompatibility compatibility = new JvmTargetCompatibility(target);
+		IVMInstall pdeDerived = PDEUtils.getVMInstall(configuration, target.getModels().map(m -> m.model()).collect(Collectors.toSet()));
+		IStatus error = compatibility.checkCompatibilty(pdeDerived);
+		if (error.matches(IStatus.CANCEL)) {
+			throw new CoreException(error);
+		}
+		if (!error.matches(IStatus.ERROR)) {
+			return pdeDerived;
+		}
+		
+		Stream<VmInstallMetaData> byEnv = PDEUtils.getExecutionEnvironmentId(configuration).map(envId -> compatibility.findForEnvironment(envId)).orElse(Stream.empty());
+
+		return byEnv.findFirst().orElseThrow(() -> {
+			try {
+				return new CoreException(Status.error(compatibility.explainJvmRequirements()));
+			} catch (CoreException e) {
+				return e;
+			}
+		}).install;
 	}
 
 	private void removeTargetPlatform(ILaunchConfiguration configuration)

launching/org.eclipse.rcptt.launching.ext/src/org/eclipse/rcptt/launching/ext/VmInstallMetaData.java

@@ -15,6 +15,7 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -85,6 +86,14 @@ public static Stream<VmInstallMetaData> all() {
 		return JDTUtils.installedVms().map(vm -> adapt(vm, environments.get(vm))).flatMap(Optional::stream);
 	}
 
+	public static Stream<VmInstallMetaData> forEnvironment(String executionEnvironmentId) {
+		IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager();
+		IExecutionEnvironment environment = manager.getEnvironment(executionEnvironmentId);
+		Collection<IExecutionEnvironment> environments = Collections.singletonList(environment);
+		return Stream.concat(Stream.ofNullable(environment.getDefaultVM()), Arrays.stream(environment.getCompatibleVMs())).distinct().flatMap(install -> adapt(install, environments).stream());
+	}
+
+	
 	private static Optional<VmInstallMetaData>  adapt(IVMInstall install, Collection<IExecutionEnvironment> environments) {
 		try {
 			OSArchitecture jvmArch = JDTUtils.detect(install);
@@ -102,4 +111,5 @@ public static Stream<VmInstallMetaData> register(Path location) throws CoreExcep
 		IVMInstall install = JDTUtils.registerVM(location.toFile());
 		return adapt(install);
 	}
+
 }