Bug 4034 - deprecate ice_toString in C# and Java

6 files changed, 10 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index f6d80274a1a..2a8e5006105 100644
--- a/CHANGES
+++ b/CHANGES
@@ -331,6 +331,7 @@ Java Changes
 
   Object::ice_hash()
   ObjectPrx::ice_getHash()
+  ObjectPrx::ice_toString()
 
 - The StackSize thread pool configuration property is now used.
 
@@ -405,6 +406,7 @@ C# Changes
 
   Object::ice_hash()
   ObjectPrx::ice_getHash()
+  ObjectPrx::ice_toString()
 
 - The StackSize thread pool configuration property is now used.
 
diff --git a/cs/src/Ice/Proxy.cs b/cs/src/Ice/Proxy.cs
index fbb1b19f312..c4d96fe318a 100644
--- a/cs/src/Ice/Proxy.cs
+++ b/cs/src/Ice/Proxy.cs
@@ -33,9 +33,9 @@ namespace Ice
         Communicator ice_getCommunicator();
 
         /// <summary>
-        /// Returns the stringified form of this proxy.
+        /// This method is deprecated. Use ToString instead.
         /// </summary>
-        /// <returns>The stringified proxy.</returns>
+        [Obsolete("This method is deprecated. Use ToString instead.")]
         string ice_toString();
 
         /// <summary>
@@ -492,9 +492,9 @@ namespace Ice
         }
 
         /// <summary>
-        /// Returns the stringified form of this proxy.
+        /// This method is deprecated. Use ToString instead.
         /// </summary>
-        /// <returns>The stringified proxy.</returns>
+        [Obsolete("This method is deprecated. Use ToString instead.")]
         public string ice_toString()
         {
             return ToString();
diff --git a/cs/test/Ice/operations/TwowaysAMI.cs b/cs/test/Ice/operations/TwowaysAMI.cs
index 7b6d04377a1..532d48d87d4 100644
--- a/cs/test/Ice/operations/TwowaysAMI.cs
+++ b/cs/test/Ice/operations/TwowaysAMI.cs
@@ -1064,7 +1064,7 @@ public class TwowaysAMI
             initData.properties = communicator.getProperties().ice_clone_();
             Ice.Communicator ic = Ice.Util.initialize(initData);
 
-            Ice.ObjectPrx obj = ic.stringToProxy(p.ice_toString());
+            Ice.ObjectPrx obj = ic.stringToProxy(p.ToString());
             Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(obj);
 
             ic.destroy();
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();