More changes to inconsistent ice_ proxy methods

3 files changed, 55 insertions, 4 deletions

diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index cbf5f99e4e2..0e930d7137f 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -11,9 +11,17 @@ package Ice;
 
 public interface ObjectPrx
 {
+    /**
+     * @deprecated This method has been replaced with ice_getHash.
+     **/
     int ice_hash();
+    int ice_getHash();
 
+    /**
+     * @deprecated This method has been replaced with ice_getCommunicator.
+     **/
     Communicator ice_communicator();
+    Communicator ice_getCommunicator();
 
     String ice_toString();
 
@@ -92,8 +100,12 @@ public interface ObjectPrx
     Ice.LocatorPrx ice_getLocator();
     ObjectPrx ice_locator(Ice.LocatorPrx locator);
 
-    boolean ice_getCollocationOptimization();
+    boolean ice_isCollocationOptimized();
+    /**
+     * @deprecated This method has been replaced with ice_collocationOptimized.
+     **/
     ObjectPrx ice_collocationOptimization(boolean b);
+    ObjectPrx ice_collocationOptimized(boolean b);
 
     ObjectPrx ice_twoway();
     boolean ice_isTwoway();
@@ -110,7 +122,11 @@ public interface ObjectPrx
     ObjectPrx ice_timeout(int t);
     ObjectPrx ice_connectionId(String connectionId);
 
+    /**
+     * @deprecated This method has been replaced with ice_getConnection.
+     **/
     Connection ice_connection();
+    Connection ice_getConnection();
 
     boolean equals(java.lang.Object r);
 }
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index a82c2cede1f..e572c56bf82 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -17,14 +17,31 @@ public class ObjectPrxHelperBase implements ObjectPrx
         return _reference.hashCode();
     }
 
+    /**
+     * @deprecated This method has been replaced with ice_getHash.
+     **/
     public final int
     ice_hash()
     {
+        return ice_getHash();
+    }
+
+    public final int
+    ice_getHash()
+    {
         return _reference.hashCode();
     }
 
+    /**
+     * @deprecated This method has been replaced with ice_getCommunicator.
+     **/
     public final Communicator ice_communicator()
     {
+        return ice_getCommunicator();
+    }
+
+    public final Communicator ice_getCommunicator()
+    {
         return _reference.getCommunicator();
     }
 
@@ -494,14 +511,23 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final boolean
-    ice_getCollocationOptimization()
+    ice_isCollocationOptimized()
     {
 	return _reference.getCollocationOptimization();
     }
 
+    /**
+     * @deprecated This method has been replaced with ice_collocationOptimized.
+     **/
     public final ObjectPrx
     ice_collocationOptimization(boolean b)
     {
+        return ice_collocationOptimized(b);
+    }
+
+    public final ObjectPrx
+    ice_collocationOptimized(boolean b)
+    {
         if(b == _reference.getCollocationOptimization())
         {
             return this;
@@ -667,9 +693,18 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
+    /**
+     * @deprecated This method has been replaced with ice_collocationOptimized.
+     **/
     public final Connection
     ice_connection()
     {
+        return ice_getConnection();
+    }
+
+    public final Connection
+    ice_getConnection()
+    {
         int __cnt = 0;
         while(true)
         {
diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java
index 5c3b36c17b3..36f61c5956d 100644
--- a/java/src/IceInternal/RouterInfo.java
+++ b/java/src/IceInternal/RouterInfo.java
@@ -72,7 +72,7 @@ public final class RouterInfo
 	    //
 	    try
 	    {
-	        _clientProxy = _clientProxy.ice_timeout(_router.ice_connection().timeout());
+	        _clientProxy = _clientProxy.ice_timeout(_router.ice_getConnection().timeout());
 	    }
 	    catch(Ice.CollocationOptimizationException ex)
 	    {
@@ -95,7 +95,7 @@ public final class RouterInfo
 	//
 	try
 	{
-	    _clientProxy = _clientProxy.ice_timeout(_router.ice_connection().timeout());
+	    _clientProxy = _clientProxy.ice_timeout(_router.ice_getConnection().timeout());
 	}
 	catch(Ice.CollocationOptimizationException ex)
 	{