From d0e8a72b8a55faa0aba0bdb364ef837aafd2fc7d Mon Sep 17 00:00:00 2001
From: Dmitry Semeniouta <Dmitry.Semeniouta@jetbrains.com>
Date: Thu, 14 Feb 2013 23:00:25 +0400
Subject: [PATCH] ContainerUtil: addAllNotNull(Collection, Iterable) is fixed;
 all addIfNotNull's return bool to signal if container is changed

---
 .../intellij/util/containers/ContainerUtilRt.java    | 12 ++++--------
 .../com/intellij/util/containers/ContainerUtil.java  | 10 +++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

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<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
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 <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