From f41617037ccff8448443022b6b47d7414f188314 Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 6 Nov 2009 12:54:32 +0300 Subject: [PATCH] check sdk is suitable by module type (IDEADEV-41164) --- .../src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java | 3 ++- plugins/devkit/src/module/PluginModuleBuilder.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java index 2f0b0e276c..f70cec3dd3 100644 --- a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java +++ b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java @@ -19,6 +19,7 @@ package com.intellij.ide.util.projectWizard; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.JavaSdkType; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.CompilerModuleExtension; @@ -188,6 +189,6 @@ public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuild @Override public boolean isSuitableSdk(final Sdk sdk) { - return sdk.getSdkType() instanceof JavaSdkType; + return sdk.getSdkType() == JavaSdk.getInstance(); } } diff --git a/plugins/devkit/src/module/PluginModuleBuilder.java b/plugins/devkit/src/module/PluginModuleBuilder.java index 2aab54b73c..350619abae 100644 --- a/plugins/devkit/src/module/PluginModuleBuilder.java +++ b/plugins/devkit/src/module/PluginModuleBuilder.java @@ -19,12 +19,14 @@ import com.intellij.ide.util.projectWizard.JavaModuleBuilder; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.startup.StartupManager; import org.jetbrains.annotations.NonNls; import org.jetbrains.idea.devkit.build.PluginBuildConfiguration; +import org.jetbrains.idea.devkit.projectRoots.IdeaJdk; public class PluginModuleBuilder extends JavaModuleBuilder{ @NonNls private static final String META_INF = "META-INF"; @@ -49,4 +51,8 @@ public class PluginModuleBuilder extends JavaModuleBuilder{ }); } } + + public boolean isSuitableSdk(Sdk sdk) { + return sdk.getSdkType() == IdeaJdk.getInstance(); + } } -- 2.11.4.GIT