From 030e5b2e83df73cc0345852a8e86b0a30940eac8 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Fri, 2 Feb 2018 17:56:20 +0300
Subject: [PATCH] PY-26361 Refer to environment location directory
 unambiguously in warnings

---
 .../com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt | 2 +-
 .../jetbrains/python/sdk/add/PyAddNewVirtualEnvPanel.kt   | 2 +-
 python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt
index 2e78519914b4..398cec850386 100644
--- a/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt
+++ b/python/src/com/jetbrains/python/sdk/add/PyAddNewCondaEnvPanel.kt
@@ -106,7 +106,7 @@ class PyAddNewCondaEnvPanel(private val project: Project?,
   }
 
   override fun validateAll() =
-    listOfNotNull(validateAnacondaPath(), validateEmptyOrNonExistingDirectoryLocation(pathField))
+    listOfNotNull(validateAnacondaPath(), validateEnvironmentDirectoryLocation(pathField))
 
   override fun getOrCreateSdk(): Sdk? {
     val condaPath = condaPathField.text
diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddNewVirtualEnvPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddNewVirtualEnvPanel.kt
index 2c2f996bdc34..7303e5dd4e9f 100644
--- a/python/src/com/jetbrains/python/sdk/add/PyAddNewVirtualEnvPanel.kt
+++ b/python/src/com/jetbrains/python/sdk/add/PyAddNewVirtualEnvPanel.kt
@@ -91,7 +91,7 @@ class PyAddNewVirtualEnvPanel(private val project: Project?,
   }
 
   override fun validateAll() =
-    listOfNotNull(validateEmptyOrNonExistingDirectoryLocation(pathField),
+    listOfNotNull(validateEnvironmentDirectoryLocation(pathField),
                   validateSdkComboBox(baseSdkField))
 
   override fun getOrCreateSdk(): Sdk? {
diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
index 85e9fdd18fc6..adadb39a6e6a 100644
--- a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
+++ b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
@@ -44,13 +44,13 @@ abstract class PyAddSdkPanel : JPanel() {
 
   companion object {
     @JvmStatic
-    protected fun validateEmptyOrNonExistingDirectoryLocation(field: TextFieldWithBrowseButton): ValidationInfo? {
+    protected fun validateEnvironmentDirectoryLocation(field: TextFieldWithBrowseButton): ValidationInfo? {
       val text = field.text
       val file = File(text)
       val message = when {
-        StringUtil.isEmptyOrSpaces(text) -> "Location field is empty"
-        file.exists() && !file.isDirectory -> "Location field path is not a directory"
-        file.isNotEmptyDirectory -> "Location directory is not empty"
+        StringUtil.isEmptyOrSpaces(text) -> "Environment location field is empty"
+        file.exists() && !file.isDirectory -> "Environment location field path is not a directory"
+        file.isNotEmptyDirectory -> "Environment location directory is not empty"
         else -> return null
       }
       return ValidationInfo(message, field)