From cddec777dfb361f545f5aeaa2c0e274014f4b12d Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 11 Apr 2017 09:50:57 +0200
Subject: [PATCH] =?UTF-8?q?cleanup=20=E2=80=94=20do=20not=20use=20deprecat?=
 =?UTF-8?q?ed=20getConfigurations=20method?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lang-api/src/com/intellij/execution/RunManager.kt | 11 +++++------
 .../src/com/intellij/execution/RunManagerEx.java      |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/execution/RunManager.kt b/platform/lang-api/src/com/intellij/execution/RunManager.kt
index 21077911ab58..e3e9fe774988 100644
--- a/platform/lang-api/src/com/intellij/execution/RunManager.kt
+++ b/platform/lang-api/src/com/intellij/execution/RunManager.kt
@@ -21,7 +21,7 @@ import com.intellij.execution.configurations.RunConfiguration
 import com.intellij.execution.configurations.RunProfile
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.StringUtil
-import com.intellij.util.containers.ContainerUtil
+import com.intellij.util.text.nullize
 import java.util.regex.Pattern
 
 /**
@@ -80,7 +80,7 @@ abstract class RunManager {
    * @param type a run configuration type.
    * @return settings for all configurations of the type, or an empty array if no configurations of the type are defined.
    */
-  @Deprecated("")
+  @Deprecated("", ReplaceWith("getConfigurationSettingsList(type)"))
   fun getConfigurationSettings(type: ConfigurationType) = getConfigurationSettingsList(type).toTypedArray()
 
   /**
@@ -168,7 +168,7 @@ abstract class RunManager {
    * @param isShared true if the configuration is marked as shared (stored in the versioned part of the project files), false if it's local
    * *                 (stored in the workspace file).
    */
-  abstract fun addConfiguration(settings: RunnerAndConfigurationSettings, isShawred: Boolean)
+  abstract fun addConfiguration(settings: RunnerAndConfigurationSettings, isShared: Boolean)
 
   /**
    * Marks the specified run configuration as recently used (the temporary run configurations are deleted in LRU order).
@@ -177,9 +177,8 @@ abstract class RunManager {
   abstract fun refreshUsagesList(profile: RunProfile)
 
   fun suggestUniqueName(name: String?, type: ConfigurationType?): String {
-    val settingsList = if (type != null) getConfigurationSettingsList(type) else allSettings
-    val names = ContainerUtil.map(settingsList) { settings -> settings.name }
-    return suggestUniqueName(StringUtil.notNullize(name, UNNAMED), names)
+    val settingsList = if (type == null) allSettings else getConfigurationSettingsList(type)
+    return suggestUniqueName(name.nullize() ?: UNNAMED, settingsList.map { it.name })
   }
 
   /**
diff --git a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
index 5f68fe926169..cba123dcddf7 100644
--- a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
+++ b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java
@@ -47,7 +47,7 @@ public abstract class RunManagerEx extends RunManager {
   @NotNull
   public abstract RunManagerConfig getConfig();
 
-  public void addConfiguration(@NotNull RunnerAndConfigurationSettings settings, boolean isShared) {
+  public final void addConfiguration(@NotNull RunnerAndConfigurationSettings settings, boolean isShared) {
     if (isShared) {
       ((RunnerAndConfigurationSettingsImpl)settings).setLevel(RunnerAndConfigurationSettingsImpl.Level.PROJECT);
     }