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

ContainerUtil: addAllNotNull(Collection, Iterable) is fixed; all addIfNotNull's return bool to signal if container is changed

Browse Source
This commit is contained in:
Dmitry Semeniouta
2013-02-14 23:11:19 +04:00
parent 70179b71da
commit d0e8a72b8a
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java
+4 -8
View File
@@ -277,16 +277,12 @@ public class ContainerUtilRt {
return new CopyOnWriteArrayList<T>(ContainerUtilRt.<T>emptyList());
}
public static <T> void addIfNotNull(@Nullable T element, @NotNull Collection<T> result) {
if (element != null) {
result.add(element);
}
public static <T> boolean addIfNotNull(@Nullable T element, @NotNull Collection<T> result) {
return (element != null) && result.add(element);
}
public static <T> void addIfNotNull(@NotNull Collection<T> result, @Nullable T element) {
if (element != null) {
result.add(element);
}
public static <T> boolean addIfNotNull(@NotNull Collection<T> result, @Nullable T element) {
return (element != null) && result.add(element);
}
@NotNull
platform/util/src/com/intellij/util/containers/ContainerUtil.java
+5 -5
View File
@@ -537,7 +537,7 @@ public class ContainerUtil extends ContainerUtilRt {
* Adds all not-null elements from the {@code elements}, ignoring nulls
*/
public static <T> void addAllNotNull(@NotNull Collection<T> collection, @NotNull Iterable<? extends T> elements) {
addAll(collection, elements.iterator());
addAllNotNull(collection, elements.iterator());
}
/**
@@ -1873,12 +1873,12 @@ public class ContainerUtil extends ContainerUtilRt {
return new LockFreeCopyOnWriteArrayList<T>(c);
}
public static <T> void addIfNotNull(@Nullable T element, @NotNull Collection<T> result) {
ContainerUtilRt.addIfNotNull(element, result);
public static <T> boolean addIfNotNull(@Nullable T element, @NotNull Collection<T> result) {
return ContainerUtilRt.addIfNotNull(element, result);
}
public static <T> void addIfNotNull(@NotNull Collection<T> result, @Nullable T element) {
ContainerUtilRt.addIfNotNull(result, element);
public static <T> boolean addIfNotNull(@NotNull Collection<T> result, @Nullable T element) {
return ContainerUtilRt.addIfNotNull(result, element);
}
@NotNull