From e80e35bcb8011e2d6b775ccef91eedd7f32d8956 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 10 Dec 2004 19:39:43 +0300 Subject: [PATCH] fix for MacOS --- plugins/devkit/src/projectRoots/IdeaJdk.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java index 790867c39712..af8ca53f99c3 100644 --- a/plugins/devkit/src/projectRoots/IdeaJdk.java +++ b/plugins/devkit/src/projectRoots/IdeaJdk.java @@ -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) {