From 2bf19b493bd8c8b93ea814a79a8a658249ba4ca6 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Mon, 16 Dec 2013 16:35:30 +0400 Subject: [PATCH] IDEA-116593 improve choosing of Android and Java SDKs when creating new android-gradle project/module: choose only Android SDK location (if we don't know it) on first step, not build target; choose Java SDK (if there is no any) separately, set it as project sdk and as internal jdk for newly created android sdk entities --- .../intellij/ide/util/projectWizard/SdkSettingsStep.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java index 1c069bfccfcd..4db93153f581 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java @@ -31,6 +31,7 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Condition; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -102,10 +103,15 @@ public class SdkSettingsStep extends ModuleWizardStep { JPanel jdkPanel = new JPanel(new BorderLayout(4, 0)); jdkPanel.add(myJdkComboBox); jdkPanel.add(button, BorderLayout.EAST); - settingsStep.addSettingsField((project == null ? "Project" : "Module") + " \u001BSDK:", jdkPanel); + settingsStep.addSettingsField(getSdkFieldLabel(project), jdkPanel); } + @NotNull + protected String getSdkFieldLabel(@Nullable Project project) { + return (project == null ? "Project" : "Module") + " \u001BSDK:"; + } + @Override public JComponent getComponent() { return null;