diff --git a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java index 453b3bda47e1..23d5161ebabc 100644 --- a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java +++ b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java @@ -61,7 +61,8 @@ public class ContainerUtilRt { return map; } - public static Map newHashMap(Pair first, Pair[] entries) { + @NotNull + public static Map newHashMap(@NotNull Pair first, Pair[] entries) { Map map = newHashMap(); map.put(first.getFirst(), first.getSecond()); for (Pair entry : entries) { @@ -90,6 +91,16 @@ public class ContainerUtilRt { return new com.intellij.util.containers.LinkedHashMap(map); } + @NotNull + public static LinkedHashMap newLinkedHashMap(@NotNull Pair first, Pair[] entries) { + LinkedHashMap map = newLinkedHashMap(); + map.put(first.getFirst(), first.getSecond()); + for (Pair entry : entries) { + map.put(entry.getFirst(), entry.getSecond()); + } + return map; + } + @NotNull public static LinkedList newLinkedList() { return new LinkedList(); diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 132e384ecf07..fc6c29e3f93d 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -55,7 +55,7 @@ public class ContainerUtil extends ContainerUtilRt { } @NotNull - public static Map newHashMap(Pair first, Pair... entries) { + public static Map newHashMap(@NotNull Pair first, Pair... entries) { return ContainerUtilRt.newHashMap(first, entries); } @@ -84,6 +84,11 @@ public class ContainerUtil extends ContainerUtilRt { return ContainerUtilRt.newLinkedHashMap(map); } + @NotNull + public static LinkedHashMap newLinkedHashMap(@NotNull Pair first, Pair... entries) { + return ContainerUtilRt.newLinkedHashMap(first, entries); + } + @NotNull public static THashMap newTroveMap() { return new THashMap();