using Java5 types in Ice core; general cleanup

1 files changed, 4 insertions, 4 deletions

diff --git a/java/demo/Ice/async/WorkQueue.java b/java/demo/Ice/async/WorkQueue.java
index d7336fbb778..e523330f025 100644
--- a/java/demo/Ice/async/WorkQueue.java
+++ b/java/demo/Ice/async/WorkQueue.java
@@ -68,10 +68,10 @@ public class WorkQueue extends Thread
         //
         // Throw exception for any outstanding requests.
         //
-        java.util.Iterator p = _callbacks.iterator();
+        java.util.Iterator<CallbackEntry> p = _callbacks.iterator();
         while(p.hasNext())
         {
-            CallbackEntry entry = (CallbackEntry)p.next();
+            CallbackEntry entry = p.next();
             entry.cb.ice_exception(new RequestCanceledException());
         }
     }
@@ -104,12 +104,12 @@ public class WorkQueue extends Thread
     }
 
     public synchronized void
-    destroy()
+    _destroy()                  // Thread.destroy is deprecated.
     {
         _done = true;
         notify();
     }
 
-    private java.util.LinkedList _callbacks = new java.util.LinkedList();
+    private java.util.LinkedList<CallbackEntry> _callbacks = new java.util.LinkedList<CallbackEntry>();
     private boolean _done = false;
 }