using Java5 types in Ice core; general cleanup

1 files changed, 22 insertions, 22 deletions

diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index 0bb27127ad7..c0cc50c8388 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -356,7 +356,7 @@ final class TcpEndpointI extends EndpointI
     // Return connectors for this endpoint, or empty list if no connector
     // is available.
     //
-    public java.util.List
+    public java.util.List<Connector>
     connectors()
     {
         return connectors(Network.getAddresses(_host, _port, _instance.protocolSupport()));
@@ -388,21 +388,21 @@ final class TcpEndpointI extends EndpointI
     // Expand endpoint out in to separate endpoints for each local
     // host if listening on INADDR_ANY.
     //
-    public java.util.List
+    public java.util.List<EndpointI>
     expand()
     {
-        java.util.ArrayList endps = new java.util.ArrayList();
-        java.util.ArrayList hosts = Network.getHostsForEndpointExpand(_host, _instance.protocolSupport());
+        java.util.List<EndpointI> endps = new java.util.ArrayList<EndpointI>();
+        java.util.List<String> hosts = Network.getHostsForEndpointExpand(_host, _instance.protocolSupport());
         if(hosts == null || hosts.isEmpty())
         {
             endps.add(this);
         }
         else
         {
-            java.util.Iterator p = hosts.iterator();
+            java.util.Iterator<String> p = hosts.iterator();
             while(p.hasNext())
             {
-                endps.add(new TcpEndpointI(_instance, (String)p.next(), _port, _timeout, _connectionId, _compress));
+                endps.add(new TcpEndpointI(_instance, p.next(), _port, _timeout, _connectionId, _compress));
             }
         }
         return endps;
@@ -438,11 +438,19 @@ final class TcpEndpointI extends EndpointI
     public boolean
     equals(java.lang.Object obj)
     {
-        return compareTo(obj) == 0;
+        try
+        {
+            return compareTo((EndpointI)obj) == 0;
+        }
+        catch(ClassCastException ee)
+        {
+            assert(false);
+            return false;
+        }
     }
 
     public int
-    compareTo(java.lang.Object obj) // From java.lang.Comparable
+    compareTo(EndpointI obj) // From java.lang.Comparable
     {
         TcpEndpointI p = null;
 
@@ -452,15 +460,7 @@ final class TcpEndpointI extends EndpointI
         }
         catch(ClassCastException ex)
         {
-            try
-            {
-                EndpointI e = (EndpointI)obj;
-                return type() < e.type() ? -1 : 1;
-            }
-            catch(ClassCastException ee)
-            {
-                assert(false);
-            }
+            return type() < obj.type() ? -1 : 1;
         }
 
         if(this == p)
@@ -503,14 +503,14 @@ final class TcpEndpointI extends EndpointI
         return _host.compareTo(p._host);
     }
 
-    public java.util.List
-    connectors(java.util.List addresses)
+    public java.util.List<Connector>
+    connectors(java.util.List<java.net.InetSocketAddress> addresses)
     {
-        java.util.ArrayList connectors = new java.util.ArrayList();
-        java.util.Iterator p = addresses.iterator();
+        java.util.List<Connector> connectors = new java.util.ArrayList<Connector>();
+        java.util.Iterator<java.net.InetSocketAddress> p = addresses.iterator();
         while(p.hasNext())
         {
-            connectors.add(new TcpConnector(_instance, (java.net.InetSocketAddress)p.next(), _timeout, _connectionId));
+            connectors.add(new TcpConnector(_instance, p.next(), _timeout, _connectionId));
         }
         return connectors;
     }