From 03a1e481f62f1218251ad17078058345c076fdec Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Thu, 31 Jan 2013 10:50:42 +0100
Subject: [PATCH] AppCode:Unit Testing: goto test/class action (OC-2623)

---
 .../com/intellij/testIntegration/TestFinderHelper.java   | 2 +-
 .../util-rt/src/com/intellij/util/NullableFunction.java  | 4 ++--
 .../src/com/intellij/util/containers/ContainerUtil.java  | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java b/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java
index 7bc022be6bee..58fc1de4cbd1 100644
--- a/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java
+++ b/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java
@@ -82,7 +82,7 @@ public class TestFinderHelper {
       }
     });
 
-    final List<PsiElement> result = new ArrayList<PsiElement>();
+    final List<PsiElement> result = new ArrayList<PsiElement>(elementsWithWeights.size());
     for (Pair<? extends PsiNamedElement, Integer> each : elementsWithWeights) {
       result.add(each.first);
     }
diff --git a/platform/util-rt/src/com/intellij/util/NullableFunction.java b/platform/util-rt/src/com/intellij/util/NullableFunction.java
index ed768ae3ef7a..abbeed68cb97 100644
--- a/platform/util-rt/src/com/intellij/util/NullableFunction.java
+++ b/platform/util-rt/src/com/intellij/util/NullableFunction.java
@@ -20,9 +20,9 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author peter
  */
-public interface NullableFunction<Dom, Img> extends Function<Dom,Img> {
+public interface NullableFunction<Param, Result> extends Function<Param, Result> {
   @Nullable
-  Img fun(final Dom dom);
+  Result fun(final Param param);
 
   /**
    * @see FunctionUtil#nullConstant()
diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
index c817d2001fb7..26d88029881a 100644
--- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java
+++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
@@ -712,6 +712,15 @@ public class ContainerUtil extends ContainerUtilRt {
     return set;
   }
 
+  @NotNull
+  public static <KEY, VALUE> Map<KEY, VALUE> map2Map(@NotNull Collection<Pair<KEY, VALUE>> collection) {
+    final Map<KEY, VALUE> result = new THashMap<KEY, VALUE>(collection.size());
+    for (Pair<KEY, VALUE> pair : collection) {
+      result.put(pair.first, pair.second);
+    }
+    return result;
+  }
+
   @NotNull
   public static <T> Object[] map2Array(@NotNull T[] array, @NotNull Function<T, Object> mapper) {
     return map2Array(array, Object.class, mapper);