From 10ddc282900a735b6547975ac7eda081ead4b7a9 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 8 Feb 2010 12:12:07 +0300 Subject: [PATCH] uniform select jdk page for java module type (IDEA-48373) --- .../src/com/intellij/openapi/module/JavaModuleType.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java index 41095075aa..fb56252366 100644 --- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java +++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java @@ -20,9 +20,11 @@ import com.intellij.ide.util.projectWizard.ModuleWizardStep; import com.intellij.ide.util.projectWizard.ProjectWizardStepFactory; import com.intellij.ide.util.projectWizard.WizardContext; import com.intellij.openapi.project.ProjectBundle; +import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; +import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.IconLoader; import com.intellij.psi.CommonClassNames; import com.intellij.psi.JavaPsiFacade; @@ -67,7 +69,12 @@ public class JavaModuleType extends ModuleType { final ProjectWizardStepFactory wizardFactory = ProjectWizardStepFactory.getInstance(); ArrayList steps = new ArrayList(); steps.add(wizardFactory.createSourcePathsStep(wizardContext, moduleBuilder, getWizardIcon(), "reference.dialogs.new.project.fromScratch.source")); - steps.add(wizardFactory.createProjectJdkStep(wizardContext)); + steps.add(wizardFactory.createProjectJdkStep(wizardContext, JavaSdk.getInstance(), moduleBuilder, new Computable() { + public Boolean compute() { + final Sdk projectJdk = wizardContext.getProjectJdk(); + return projectJdk == null || projectJdk.getSdkType() != JavaSdk.getInstance() ? Boolean.TRUE : Boolean.FALSE; + } + }, getWizardIcon(), "reference.dialogs.new.project.fromScratch.sdk")); final ModuleWizardStep supportForFrameworksStep = wizardFactory.createSupportForFrameworksStep(wizardContext, moduleBuilder); if (supportForFrameworksStep != null) { steps.add(supportForFrameworksStep); @@ -121,4 +128,4 @@ public class JavaModuleType extends ModuleType { return JavaPsiFacade.getInstance(module.getProject()).findClass(CommonClassNames.JAVA_LANG_OBJECT, module.getModuleWithLibrariesScope()) != null; } -} \ No newline at end of file +} -- 2.11.4.GIT