convert Promise.any to kt

diff --git a/platform/core-api/src/org/jetbrains/concurrency/ConsumerRunnable.java b/platform/core-api/src/org/jetbrains/concurrency/ConsumerRunnable.java
deleted file mode 100644 (file)
index f10f67e..0000000
--- a/platform/core-api/src/org/jetbrains/concurrency/ConsumerRunnable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.concurrency;
-
-import com.intellij.util.Consumer;
-
-public abstract class ConsumerRunnable implements Consumer<Void>, Runnable {
-  @Override
-  public final void consume(Void aVoid) {
-    run();
-  }
-
-  @Override
-  public abstract void run();
-}

diff --git a/platform/core-api/src/org/jetbrains/concurrency/Promise.java b/platform/core-api/src/org/jetbrains/concurrency/Promise.java
index e331b50d0c2a4a1b8baab2cb285892a0f130e535..e5d186f75703a7e2ad996fc4b0401253a978a4e7 100644 (file)
--- a/platform/core-api/src/org/jetbrains/concurrency/Promise.java
+++ b/platform/core-api/src/org/jetbrains/concurrency/Promise.java
@@ -23,12 +23,9 @@ import com.intellij.openapi.util.AsyncResult;
 import com.intellij.util.Consumer;
 import com.intellij.util.Function;
 import com.intellij.util.ThreeState;
-import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-
 public abstract class Promise<T> {
   public static final Promise<Void> DONE = new DonePromise<Void>(null);
   public static final Promise<Void> REJECTED = new RejectedPromise<Void>(createError("rejected"));
@@ -69,40 +66,6 @@ public abstract class Promise<T> {
     }
   }
 
-  public static <T> Promise<T> any(@NotNull final Collection<Promise<T>> promises, @NotNull final String totalError) {
-    if (promises.isEmpty()) {
-      //noinspection unchecked
-      return (Promise<T>)DONE;
-    }
-    else if (promises.size() == 1) {
-      return ContainerUtil.getFirstItem(promises);
-    }
-
-    final AsyncPromise<T> totalPromise = new AsyncPromise<T>();
-    Consumer<T> done = new Consumer<T>() {
-      @Override
-      public void consume(T result) {
-        totalPromise.setResult(result);
-      }
-    };
-    Consumer<Throwable> rejected = new Consumer<Throwable>() {
-      private volatile int toConsume = promises.size();
-
-      @Override
-      public void consume(Throwable throwable) {
-        if (--toConsume <= 0) {
-          totalPromise.setError(totalError);
-        }
-      }
-    };
-
-    for (Promise<? extends T> promise : promises) {
-      promise.done(done);
-      promise.rejected(rejected);
-    }
-    return totalPromise;
-  }
-
   @NotNull
   public static Promise<Void> wrapAsVoid(@NotNull ActionCallback asyncResult) {
     final AsyncPromise<Void> promise = new AsyncPromise<Void>();

diff --git a/platform/platform-api/src/com/intellij/util/concurrency/promise-ex.kt b/platform/platform-api/src/com/intellij/util/concurrency/promise-ex.kt
index f508fd8b030ba4cb54cf41553f070760826da0e8..e923bcdba6d64e31b13fee3811587bcc8cf5c26b 100644 (file)
--- a/platform/platform-api/src/com/intellij/util/concurrency/promise-ex.kt
+++ b/platform/platform-api/src/com/intellij/util/concurrency/promise-ex.kt
@@ -46,4 +46,31 @@ private class CountDownConsumer<T>(@Volatile private var countDown: Int, private
       promise.setResult(totalResult)
     }
   }
+}
+
+fun <T> any(promises: Collection<Promise<T>>, totalError: String): Promise<T> {
+  if (promises.isEmpty()) {
+    return resolvedPromise(null)
+  }
+  else if (promises.size == 1) {
+    return promises.first()
+  }
+
+  val totalPromise = AsyncPromise<T>()
+  val done = Consumer<T> { result -> totalPromise.setResult(result) }
+  val rejected = object : Consumer<Throwable> {
+    @Volatile private var toConsume = promises.size
+
+    override fun consume(throwable: Throwable) {
+      if (--toConsume <= 0) {
+        totalPromise.setError(totalError)
+      }
+    }
+  }
+
+  for (promise in promises) {
+    promise.done(done)
+    promise.rejected(rejected)
+  }
+  return totalPromise
 }
\ No newline at end of file