Fix warnings in gnu.java.net classes.

2013-05-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/java/net/loader/JarURLLoader.java:
	(indexSet): Add type parameter.
	(JarURLLoader(URLClassLoader,URLStreamHandlerCache,
	URLStreamHandlerFactory,URL,URL,Set)): Add type
	parameter to Set.
	* gnu/java/net/loader/URLLoader.java:
	(getClass(String)): Add type parameter to return type.
	* gnu/java/net/protocol/http/HTTPConnection.java:
	(run()): Remove redundant cast.
	(get(String,int,boolean,int,int)): Add type parameter
	to ListIterator and drop cast.
	(removeOldest()): Remove redundant cast.
	(getSocket()): Add type parameter to Iterator and
	drop cast.

Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>

4 files changed, 26 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3164a5d7a..316cb6130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2013-05-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	* gnu/java/net/loader/JarURLLoader.java:
+	(indexSet): Add type parameter.
+	(JarURLLoader(URLClassLoader,URLStreamHandlerCache,
+	URLStreamHandlerFactory,URL,URL,Set)): Add type
+	parameter to Set.
+	* gnu/java/net/loader/URLLoader.java:
+	(getClass(String)): Add type parameter to return type.
+	* gnu/java/net/protocol/http/HTTPConnection.java:
+	(run()): Remove redundant cast.
+	(get(String,int,boolean,int,int)): Add type parameter
+	to ListIterator and drop cast.
+	(removeOldest()): Remove redundant cast.
+	(getSocket()): Add type parameter to Iterator and
+	drop cast.
+
+2013-05-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	* THANKYOU: List Carl Ritson.
 
 2013-04-25  Carl Ritson  <C.G.Ritson@kent.ac.uk>
diff --git a/gnu/java/net/loader/JarURLLoader.java b/gnu/java/net/loader/JarURLLoader.java
index 6f06ad3b2..69237908e 100644
--- a/gnu/java/net/loader/JarURLLoader.java
+++ b/gnu/java/net/loader/JarURLLoader.java
@@ -36,7 +36,7 @@ public final class JarURLLoader extends URLLoader
   // If not null, a mapping from INDEX.LIST for this jar only.
   // This is a set of all prefixes and top-level files that
   // ought to be available in this jar.
-  Set indexSet;
+  Set<String> indexSet;
 
   // This constructor is used internally.  It purposely does not open
   // the jar file -- it defers this until later.  This allows us to
@@ -44,7 +44,7 @@ public final class JarURLLoader extends URLLoader
   private JarURLLoader(URLClassLoader classloader, URLStreamHandlerCache cache,
                        URLStreamHandlerFactory factory,
                        URL baseURL, URL absoluteUrl,
-                       Set indexSet)
+                       Set<String> indexSet)
   {
     super(classloader, cache, factory, baseURL, absoluteUrl);
 
diff --git a/gnu/java/net/loader/URLLoader.java b/gnu/java/net/loader/URLLoader.java
index 337564f6a..1643115a4 100644
--- a/gnu/java/net/loader/URLLoader.java
+++ b/gnu/java/net/loader/URLLoader.java
@@ -115,7 +115,7 @@ public abstract class URLLoader
    * useful in situations where the subclass has a more direct way of
    * making <code>Class</code> objects.
    */
-  public Class getClass(String className)
+  public Class<?> getClass(String className)
   {
     return null;
   }
diff --git a/gnu/java/net/protocol/http/HTTPConnection.java b/gnu/java/net/protocol/http/HTTPConnection.java
index b96bf4c54..28c921a06 100644
--- a/gnu/java/net/protocol/http/HTTPConnection.java
+++ b/gnu/java/net/protocol/http/HTTPConnection.java
@@ -392,8 +392,7 @@ public class HTTPConnection
                       {
                         long currentTime = System.currentTimeMillis();
 
-                        HTTPConnection c =
-                          (HTTPConnection)connectionPool.getFirst();
+                        HTTPConnection c = connectionPool.getFirst();
 
                         long waitTime = c.timeLastUsed
                           + connectionTTL - currentTime;
@@ -511,10 +510,10 @@ public class HTTPConnection
 
       HTTPConnection c = null;
 
-      ListIterator it = connectionPool.listIterator(0);
+      ListIterator<HTTPConnection> it = connectionPool.listIterator(0);
       while (it.hasNext())
         {
-          HTTPConnection cc = (HTTPConnection)it.next();
+          HTTPConnection cc = it.next();
           if (matches(cc, host, port, secure))
             {
               c = cc;
@@ -573,7 +572,7 @@ public class HTTPConnection
      */
     void removeOldest()
     {
-      HTTPConnection cx = (HTTPConnection)connectionPool.removeFirst();
+      HTTPConnection cx = connectionPool.removeFirst();
       try
         {
           cx.closeConnection();
@@ -739,12 +738,11 @@ public class HTTPConnection
                   {
                     if (!handshakeCompletedListeners.isEmpty())
                       {
-                        for (Iterator i =
+                        for (Iterator<HandshakeCompletedListener> i =
                              handshakeCompletedListeners.iterator();
                              i.hasNext(); )
                           {
-                            HandshakeCompletedListener l =
-                              (HandshakeCompletedListener) i.next();
+                            HandshakeCompletedListener l = i.next();
                             ss.addHandshakeCompletedListener(l);
                           }
                       }