Fixed half of bug 847: ice_newIdentiy -> ice_identity, ice_newFacet ->

    ice_facet, etc

11 files changed, 80 insertions, 30 deletions

diff --git a/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java
index 13e841c11d3..95c261874d9 100644
--- a/java/demo/Glacier2/callback/Client.java
+++ b/java/demo/Glacier2/callback/Client.java
@@ -182,16 +182,16 @@ public class Client extends Ice.Application
 		    if(fake)
 		    {
 			twowayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    twowayR.ice_newIdentity(callbackReceiverFakeIdent));
+			    twowayR.ice_identity(callbackReceiverFakeIdent));
 			onewayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    onewayR.ice_newIdentity(callbackReceiverFakeIdent));
+			    onewayR.ice_identity(callbackReceiverFakeIdent));
 		    }
 		    else
 		    {
 			twowayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    twowayR.ice_newIdentity(callbackReceiverIdent));
+			    twowayR.ice_identity(callbackReceiverIdent));
 			onewayR = CallbackReceiverPrxHelper.uncheckedCast(
-			    onewayR.ice_newIdentity(callbackReceiverIdent));
+			    onewayR.ice_identity(callbackReceiverIdent));
 		    }
 		    
 		    System.out.println("callback receiver identity: " + 
diff --git a/java/demo/Glacier2/callback/build.xml b/java/demo/Glacier2/callback/build.xml
index cfd03a7829c..b036107e10d 100644
--- a/java/demo/Glacier2/callback/build.xml
+++ b/java/demo/Glacier2/callback/build.xml
@@ -40,11 +40,11 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-            source="1.4" debug="${debug}">
+            source="1.4" debug="${debug}" deprecation="on">
             <classpath refid="ice.classpath"/>
         </javac>
         <javac srcdir="." destdir="${class.dir}" source="1.4"
-            excludes="generated/**" debug="${debug}">
+            excludes="generated/**" debug="${debug}" deprecation="on">
             <classpath refid="ice.classpath"/>
         </javac>
     </target>
diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index f348b529031..5dd34d1b68a 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -574,7 +574,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    Ice.ObjectPrx obj = _adapter.createProxy(ident);
 	    if(facet.length() > 0)
 	    {
-		obj = obj.ice_newFacet(facet);
+		obj = obj.ice_facet(facet);
 	    }
 	    return obj;
 	}
diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 5a0ebb73edf..4bff057a10c 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -39,20 +39,40 @@ public interface ObjectPrx
                           java.util.Map context);
 
     Identity ice_getIdentity();
+    /**
+     * @deprecated This method has been replaced with ice_identity.
+     **/
     ObjectPrx ice_newIdentity(Identity newIdentity);
+    ObjectPrx ice_identity(Identity newIdentity);
 
     java.util.Map ice_getContext();
+    /**
+     * @deprecated This method has been replaced with ice_context.
+     **/
     ObjectPrx ice_newContext(java.util.Map newContext);
+    ObjectPrx ice_context(java.util.Map newContext);
     ObjectPrx ice_defaultContext();
 
-    String ice_getFacet();
+    String ice_getFacet(); 
+    /**
+     * @deprecated This method has been replaced with ice_facet.
+     **/
     ObjectPrx ice_newFacet(String newFacet);
+    ObjectPrx ice_facet(String newFacet);
 
     String ice_getAdapterId();
+    /**
+     * @deprecated This method has been replaced with ice_adapterId.
+     **/
     ObjectPrx ice_newAdapterId(String newAdapterId);
+    ObjectPrx ice_adapterId(String newAdapterId);
 
     Endpoint[] ice_getEndpoints();
+    /**
+     * @deprecated This method has been replaced with ice_endpoints.
+     **/
     ObjectPrx ice_newEndpoints(Endpoint[] newEndpoints);
+    ObjectPrx ice_endpoints(Endpoint[] newEndpoints);
 
     int ice_getLocatorCacheTimeout();
     ObjectPrx ice_locatorCacheTimeout(int newTimeout);
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index 9415979c90e..709e344cb90 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -29,7 +29,7 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase
 	ObjectPrx d = null;
 	if(b != null)
 	{
-	    Ice.ObjectPrx bb = b.ice_newFacet(f);
+	    Ice.ObjectPrx bb = b.ice_facet(f);
 	    try
 	    {
 		boolean ok = bb.ice_isA("::Object");
@@ -51,7 +51,7 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase
 	ObjectPrx d = null;
 	if(b != null)
 	{
-	    Ice.ObjectPrx bb = b.ice_newFacet(f);
+	    Ice.ObjectPrx bb = b.ice_facet(f);
 	    try
 	    {
 		boolean ok = bb.ice_isA("::Object", ctx);
@@ -79,7 +79,7 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase
 	ObjectPrx d = null;
 	if(b != null)
 	{
-	    Ice.ObjectPrx bb = b.ice_newFacet(f);
+	    Ice.ObjectPrx bb = b.ice_facet(f);
 	    ObjectPrxHelper h = new ObjectPrxHelper();
 	    h.__copyFrom(bb);
 	    d = h;
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index aafa0088ce4..16c9e769db9 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -212,7 +212,7 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
-    ice_newIdentity(Identity newIdentity)
+    ice_identity(Identity newIdentity)
     {
         if(newIdentity.equals(_reference.getIdentity()))
         {
@@ -226,6 +226,12 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
+    public final ObjectPrx
+    ice_newIdentity(Identity newIdentity)
+    {
+	return ice_identity(newIdentity);
+    }
+
     public final java.util.Map
     ice_getContext()
     {
@@ -233,7 +239,7 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
-    ice_newContext(java.util.Map newContext)
+    ice_context(java.util.Map newContext)
     {
 	ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
 	proxy.setup(_reference.changeContext(newContext));
@@ -241,6 +247,12 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
+    ice_newContext(java.util.Map newContext)
+    {
+	return ice_context(newContext);
+    }
+
+    public final ObjectPrx
     ice_defaultContext()
     {
 	ObjectPrxHelperBase proxy = new ObjectPrxHelperBase();
@@ -255,7 +267,7 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
-    ice_newFacet(String newFacet)
+    ice_facet(String newFacet)
     {
         if(newFacet == null)
         {
@@ -274,6 +286,12 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
+    public final ObjectPrx
+    ice_newFacet(String newFacet)
+    {
+	return ice_facet(newFacet);
+    }
+
     public final String
     ice_getAdapterId()
     {
@@ -281,7 +299,7 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
-    ice_newAdapterId(String newAdapterId)
+    ice_adapterId(String newAdapterId)
     {
         if(newAdapterId.equals(_reference.getAdapterId()))
         {
@@ -295,6 +313,12 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
+    public final ObjectPrx
+    ice_newAdapterId(String newAdapterId)
+    {
+	return ice_adapterId(newAdapterId);
+    }
+
     public final Endpoint[]
     ice_getEndpoints()
     {
@@ -302,7 +326,7 @@ public class ObjectPrxHelperBase implements ObjectPrx
     }
 
     public final ObjectPrx
-    ice_newEndpoints(Endpoint[] newEndpoints)
+    ice_endpoints(Endpoint[] newEndpoints)
     {
         if(java.util.Arrays.equals(newEndpoints, _reference.getEndpoints()))
         {
@@ -318,6 +342,12 @@ public class ObjectPrxHelperBase implements ObjectPrx
         }
     }
 
+    public final ObjectPrx
+    ice_newEndpoints(Endpoint[] newEndpoints)
+    {
+	return ice_endpoints(newEndpoints);
+    }
+
     public final int
     ice_getLocatorCacheTimeout()
     {
diff --git a/java/test/Glacier2/router/CallbackClient.java b/java/test/Glacier2/router/CallbackClient.java
index 29436dff17b..9794ce73a0f 100644
--- a/java/test/Glacier2/router/CallbackClient.java
+++ b/java/test/Glacier2/router/CallbackClient.java
@@ -283,7 +283,7 @@ class CallbackClient extends Ice.Application
             java.util.Map context = new java.util.HashMap();
             context.put("_fwd", "t");
 	    CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-		twoway.ice_newIdentity(Ice.Util.stringToIdentity("c2/callback")));
+		twoway.ice_identity(Ice.Util.stringToIdentity("c2/callback")));
 	    otherCategoryTwoway.initiateCallback(twowayR, context);
 	    test(callbackReceiverImpl.callbackOK());
 	    System.out.println("ok");
@@ -297,7 +297,7 @@ class CallbackClient extends Ice.Application
 	    try
 	    {
 		CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-		    twoway.ice_newIdentity(Ice.Util.stringToIdentity("c3/callback")));
+		    twoway.ice_identity(Ice.Util.stringToIdentity("c3/callback")));
 		otherCategoryTwoway.initiateCallback(twowayR, context);
 		test(false);
 	    }
@@ -313,7 +313,7 @@ class CallbackClient extends Ice.Application
             java.util.Map context = new java.util.HashMap();
             context.put("_fwd", "t");
 	    CallbackPrx otherCategoryTwoway = CallbackPrxHelper.uncheckedCast(
-		twoway.ice_newIdentity(Ice.Util.stringToIdentity("_userid/callback")));
+		twoway.ice_identity(Ice.Util.stringToIdentity("_userid/callback")));
 	    otherCategoryTwoway.initiateCallback(twowayR, context);
 	    test(callbackReceiverImpl.callbackOK());
 	    System.out.println("ok");
diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java
index f56d7dc7987..561153d5ebe 100644
--- a/java/test/Ice/binding/AllTests.java
+++ b/java/test/Ice/binding/AllTests.java
@@ -81,7 +81,7 @@ public class AllTests
 	    endpoints.addAll(java.util.Arrays.asList(edpts));
 	}
 	return TestIntfPrxHelper.uncheckedCast(
-	    test.ice_newEndpoints((Ice.Endpoint[])endpoints.toArray(new Ice.Endpoint[endpoints.size()])));
+	    test.ice_endpoints((Ice.Endpoint[])endpoints.toArray(new Ice.Endpoint[endpoints.size()])));
     }
 
     private static void
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index f417accf701..4f483d6928f 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -1084,7 +1084,7 @@ public class AllTests
 	    Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
 	    try
 	    {
-		ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_newIdentity(id));
+		ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
 		thrower2.ice_ping();
 		test(false);
 	    }
@@ -1314,7 +1314,7 @@ public class AllTests
 
 	    {
 		Ice.Identity id = Ice.Util.stringToIdentity("does not exist");
-		ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_newIdentity(id));
+		ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
 		AMI_Thrower_throwAasAObjectNotExistI cb = new AMI_Thrower_throwAasAObjectNotExistI();
 		thrower2.throwAasA_async(cb, 1);
 		test(cb.check());
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index f7e7b25b307..f46aedab62e 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -613,7 +613,7 @@ class Twoways
 		test(r.equals(ctx));
 	    }
 	    {
-		Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_newContext(ctx));
+		Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
 		test(p2.ice_getContext().equals(ctx));
 		java.util.Map r = p2.opContext();
 		test(r.equals(ctx));
@@ -629,7 +629,7 @@ class Twoways
 		communicator.setDefaultContext(dflt);
 		test(!p.opContext().equals(dflt));
 
-		Test.MyClassPrx p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_newContext(new java.util.HashMap()));
+		Test.MyClassPrx p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
 		test(p2.opContext().isEmpty());
 
 		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
@@ -644,11 +644,11 @@ class Twoways
 		test(c.opContext().equals(dflt));
 
 		dflt.put("a", "c");
-		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_newContext(dflt));
+		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
 		test(c2.opContext().get("a").equals("c"));
 
 		dflt.clear();
-		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_newContext(dflt));
+		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
 		test(c3.opContext().get("a") == null);
 
 		Test.MyClassPrx c4 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_defaultContext());
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index e0496eea30b..71db5081182 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -1423,7 +1423,7 @@ class TwowaysAMI
 		p.opContext_async(cb, ctx);
 		test(cb.check());
 	    }
-	    Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_newContext(ctx));
+	    Test.MyClassPrx p2 = Test.MyClassPrxHelper.checkedCast(p.ice_context(ctx));
 	    test(p2.ice_getContext().equals(ctx));
 	    {
 		AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(ctx);
@@ -1449,7 +1449,7 @@ class TwowaysAMI
 		    test(cb.check());
 		}
 
-		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_newContext(new java.util.HashMap()));
+		p2 = Test.MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
 		{
 		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(new java.util.HashMap());
 		    p2.opContext_async(cb);
@@ -1482,7 +1482,7 @@ class TwowaysAMI
 		}
 
 		dflt.put("a", "c");
-		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_newContext(dflt));
+		Test.MyClassPrx c2 = Test.MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
 		{
 		    java.util.HashMap tmp = new java.util.HashMap();
 		    tmp.put("a", "c");
@@ -1492,7 +1492,7 @@ class TwowaysAMI
 		}
 
 		dflt.clear();
-		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_newContext(dflt));
+		Test.MyClassPrx c3 = Test.MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
 		{
 		    java.util.HashMap tmp = new java.util.HashMap();
 		    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);