From 977ba7f8e5938135ef85fb0410b4ef5006f4980c Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Mon, 13 Apr 2009 15:10:17 +0400 Subject: [PATCH] save and pick up sdk from default project --- .../openapi/projectRoots/impl/SdkConfigurationUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java b/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java index 885b911637..885f2c594e 100644 --- a/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java +++ b/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java @@ -8,6 +8,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; +import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SdkType; @@ -126,6 +127,15 @@ public class SdkConfigurationUtil { @Nullable public static Sdk findOrCreateSdk(final SdkType... sdkTypes) { + final Project defaultProject = ProjectManager.getInstance().getDefaultProject(); + final Sdk sdk = ProjectRootManager.getInstance(defaultProject).getProjectJdk(); + if (sdk != null) { + for (SdkType type : sdkTypes) { + if (sdk.getSdkType() == type) { + return sdk; + } + } + } for (SdkType type : sdkTypes) { List sdks = ProjectJdkTable.getInstance().getSdksOfType(type); if (sdks.size() > 0) { -- 2.11.4.GIT