Bug 4034 - deprecate ice_toString in C# and Java

3 files changed, 3 insertions, 7 deletions

diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index e9cfa74be2f..7e97a124432 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -27,9 +27,7 @@ public interface ObjectPrx
     Communicator ice_getCommunicator();
 
     /**
-     * Returns the stringified form of this proxy.
-     *
-     * @return The stringified proxy.
+     * @deprecated This method is deprecated, use toString instead.
      **/
     String ice_toString();
 
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index b7c01ab8553..f92e634eb65 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -55,9 +55,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
     }
 
     /**
-     * Returns the stringified form of this proxy.
-     *
-     * @return The stringified proxy.
+     * @deprecated
      **/
     public final String ice_toString()
     {
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index 8b98d314584..d38c1eb1530 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -1226,7 +1226,7 @@ class TwowaysAMI
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = communicator.getProperties()._clone();
             Ice.Communicator ic = app.initialize(initData);
-            Ice.ObjectPrx obj = ic.stringToProxy(p.ice_toString());
+            Ice.ObjectPrx obj = ic.stringToProxy(p.toString());
             MyClassPrx p2 = MyClassPrxHelper.checkedCast(obj);
 
             ic.destroy();