diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 8eaea1201e15..4008b3090e87 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -655,58 +655,6 @@ public class ContainerUtil extends ContainerUtilRt { return result; } - @NotNull - @Contract(pure=true) - public static List mergeSortedArrays(@NotNull T[] list1, @NotNull T[] list2, @NotNull Comparator comparator, boolean mergeEqualItems, @Nullable Processor filter) { - int index1 = 0; - int index2 = 0; - List result = new ArrayList(list1.length + list2.length); - - while (index1 < list1.length || index2 < list2.length) { - if (index1 >= list1.length) { - T t = list2[index2++]; - if (filter != null && !filter.process(t)) continue; - result.add(t); - } - else if (index2 >= list2.length) { - T t = list1[index1++]; - if (filter != null && !filter.process(t)) continue; - result.add(t); - } - else { - T element1 = list1[index1]; - if (filter != null && !filter.process(element1)) { - index1++; - continue; - } - T element2 = list2[index2]; - if (filter != null && !filter.process(element2)) { - index2++; - continue; - } - int c = comparator.compare(element1, element2); - if (c < 0) { - result.add(element1); - index1++; - } - else if (c > 0) { - result.add(element2); - index2++; - } - else { - result.add(element1); - if (!mergeEqualItems) { - result.add(element2); - } - index1++; - index2++; - } - } - } - - return result; - } - @NotNull @Contract(pure=true) public static List subList(@NotNull List list, int from) { @@ -2378,17 +2326,6 @@ public class ContainerUtil extends ContainerUtilRt { return result; } - @Contract(pure=true) - public static boolean processRecursively(final T root, @NotNull PairProcessor> processor) { - final LinkedList list = new LinkedList(); - list.add(root); - while (!list.isEmpty()) { - final T o = list.removeFirst(); - if (!processor.process(o, list)) return false; - } - return true; - } - @Contract("null -> null; !null -> !null") public static List trimToSize(@Nullable List list) { if (list == null) return null; @@ -2604,7 +2541,7 @@ public class ContainerUtil extends ContainerUtilRt { */ @Deprecated public static void addIfNotNull(@Nullable T element, @NotNull Collection result) { - ContainerUtilRt.addIfNotNull(element, result); + addIfNotNull(result,element); } public static void addIfNotNull(@NotNull Collection result, @Nullable T element) {