From 3178d3ecc2268aa5c18bfaafba26fe548a28b42b Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Fri, 6 Oct 2017 18:23:18 +0300 Subject: [PATCH] PY-26358 Mark the only SDK group panel as selected by default --- .../newProject/steps/ProjectSpecificSettingsStep.java | 7 +------ .../src/com/jetbrains/python/sdk/add/PyAddSdkGroupPanel.kt | 7 +++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/python/python-community-configure/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java index ddcc0ad71e6a..0514a07e923a 100644 --- a/python/python-community-configure/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java +++ b/python/python-community-configure/src/com/jetbrains/python/newProject/steps/ProjectSpecificSettingsStep.java @@ -300,12 +300,7 @@ public class ProjectSpecificSettingsStep extends ProjectSettingsStepBase i final List panels = Arrays.asList(newVirtualEnvPanel, existingSdkPanel); myInterpreterPanel = new PyAddSdkGroupPanel("New project interpreter", getIcon(), panels, newVirtualEnvPanel); - myInterpreterPanel.addChangeListener(() -> { - PyAddSdkGroupPanel panel = myInterpreterPanel; - if (panel != null) { - decorator.setTitle(getProjectInterpreterTitle(panel.getSelectedPanel())); - } - }); + myInterpreterPanel.addChangeListener(() -> decorator.setTitle(getProjectInterpreterTitle(myInterpreterPanel.getSelectedPanel()))); newVirtualEnvPanel.addChangeListener(this::checkValid); existingSdkPanel.addChangeListener(this::checkValid); diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddSdkGroupPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddSdkGroupPanel.kt index 4fe266b9b170..c4f2fabbb872 100644 --- a/python/src/com/jetbrains/python/sdk/add/PyAddSdkGroupPanel.kt +++ b/python/src/com/jetbrains/python/sdk/add/PyAddSdkGroupPanel.kt @@ -34,7 +34,7 @@ class PyAddSdkGroupPanel(name: String, defaultPanel: PyAddSdkPanel) : PyAddSdkPanel() { override val panelName = name override val icon = panelIcon - var selectedPanel: PyAddSdkPanel? = null + var selectedPanel: PyAddSdkPanel = defaultPanel private val changeListeners: MutableList = mutableListOf() init { @@ -49,9 +49,9 @@ class PyAddSdkGroupPanel(name: String, override fun validateAll() = panels.filter { it.isEnabled }.flatMap { it.validateAll() } override val sdk: Sdk? - get() = selectedPanel?.sdk + get() = selectedPanel.sdk - override fun getOrCreateSdk() = selectedPanel?.getOrCreateSdk() + override fun getOrCreateSdk() = selectedPanel.getOrCreateSdk() fun addChangeListener(listener: Runnable) { changeListeners += listener @@ -81,7 +81,6 @@ class PyAddSdkGroupPanel(name: String, } } } - selectedPanel = defaultPanel buttonMap.filterValues { it == defaultPanel }.keys.first().isSelected = true return formBuilder.panel }