From 879779ec0da8c33f37c15e8ce7b7fcd30fe70fd0 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 6 Mar 2018 10:42:16 +0300
Subject: [PATCH] MPP wizard: take default JDK from default project template

Related to KT-23097
---
 .../KotlinGradleMultiplatformWizardStep.kt             | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt
index d2d3bfd119a..f019ab848b9 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformWizardStep.kt
@@ -21,6 +21,7 @@ import com.intellij.ide.util.projectWizard.ProjectWizardUtil
 import com.intellij.ide.util.projectWizard.WizardContext
 import com.intellij.openapi.externalSystem.model.project.ProjectId
 import com.intellij.openapi.options.ConfigurationException
+import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.roots.ui.configuration.JdkComboBox
@@ -47,10 +48,11 @@ class KotlinGradleMultiplatformWizardStep(
         LabeledComponent.create(JTextField(), "Common module name:", BorderLayout.WEST)
     private val jvmCheckBox: JCheckBox =
         JCheckBox("Create JVM module", true)
+    private val jdkModel = ProjectSdksModel().also {
+        it.reset(ProjectManager.getInstance().defaultProject)
+    }
     private val jdkComboBox: JdkComboBox =
-        JdkComboBox(ProjectSdksModel().also {
-            it.reset(null)
-        }) { it is JavaSdk }
+        JdkComboBox(jdkModel) { it is JavaSdk }
     private val jvmModuleNameComponent: LabeledComponent<JTextField> =
         LabeledComponent.create(JTextField(), "JVM module name:", BorderLayout.WEST)
     private val jsCheckBox: JCheckBox =
@@ -103,6 +105,8 @@ class KotlinGradleMultiplatformWizardStep(
         jvmModuleNameComponent.component.document.addDocumentListener(stopSyncEditingListener)
         jsModuleNameComponent.component.document.addDocumentListener(stopSyncEditingListener)
 
+        jdkComboBox.selectedJdk = jdkModel.projectSdk
+
         jvmCheckBox.addItemListener {
             jvmModuleNameComponent.isEnabled = jvmCheckBox.isSelected
             jdkComboBox.isEnabled = jvmCheckBox.isSelected