From 4c08efbe9f66a32498fd97409d6bd5f2d2c8006b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 15 Oct 2014 14:47:41 +0200
Subject: [PATCH] cleanup

---
 .../impl/ProjectRunConfigurationManager.java  |  5 +---
 .../execution/impl/RunManagerImpl.java        | 30 +++++++++++--------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java b/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java
index 8fd6635114f4..b7a5243c72f4 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java
@@ -32,7 +32,6 @@ import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -75,12 +74,10 @@ public class ProjectRunConfigurationManager implements ProjectComponent, Persist
 
   @Override
   public void initComponent() {
-
   }
 
   @Override
   public void disposeComponent() {
-
   }
 
   @Override
@@ -106,7 +103,7 @@ public class ProjectRunConfigurationManager implements ProjectComponent, Persist
         RunnerAndConfigurationSettings configuration = myManager.loadConfiguration(child, true);
         if (configuration == null && Comparing.strEqual(state.getName(), RunManagerImpl.CONFIGURATION)) {
           if (myUnloadedElements == null) {
-            myUnloadedElements = new ArrayList<Element>(2);
+            myUnloadedElements = new SmartList<Element>();
           }
           myUnloadedElements.add(state);
         }
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
index e63fe8f9f0e2..6045e524353b 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
@@ -198,16 +198,18 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
    */
   @Override
   @NotNull
-  public List<RunConfiguration> getConfigurationsList(@NotNull final ConfigurationType type) {
-    final List<RunConfiguration> list = new ArrayList<RunConfiguration>();
-    for (RunnerAndConfigurationSettings myConfiguration : getSortedConfigurations()) {
-      final RunConfiguration configuration = myConfiguration.getConfiguration();
-      final ConfigurationType configurationType = configuration.getType();
-      if (type.getId().equals(configurationType.getId())) {
-        list.add(configuration);
+  public List<RunConfiguration> getConfigurationsList(@NotNull ConfigurationType type) {
+    List<RunConfiguration> result = null;
+    for (RunnerAndConfigurationSettings settings : getSortedConfigurations()) {
+      RunConfiguration configuration = settings.getConfiguration();
+      if (type.getId().equals(configuration.getType().getId())) {
+        if (result == null) {
+          result = new SmartList<RunConfiguration>();
+        }
+        result.add(configuration);
       }
     }
-    return list;
+    return ContainerUtil.notNullize(result);
   }
 
   @Override
@@ -218,7 +220,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
       return Collections.emptyList();
     }
 
-    List<RunConfiguration> result = new ArrayList<RunConfiguration>(myConfigurations.size());
+    List<RunConfiguration> result = new ArrayList<RunConfiguration>(sortedConfigurations.size());
     for (RunnerAndConfigurationSettings settings : sortedConfigurations) {
       result.add(settings.getConfiguration());
     }
@@ -327,8 +329,6 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
   public void addConfiguration(RunnerAndConfigurationSettings settings,
                                boolean shared,
                                List<BeforeRunTask> tasks, boolean addEnabledTemplateTasksIfAbsent) {
-    final RunConfiguration configuration = settings.getConfiguration();
-
     String existingId = findExistingConfigurationId(settings);
     String newId = settings.getUniqueID();
     RunnerAndConfigurationSettings existingSettings = null;
@@ -342,6 +342,8 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
       setSelectedConfigurationId(newId);
     }
     myConfigurations.put(newId, settings);
+
+    RunConfiguration configuration = settings.getConfiguration();
     if (existingId == null) {
       refreshUsagesList(configuration);
     }
@@ -398,7 +400,9 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
   public void saveOrder() {
     myOrder.clear();
     for (RunnerAndConfigurationSettings each : myConfigurations.values()) {
-      if (each.getType() instanceof UnknownConfigurationType) continue;
+      if (each.getType() instanceof UnknownConfigurationType) {
+        continue;
+      }
       myOrder.add(each.getUniqueID());
     }
   }
@@ -791,7 +795,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
   }
 
   private void clear() {
-    final List<RunnerAndConfigurationSettings> configurations = new ArrayList<RunnerAndConfigurationSettings>(myConfigurations.values());
+    List<RunnerAndConfigurationSettings> configurations = new ArrayList<RunnerAndConfigurationSettings>(myConfigurations.values());
     myConfigurations.clear();
     myUnknownElements = null;
     myConfigurationToBeforeTasksMap.clear();