summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/LocatorManager.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-08-07 14:05:44 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-08-07 14:05:44 -0230
commite3a672a438635a1173388aea9d7a2d44de358945 (patch)
tree57113ece1dd013c9687468a8dd7cc62c80136b86 /java/src/IceInternal/LocatorManager.java
parentICE-5457 added ability to set source address for connections (diff)
downloadice-e3a672a438635a1173388aea9d7a2d44de358945.tar.bz2
ice-e3a672a438635a1173388aea9d7a2d44de358945.tar.xz
ice-e3a672a438635a1173388aea9d7a2d44de358945.zip
Add @Override where possible, and remove trailing white space.
Diffstat (limited to 'java/src/IceInternal/LocatorManager.java')
-rw-r--r--java/src/IceInternal/LocatorManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/IceInternal/LocatorManager.java b/java/src/IceInternal/LocatorManager.java
index 166c63a1406..0e651b5935c 100644
--- a/java/src/IceInternal/LocatorManager.java
+++ b/java/src/IceInternal/LocatorManager.java
@@ -13,7 +13,8 @@ public final class LocatorManager
{
static private class LocatorKey implements Cloneable
{
- public boolean
+ @Override
+ public boolean
equals(Object o)
{
assert(o instanceof LocatorKey);
@@ -29,6 +30,7 @@ public final class LocatorManager
return true;
}
+ @Override
public int
hashCode()
{
@@ -38,6 +40,7 @@ public final class LocatorManager
return h;
}
+ @Override
public java.lang.Object
clone()
{
@@ -52,7 +55,7 @@ public final class LocatorManager
}
return o;
}
-
+
LocatorKey set(Ice.LocatorPrx locator)
{
Reference r = ((Ice.ObjectPrxHelperBase)locator).__reference();