From 1bba58a79fe65efc4019b42a1d04351a86e24028 Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Tue, 3 Oct 2017 00:07:13 +0300 Subject: [PATCH] PY-22324 Show '!' for fields when Anaconda is not found --- .../jetbrains/python/sdk/add/PyAddExistingCondaEnvPanel.kt | 2 +- .../com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt | 2 +- python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddExistingCondaEnvPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddExistingCondaEnvPanel.kt index 3ba810f79c5b..04c2498ccd5c 100644 --- a/python/src/com/jetbrains/python/sdk/add/PyAddExistingCondaEnvPanel.kt +++ b/python/src/com/jetbrains/python/sdk/add/PyAddExistingCondaEnvPanel.kt @@ -47,7 +47,7 @@ class PyAddExistingCondaEnvPanel(private val project: Project?, } override fun validateAll() = - listOf(validateAnacondaPresense(), + listOf(validateAnacondaPresense(sdkComboBox), validateSdkComboBox(sdkComboBox)) .filterNotNull() diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt index 70523613d573..970f79df9f79 100644 --- a/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt +++ b/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt @@ -74,7 +74,7 @@ class PyAddNewCondaEnvPanel(private val project: Project?, } override fun validateAll() = - listOf(validateAnacondaPresense(), + listOf(validateAnacondaPresense(pathField), validateEmptyOrNonExistingDirectoryLocation(pathField)) .filterNotNull() diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt index f8c0dc4e94f6..84e1b2b3df61 100644 --- a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt +++ b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt @@ -24,6 +24,7 @@ import com.jetbrains.python.sdk.isNotEmptyDirectory import icons.PythonIcons import java.io.File import javax.swing.Icon +import javax.swing.JComponent import javax.swing.JPanel /** @@ -51,10 +52,10 @@ abstract class PyAddSdkPanel : JPanel() { return message?.let { ValidationInfo(it, field) } } - @JvmStatic protected fun validateAnacondaPresense(): ValidationInfo? = + @JvmStatic protected fun validateAnacondaPresense(component: JComponent?): ValidationInfo? = when { PyCondaPackageService.getSystemCondaExecutable() == null -> - ValidationInfo("Anaconda installation is not found") + ValidationInfo("Anaconda installation is not found", component) else -> null }