using Java5 types in Ice core; general cleanup

4 files changed, 10 insertions, 10 deletions

diff --git a/java/demo/Ice/async/HelloI.java b/java/demo/Ice/async/HelloI.java
index 8eac890b038..8104075a027 100644
--- a/java/demo/Ice/async/HelloI.java
+++ b/java/demo/Ice/async/HelloI.java
@@ -36,7 +36,7 @@ public class HelloI extends _HelloDisp
     {
         System.out.println("Shutting down...");
 
-        _workQueue.destroy();
+        _workQueue._destroy();
         current.adapter.getCommunicator().shutdown();
     }
 
diff --git a/java/demo/Ice/async/Server.java b/java/demo/Ice/async/Server.java
index bb6e446bc6d..32ec6c61c44 100644
--- a/java/demo/Ice/async/Server.java
+++ b/java/demo/Ice/async/Server.java
@@ -16,7 +16,7 @@ public class Server extends Ice.Application
         public void
         run()
         {
-            _workQueue.destroy();
+            _workQueue._destroy();
             communicator().shutdown();
         }
     }
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;
 }
diff --git a/java/demo/Ice/async/build.xml b/java/demo/Ice/async/build.xml
index e56523afb4a..a15d757ebee 100644
--- a/java/demo/Ice/async/build.xml
+++ b/java/demo/Ice/async/build.xml
@@ -32,14 +32,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>