Removed ice_default()

5 files changed, 1 insertions, 67 deletions

diff --git a/java/src/IceInternal/DirectReference.java b/java/src/IceInternal/DirectReference.java
index bc0cf7bcfc8..f1b756ee3ca 100644
--- a/java/src/IceInternal/DirectReference.java
+++ b/java/src/IceInternal/DirectReference.java
@@ -40,26 +40,6 @@ public class DirectReference extends RoutableReference
     }
 
     public Reference
-    changeDefault()
-    {
-	//
-	// Return an indirect reference if a default locator is set.
-	//
-	Ice.LocatorPrx loc = getInstance().referenceFactory().getDefaultLocator();
-	if(loc != null)
-	{
-	    LocatorInfo newLocatorInfo = getInstance().locatorManager().get(loc);
-	    return getInstance().referenceFactory().create(getIdentity(), null, "", ModeTwoway, false, "", null,
-							   newLocatorInfo, getInstance().defaultsAndOverrides().
-							   defaultCollocationOptimization);
-	}
-	else
-	{
-	    return super.changeDefault();
-	}
-    }
-
-    public Reference
     changeLocator(Ice.LocatorPrx newLocator)
     {
 	if(newLocator != null)
diff --git a/java/src/IceInternal/FixedReference.java b/java/src/IceInternal/FixedReference.java
index 744daec93b8..c01b074b208 100644
--- a/java/src/IceInternal/FixedReference.java
+++ b/java/src/IceInternal/FixedReference.java
@@ -95,8 +95,7 @@ public class FixedReference extends Reference
     {
 	// TODO: FixedReferences should probably have a _compress flag,
 	// that gets its default from the fixed connection this reference
-	// refers to. This should be changable with changeCompress(), and
-	// reset in changeDefault().
+	// refers to. This should be changable with changeCompress().
         return this;
     }
 
diff --git a/java/src/IceInternal/IndirectReference.java b/java/src/IceInternal/IndirectReference.java
index 63d39c5a634..03f4703052d 100644
--- a/java/src/IceInternal/IndirectReference.java
+++ b/java/src/IceInternal/IndirectReference.java
@@ -48,28 +48,6 @@ public class IndirectReference extends RoutableReference
     }
 
     public Reference
-    changeDefault()
-    {
-	//
-	// Return a direct reference if no default locator is defined.
-	//
-	Ice.LocatorPrx loc = getInstance().referenceFactory().getDefaultLocator();
-	if(loc == null)
-	{
-	    return getInstance().referenceFactory().create(getIdentity(), null, "", ModeTwoway, false,
-							   new EndpointI[0], getRouterInfo(),
-							   getInstance().defaultsAndOverrides().
-							   defaultCollocationOptimization);
-	}
-	else
-	{
-	    IndirectReference r = (IndirectReference)super.changeDefault();
-	    r._locatorInfo = getInstance().locatorManager().get(loc);
-	    return r;
-	}
-    }
-
-    public Reference
     changeLocator(Ice.LocatorPrx newLocator)
     {
 	//
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 0793a9086c0..0bac2970d68 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -127,19 +127,6 @@ public abstract class Reference implements Cloneable
 	return r;
     }
 
-    //
-    // Return a reference in the default configuration.
-    //
-    public Reference
-    changeDefault()
-    {
-	Reference r = _instance.referenceFactory().copy(this);
-	r._mode = ModeTwoway;
-	r._context = _instance.getDefaultContext();
-	r._facet = "";
-	return r;
-    }
-
     public abstract Reference changeSecure(boolean newSecure);
     public abstract Reference changeRouter(Ice.RouterPrx newRouter);
     public abstract Reference changeLocator(Ice.LocatorPrx newLocator);
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java
index 55cde9c4d2e..a10350ba84b 100644
--- a/java/src/IceInternal/RoutableReference.java
+++ b/java/src/IceInternal/RoutableReference.java
@@ -45,16 +45,6 @@ public abstract class RoutableReference extends Reference
     }
 
     public Reference
-    changeDefault()
-    {
-	RoutableReference r = (RoutableReference)super.changeDefault();
-	r._secure = false;
-	r._routerInfo = getInstance().routerManager().get(getInstance().referenceFactory().getDefaultRouter());
-	r._collocationOptimization = getInstance().defaultsAndOverrides().defaultCollocationOptimization;
-	return r;
-    }
-
-    public Reference
     changeSecure(boolean newSecure)
     {
 	if(newSecure == _secure)