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 0b0c8ddddb1e..0849082592a4 100644 --- a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java +++ b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java @@ -277,16 +277,12 @@ public class ContainerUtilRt { return new CopyOnWriteArrayList(ContainerUtilRt.emptyList()); } - public static void addIfNotNull(@Nullable T element, @NotNull Collection result) { - if (element != null) { - result.add(element); - } + public static boolean addIfNotNull(@Nullable T element, @NotNull Collection result) { + return (element != null) && result.add(element); } - public static void addIfNotNull(@NotNull Collection result, @Nullable T element) { - if (element != null) { - result.add(element); - } + public static boolean addIfNotNull(@NotNull Collection result, @Nullable T element) { + return (element != null) && result.add(element); } @NotNull diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 26d88029881a..9edcbba5b0d0 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -537,7 +537,7 @@ public class ContainerUtil extends ContainerUtilRt { * Adds all not-null elements from the {@code elements}, ignoring nulls */ public static void addAllNotNull(@NotNull Collection collection, @NotNull Iterable elements) { - addAll(collection, elements.iterator()); + addAllNotNull(collection, elements.iterator()); } /** @@ -1873,12 +1873,12 @@ public class ContainerUtil extends ContainerUtilRt { return new LockFreeCopyOnWriteArrayList(c); } - public static void addIfNotNull(@Nullable T element, @NotNull Collection result) { - ContainerUtilRt.addIfNotNull(element, result); + public static boolean addIfNotNull(@Nullable T element, @NotNull Collection result) { + return ContainerUtilRt.addIfNotNull(element, result); } - public static void addIfNotNull(@NotNull Collection result, @Nullable T element) { - ContainerUtilRt.addIfNotNull(result, element); + public static boolean addIfNotNull(@NotNull Collection result, @Nullable T element) { + return ContainerUtilRt.addIfNotNull(result, element); } @NotNull