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

    ice_facet, etc

4 files changed, 60 insertions, 10 deletions

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