replacing ThreadWaitingCondition with lambda

tobyweston · Jan 22, 2014 · 04f5248 · 04f5248
1 parent f281c6d
commit 04f5248
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 37 deletions.
diff --git a/src/main/java/com/google/code/tempusfugit/condition/Conditions.java b/src/main/java/com/google/code/tempusfugit/condition/Conditions.java
@@ -23,6 +23,10 @@
 
 import java.util.concurrent.ExecutorService;
 
+import static java.lang.Thread.*;
+import static java.lang.Thread.State.TIMED_WAITING;
+import static java.lang.Thread.State.WAITING;
+
 public final class Conditions {
 
     public static Condition not(Condition condition) {
@@ -38,10 +42,12 @@ public static Condition isAlive(Thread thread) {
     }
 
     public static Condition isWaiting(Thread thread) {
-        return new ThreadWaitingCondition(thread);
+        return () -> {
+            return (thread.getState() == TIMED_WAITING) || (thread.getState() == WAITING);
+        };
     }
 
-    public static Condition is(Thread thread, Thread.State state) {
+    public static Condition is(Thread thread, State state) {
         return new ThreadStateCondition(thread, state);
     }
 

diff --git a/src/main/java/com/google/code/tempusfugit/condition/ThreadWaitingCondition.java b/src/main/java/com/google/code/tempusfugit/condition/ThreadWaitingCondition.java