Commit the initial changes again - this time the diffs will show the …

…exact changes over the Scala code.
twitter-archive · Jul 5, 2010 · 1a3d112 · 1a3d112
1 parent 3d94d77
commit 1a3d112
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 2,339 deletions.
diff --git a/src/main/java/com/twitter/actors/threadpool/AbstractExecutorService.java b/src/main/java/com/twitter/actors/threadpool/AbstractExecutorService.java
@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Iterator;
+import java.util.concurrent.*;
 
 /**
  * Provides default implementations of {@link ExecutorService}

diff --git a/src/main/java/com/twitter/actors/threadpool/BlockingQueue.java b/src/main/java/com/twitter/actors/threadpool/BlockingQueue.java
diff --git a/src/main/java/com/twitter/actors/threadpool/CompletionService.java b/src/main/java/com/twitter/actors/threadpool/CompletionService.java
@@ -5,6 +5,7 @@
  */
 
 package com.twitter.actors.threadpool;
+import java.util.concurrent.*;
 
 /**
  * A service that decouples the production of new asynchronous tasks

diff --git a/src/main/java/com/twitter/actors/threadpool/ExecutorCompletionService.java b/src/main/java/com/twitter/actors/threadpool/ExecutorCompletionService.java
@@ -6,7 +6,7 @@
 
 package com.twitter.actors.threadpool;
 import com.twitter.actors.threadpool.*; // for javadoc (till 6280605 is fixed)
-
+import java.util.concurrent.*;
 /**
  * A {@link CompletionService} that uses a supplied {@link Executor}
  * to execute tasks.  This class arranges that submitted tasks are,

diff --git a/src/main/java/com/twitter/actors/threadpool/ExecutorService.java b/src/main/java/com/twitter/actors/threadpool/ExecutorService.java
@@ -9,7 +9,7 @@
 import com.twitter.actors.threadpool.*; // for javadoc (till 6280605 is fixed)
 import java.util.List;
 import java.util.Collection;
-
+import java.util.concurrent.*;
 /**
  * An {@link Executor} that provides methods to manage termination and
  * methods that can produce a {@link Future} for tracking progress of

diff --git a/src/main/java/com/twitter/actors/threadpool/Executors.java b/src/main/java/com/twitter/actors/threadpool/Executors.java
@@ -13,7 +13,7 @@
 import java.security.AccessControlException;
 import java.util.List;
 import java.util.Collection;
-
+import java.util.concurrent.*;
 /**
  * Factory and utility methods for {@link Executor}, {@link
  * ExecutorService}, {@link ScheduledExecutorService}, {@link

diff --git a/src/main/java/com/twitter/actors/threadpool/Future.java b/src/main/java/com/twitter/actors/threadpool/Future.java
@@ -6,6 +6,7 @@
 
 package com.twitter.actors.threadpool;
 import com.twitter.actors.threadpool.*; // for javadoc (till 6280605 is fixed)
+import java.util.concurrent.TimeUnit;
 
 /**
  * A <tt>Future</tt> represents the result of an asynchronous