removed generics warnings in actors

8 files changed, 23 insertions, 19 deletions

diff --git a/src/actors/scala/actors/threadpool/AbstractExecutorService.java b/src/actors/scala/actors/threadpool/AbstractExecutorService.java
index 7953bfe30f..4a12aa3c28 100644
--- a/src/actors/scala/actors/threadpool/AbstractExecutorService.java
+++ b/src/actors/scala/actors/threadpool/AbstractExecutorService.java
@@ -120,7 +120,7 @@ public abstract class AbstractExecutorService implements ExecutorService {
         int ntasks = tasks.size();
         if (ntasks == 0)
             throw new IllegalArgumentException();
-        List futures= new ArrayList(ntasks);
+        List<Future> futures = new ArrayList<Future>(ntasks);
         ExecutorCompletionService ecs =
             new ExecutorCompletionService(this);
 
@@ -203,10 +203,10 @@ public abstract class AbstractExecutorService implements ExecutorService {
         return doInvokeAny(tasks, true, unit.toNanos(timeout));
     }
 
-    public List invokeAll(Collection tasks) throws InterruptedException {
+    public List<Future> invokeAll(Collection tasks) throws InterruptedException {
         if (tasks == null)
             throw new NullPointerException();
-        List futures = new ArrayList(tasks.size());
+        List<Future> futures = new ArrayList<Future>(tasks.size());
         boolean done = false;
         try {
             for (Iterator t = tasks.iterator(); t.hasNext();) {
@@ -235,13 +235,13 @@ public abstract class AbstractExecutorService implements ExecutorService {
         }
     }
 
-    public List invokeAll(Collection tasks,
+    public List<Future> invokeAll(Collection tasks,
                           long timeout, TimeUnit unit)
         throws InterruptedException {
         if (tasks == null || unit == null)
             throw new NullPointerException();
         long nanos = unit.toNanos(timeout);
-        List futures = new ArrayList(tasks.size());
+        List<Future> futures = new ArrayList<Future>(tasks.size());
         boolean done = false;
         try {
             for (Iterator t = tasks.iterator(); t.hasNext();)
diff --git a/src/actors/scala/actors/threadpool/Executors.java b/src/actors/scala/actors/threadpool/Executors.java
index e74d665f33..49a127a8db 100644
--- a/src/actors/scala/actors/threadpool/Executors.java
+++ b/src/actors/scala/actors/threadpool/Executors.java
@@ -605,12 +605,12 @@ public class Executors {
         public Future submit(Runnable task, Object result) {
             return e.submit(task, result);
         }
-        public List invokeAll(Collection tasks)
+        public List<Future> invokeAll(Collection tasks)
             throws InterruptedException {
             return e.invokeAll(tasks);
         }
-        public List invokeAll(Collection tasks,
-                                             long timeout, TimeUnit unit)
+        public List<Future> invokeAll(Collection tasks,
+                                      long timeout, TimeUnit unit)
             throws InterruptedException {
             return e.invokeAll(tasks, timeout, unit);
         }
diff --git a/src/actors/scala/actors/threadpool/ThreadPoolExecutor.java b/src/actors/scala/actors/threadpool/ThreadPoolExecutor.java
index f41b2790b6..11e35b034c 100644
--- a/src/actors/scala/actors/threadpool/ThreadPoolExecutor.java
+++ b/src/actors/scala/actors/threadpool/ThreadPoolExecutor.java
@@ -791,7 +791,7 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
      */
     private List drainQueue() {
         BlockingQueue q = workQueue;
-        List taskList = new ArrayList();
+        List<Runnable> taskList = new ArrayList<Runnable>();
         q.drainTo(taskList);
         if (!q.isEmpty()) {
             Runnable[] arr = (Runnable[])q.toArray(new Runnable[0]);
diff --git a/src/actors/scala/actors/threadpool/helpers/FIFOWaitQueue.java b/src/actors/scala/actors/threadpool/helpers/FIFOWaitQueue.java
index 6306faa08f..432b851f3e 100644
--- a/src/actors/scala/actors/threadpool/helpers/FIFOWaitQueue.java
+++ b/src/actors/scala/actors/threadpool/helpers/FIFOWaitQueue.java
@@ -64,7 +64,7 @@ public class FIFOWaitQueue extends WaitQueue implements java.io.Serializable {
     }
 
     public Collection getWaitingThreads() {
-        List list = new ArrayList();
+        List<Thread> list = new ArrayList<Thread>();
         int count = 0;
         WaitNode node = head_;
         while (node != null) {
diff --git a/src/actors/scala/actors/threadpool/helpers/Utils.java b/src/actors/scala/actors/threadpool/helpers/Utils.java
index df1dbd4960..d12389215d 100644
--- a/src/actors/scala/actors/threadpool/helpers/Utils.java
+++ b/src/actors/scala/actors/threadpool/helpers/Utils.java
@@ -41,9 +41,9 @@ public final class Utils {
     static {
         NanoTimer timer = null;
         try {
-            String nanoTimerClassName = (String)
-                AccessController.doPrivileged(new PrivilegedAction() {
-                    public Object run() {
+            String nanoTimerClassName =
+                AccessController.doPrivileged(new PrivilegedAction<String>() {
+                    public String run() {
                         return System.getProperty(providerProp);
                     }
                 });
@@ -206,9 +206,9 @@ public final class Utils {
         final Perf perf;
         final long multiplier, divisor;
         SunPerfProvider() {
-            perf = (Perf)
-                AccessController.doPrivileged(new PrivilegedAction() {
-                    public Object run() {
+            perf =
+                AccessController.doPrivileged(new PrivilegedAction<Perf>() {
+                    public Perf run() {
                         return Perf.getPerf();
                     }
                 });
diff --git a/src/actors/scala/actors/threadpool/locks/CondVar.java b/src/actors/scala/actors/threadpool/locks/CondVar.java
index 132e72fe2a..44df1c0b97 100644
--- a/src/actors/scala/actors/threadpool/locks/CondVar.java
+++ b/src/actors/scala/actors/threadpool/locks/CondVar.java
@@ -17,6 +17,7 @@ import scala.actors.threadpool.*;
 import scala.actors.threadpool.helpers.*;
 
 class CondVar implements Condition, java.io.Serializable {
+    private static final long serialVersionUID = -5009898475638427940L;
 
     /** The lock **/
     protected final ExclusiveLock lock;
diff --git a/src/actors/scala/actors/threadpool/locks/FIFOCondVar.java b/src/actors/scala/actors/threadpool/locks/FIFOCondVar.java
index 7495a8a884..144ac54d37 100644
--- a/src/actors/scala/actors/threadpool/locks/FIFOCondVar.java
+++ b/src/actors/scala/actors/threadpool/locks/FIFOCondVar.java
@@ -17,6 +17,7 @@ import scala.actors.threadpool.*;
 import scala.actors.threadpool.helpers.*;
 
 class FIFOCondVar extends CondVar implements Condition, java.io.Serializable {
+    private static final long serialVersionUID = -497497271881010475L;
 
     private static final WaitQueue.QueuedSync sync = new WaitQueue.QueuedSync() {
         public boolean recheck(WaitQueue.WaitNode node) { return false; }
diff --git a/src/actors/scala/actors/threadpool/locks/ReentrantReadWriteLock.java b/src/actors/scala/actors/threadpool/locks/ReentrantReadWriteLock.java
index 6411bbea01..437af77c7a 100644
--- a/src/actors/scala/actors/threadpool/locks/ReentrantReadWriteLock.java
+++ b/src/actors/scala/actors/threadpool/locks/ReentrantReadWriteLock.java
@@ -190,7 +190,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab
         transient int writeHolds_ = 0;
 
         /** Number of acquires on read lock by any reader thread **/
-        transient HashMap readers_ = new HashMap();
+        transient HashMap<Thread, Integer> readers_ = new HashMap<Thread, Integer>();
 
         /** cache/reuse the special Integer value one to speed up readlocks **/
         static final Integer IONE = new Integer(1);
@@ -344,7 +344,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab
         synchronized int getReadHoldCount() {
             if (activeReaders_ == 0) return 0;
             Thread t = Thread.currentThread();
-            Integer i = (Integer)readers_.get(t);
+            Integer i = readers_.get(t);
             return (i == null) ? 0 : i.intValue();
         }
 
@@ -363,7 +363,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab
             // and ensure visibility by synchronizing (all other accesses to
             // readers_ are also synchronized on "this")
             synchronized (this) {
-                readers_ = new HashMap();
+                readers_ = new HashMap<Thread, Integer>();
             }
         }
     }
@@ -372,6 +372,8 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab
      * Nonfair version of Sync
      */
     private static class NonfairSync extends Sync {
+        private static final long serialVersionUID = -2392241841540339773L;
+
         NonfairSync() {}
     }