summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/EndpointI.java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2008-01-30 06:15:20 -0800
committerMark Spruiell <mes@zeroc.com>2008-01-30 06:15:20 -0800
commitf3c3029ff651d294a1a0df0e79e72771307310fc (patch)
tree1f061a96f5f46051b6daf45ccbdb63ebd2cdd746 /java/src/IceInternal/EndpointI.java
parentFixed and moved fixVersion.py/fixCopyright.py (diff)
downloadice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.bz2
ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.xz
ice-f3c3029ff651d294a1a0df0e79e72771307310fc.zip
using Java5 types in Ice core; general cleanup
Diffstat (limited to 'java/src/IceInternal/EndpointI.java')
-rw-r--r--java/src/IceInternal/EndpointI.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/IceInternal/EndpointI.java b/java/src/IceInternal/EndpointI.java
index b58c616087f..fa5a44b9246 100644
--- a/java/src/IceInternal/EndpointI.java
+++ b/java/src/IceInternal/EndpointI.java
@@ -9,7 +9,7 @@
package IceInternal;
-abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable
+abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable<EndpointI>
{
public String
toString()
@@ -86,7 +86,7 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable
// Return connectors for this endpoint, or empty list if no connector
// is available.
//
- public abstract java.util.List connectors();
+ public abstract java.util.List<Connector> connectors();
public abstract void connectors_async(EndpointI_connectors callback);
//
@@ -102,7 +102,7 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable
// Expand endpoint out in to separate endpoints for each local
// host if listening on INADDR_ANY.
//
- public abstract java.util.List expand();
+ public abstract java.util.List<EndpointI> expand();
//
// Check whether the endpoint is equivalent to another one.
@@ -113,10 +113,10 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable
// Compare endpoints for sorting purposes.
//
public abstract boolean equals(java.lang.Object obj);
- public abstract int compareTo(java.lang.Object obj); // From java.lang.Comparable.
+ public abstract int compareTo(EndpointI obj); // From java.lang.Comparable.
- public java.util.List
- connectors(java.util.List addresses)
+ public java.util.List<Connector>
+ connectors(java.util.List<java.net.InetSocketAddress> addresses)
{
//
// This method must be extended by endpoints which use the EndpointHostResolver to create