MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

consider java.home on any platform

Browse Source
This commit is contained in:
Dmitry Avdeev
2017-04-27 18:27:58 +03:00
parent b1ea1768b9
commit 87c5e56bbf
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java
+13 -1
View File
@@ -21,6 +21,8 @@ import com.intellij.openapi.projectRoots.JavaSdkVersion;
import com.intellij.openapi.projectRoots.JdkUtil;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.util.ArrayUtil;
import com.intellij.util.SystemProperties;
import org.jetbrains.annotations.NotNull;
import java.io.File;
@@ -71,12 +73,22 @@ public abstract class JavaHomeFinder {
}
}
protected static File getJavaHome() {
String property = SystemProperties.getJavaHome();
if (property == null)
return null;
File javaHome = new File(property).getParentFile();//actually java.home points to to jre home
return javaHome == null || !javaHome.isDirectory() ? null : javaHome;
}
protected static class DefaultFinder extends JavaHomeFinder {
private final String[] myPaths;
protected DefaultFinder(String... paths) {
myPaths = paths;
File javaHome = getJavaHome();
myPaths = javaHome == null ? paths : ArrayUtil.prepend(javaHome.getAbsolutePath(), paths);
}
@NotNull
java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java
+2 -7
View File
@@ -29,14 +29,9 @@ class WindowsJavaFinder extends JavaHomeFinder {
@NotNull
@Override
protected List<String> findExistingJdks() {
String property = System.getProperty("java.home");
if (property == null)
return Collections.emptyList();
File javaHome = getJavaHome();
if (javaHome == null) return Collections.emptyList();
File javaHome = new File(property).getParentFile();//actually java.home points to to jre home
if (javaHome == null || !javaHome.isDirectory() || javaHome.getParentFile() == null) {
return Collections.emptyList();
}
ArrayList<String> result = new ArrayList<>();
File javasFolder = javaHome.getParentFile();
scanFolder(javasFolder, result);