MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-22324 Show '!' for fields when Anaconda is not found

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2017-10-10 05:49:49 +03:00
parent d0ec2d2678
commit 1bba58a79f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/add/PyAddExistingCondaEnvPanel.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class PyAddExistingCondaEnvPanel(private val project: Project?,
}
override fun validateAll() =
listOf(validateAnacondaPresense(),
listOf(validateAnacondaPresense(sdkComboBox),
validateSdkComboBox(sdkComboBox))
.filterNotNull()
python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt
+1 -1
View File
@@ -74,7 +74,7 @@ class PyAddNewCondaEnvPanel(private val project: Project?,
}
override fun validateAll() =
listOf(validateAnacondaPresense(),
listOf(validateAnacondaPresense(pathField),
validateEmptyOrNonExistingDirectoryLocation(pathField))
.filterNotNull()
python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
+3 -2
View File
@@ -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
}