MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 15:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix for MacOS

Browse Source
This commit is contained in:
Anna Kozlova
2004-12-10 19:39:43 +03:00
parent 467d2c4fe6
commit e80e35bcb8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/devkit/src/projectRoots/IdeaJdk.java
View File

@@ -28,8 +28,7 @@ public class IdeaJdk extends SdkType implements ApplicationComponent {
public static final Icon SDK_OPEN = IconLoader.getIcon("/sdk_open.png");
public static final Icon SDK_CLOSED = IconLoader.getIcon("/sdk_closed.png");
private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.devkit");
private static final String VM_EXE_NAME = "java";
private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.devkit");
private ProjectJdk myInternalJavaSdk;
@@ -85,7 +84,13 @@ public class IdeaJdk extends SdkType implements ApplicationComponent {
if (myInternalJavaSdk != null){
return myInternalJavaSdk;
}
return JavaSdk.getInstance().createJdk("", sdkHome + File.separator + "jre");
String jreHome;
if (SystemInfo.isLinux || SystemInfo.isWindows){
jreHome = sdkHome + File.separator + "jre";
} else {
jreHome = System.getProperty("java.home");
}
return JavaSdk.getInstance().createJdk("", jreHome);
}
public String suggestSdkName(String currentSdkName, String sdkHome) {