MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: inline some chained methods to avoid unnecessary wrapping

Browse Source 
GitOrigin-RevId: 87175377c0982e53b2d838785b18bb43c1e66712
This commit is contained in:
Alexey Kudravtsev
2019-12-10 11:35:06 +00:00
committed by intellij-monorepo-bot
parent f08e4dfb0d
commit 3a4e0a00ff
1 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/containers/ContainerUtil.java
+42 -10
View File
@@ -650,7 +650,7 @@ public class ContainerUtil extends ContainerUtilRt {
}
if (!result.isEmpty() && result.keySet().iterator().next() instanceof Comparable) {
//noinspection unchecked
//noinspection unchecked,rawtypes
return new KeyOrderedMultiMap(result);
}
return result;
@@ -1188,14 +1188,21 @@ public class ContainerUtil extends ContainerUtilRt {
@NotNull
@Contract(pure=true)
public static <T, V> List<V> findAll(@NotNull T[] collection, @NotNull Class<V> instanceOf) {
return findAll(Arrays.asList(collection), instanceOf);
public static <T, V> List<V> findAll(@NotNull T[] array, @NotNull Class<V> instanceOf) {
List<V> result = new SmartList<>();
for (final T t : array) {
if (instanceOf.isInstance(t)) {
//noinspection unchecked
result.add((V)t);
}
}
return result;
}
@NotNull
@Contract(pure=true)
public static <T, V> V[] findAllAsArray(@NotNull T[] collection, @NotNull Class<V> instanceOf) {
List<V> list = findAll(Arrays.asList(collection), instanceOf);
List<V> list = findAll(collection, instanceOf);
V[] array = ArrayUtil.newArray(instanceOf, list.size());
return list.toArray(array);
}
@@ -1476,7 +1483,8 @@ public class ContainerUtil extends ContainerUtilRt {
@Contract(pure=true)
public static <T, U extends T> U findInstance(@NotNull T[] array, @NotNull Class<? extends U> aClass) {
return findInstance(Arrays.asList(array), aClass);
//noinspection unchecked
return (U)find(array, FilteringIterator.instanceOf(aClass));
}
@NotNull
@@ -2108,7 +2116,18 @@ public class ContainerUtil extends ContainerUtilRt {
@NotNull
@Contract(pure=true)
public static <T, V> List<V> mapNotNull(@NotNull T[] array, @NotNull Function<? super T, ? extends V> mapping) {
return mapNotNull(Arrays.asList(array), mapping);
if (array.length == 0) {
return emptyList();
}
List<V> result = new ArrayList<>(array.length);
for (T t : array) {
final V o = mapping.fun(t);
if (o != null) {
result.add(o);
}
}
return result.isEmpty() ? emptyList() : result;
}
/**
@@ -2288,7 +2307,10 @@ public class ContainerUtil extends ContainerUtilRt {
@Contract(pure=true)
public static <T> boolean and(@NotNull T[] iterable, @NotNull Condition<? super T> condition) {
return and(Arrays.asList(iterable), condition);
for (final T t : iterable) {
if (!condition.value(t)) return false;
}
return true;
}
@Contract(pure=true)
@@ -2846,7 +2868,12 @@ public class ContainerUtil extends ContainerUtilRt {
@NotNull
@Contract(pure=true)
public static <T, V> List<V> map2List(@NotNull T[] array, @NotNull Function<? super T, ? extends V> mapper) {
return map2List(Arrays.asList(array), mapper);
if (array.length == 0) return emptyList();
List<V> list = new ArrayList<>(array.length);
for (final T t : array) {
list.add(mapper.fun(t));
}
return list;
}
@NotNull
@@ -2873,8 +2900,13 @@ public class ContainerUtil extends ContainerUtilRt {
@NotNull
@Contract(pure=true)
public static <T, V> Set<V> map2Set(@NotNull T[] collection, @NotNull Function<? super T, ? extends V> mapper) {
return map2Set(Arrays.asList(collection), mapper);
public static <T, V> Set<V> map2Set(@NotNull T[] array, @NotNull Function<? super T, ? extends V> mapper) {
if (array.length == 0) return Collections.emptySet();
Set<V> set = new HashSet<>(array.length);
for (final T t : array) {
set.add(mapper.fun(t));
}
return set;
}
@NotNull