More changes to inconsistent ice_ proxy methods

1 files changed, 36 insertions, 1 deletions

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)
         {