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

java: correct SDK locations on OS X; universal fallback

Browse Source
This commit is contained in:
Roman Shevchenko
2015-04-08 19:38:41 +02:00
parent 71192785d7
commit 38b1c845db
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+26 -15
View File
@@ -144,36 +144,36 @@ public class JavaSdkImpl extends JavaSdk {
}
@Override
@SuppressWarnings({"HardCodedStringLiteral"})
public String suggestHomePath() {
if (SystemInfo.isMac) {
if (new File("/usr/libexec/java_home").canExecute()) {
String path = ExecUtil.execAndReadLine(new GeneralCommandLine("/usr/libexec/java_home"));
if (path != null && new File(path).exists()) {
if (path != null && new File(path).isDirectory()) {
return path;
}
}
return "/System/Library/Frameworks/JavaVM.framework/Versions";
String home = checkKnownLocations("/Library/Java/JavaVirtualMachines", "/System/Library/Java/JavaVirtualMachines");
if (home != null) return home;
}
if (SystemInfo.isLinux) {
final String[] homes = {"/usr/java", "/opt/java", "/usr/lib/jvm"};
for (String home : homes) {
if (new File(home).isDirectory()) {
return home;
}
}
String home = checkKnownLocations("/usr/java", "/opt/java", "/usr/lib/jvm");
if (home != null) return home;
}
if (SystemInfo.isSolaris) {
return "/usr/jdk";
String home = checkKnownLocations("/usr/jdk");
if (home != null) return home;
}
if (SystemInfo.isWindows) {
String property = System.getProperty("java.home");
if (property == null) return null;
File javaHome = new File(property).getParentFile();//actually java.home points to to jre home
if (javaHome != null && JdkUtil.checkForJdk(javaHome)) {
String property = System.getProperty("java.home");
if (property != null) {
File javaHome = new File(property);
if (javaHome.getName().equals("jre")) {
javaHome = javaHome.getParentFile();
}
if (javaHome != null && javaHome.isDirectory()) {
return javaHome.getAbsolutePath();
}
}
@@ -181,6 +181,17 @@ public class JavaSdkImpl extends JavaSdk {
return null;
}
@Nullable
private static String checkKnownLocations(String... locations) {
for (String home : locations) {
if (new File(home).isDirectory()) {
return home;
}
}
return null;
}
@NotNull
@Override
public Collection<String> suggestHomePaths() {