Added context parameter to checkedCast().

7 files changed, 45 insertions, 15 deletions

diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index b87dcee662e..22dae62aecf 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -18,6 +18,12 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase
     }
 
     public static ObjectPrx
+    checkedCast(Ice.ObjectPrx b, java.util.Map ctx)
+    {
+	return b;
+    }
+
+    public static ObjectPrx
     checkedCast(Ice.ObjectPrx b, String f)
     {
 	ObjectPrx d = null;
@@ -40,6 +46,28 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase
     }
 
     public static ObjectPrx
+    checkedCast(Ice.ObjectPrx b, String f, java.util.Map ctx)
+    {
+	ObjectPrx d = null;
+	if(b != null)
+	{
+	    Ice.ObjectPrx bb = b.ice_newFacet(f);
+	    try
+	    {
+		boolean ok = bb.ice_isA("::Object", ctx);
+		assert(ok);
+		ObjectPrxHelper h = new ObjectPrxHelper();
+		h.__copyFrom(bb);
+		d = h;
+	    }
+	    catch(Ice.FacetNotExistException ex)
+	    {
+	    }
+	}
+	return d;
+    }
+
+    public static ObjectPrx
     uncheckedCast(Ice.ObjectPrx b)
     {
 	return b;
diff --git a/java/src/IceInternal/DirectReference.java b/java/src/IceInternal/DirectReference.java
index cc6e027cd5a..7c7c4f7aa8c 100644
--- a/java/src/IceInternal/DirectReference.java
+++ b/java/src/IceInternal/DirectReference.java
@@ -31,7 +31,7 @@ public class DirectReference extends RoutableReference
         return _endpoints;
     }
 
-    public Reference
+    public final Reference
     changeEndpoints(Endpoint[] newEndpoints)
     {
 	if(compare(newEndpoints, _endpoints))
diff --git a/java/src/IceInternal/FixedReference.java b/java/src/IceInternal/FixedReference.java
index 95daaf20a8b..2b997df7689 100644
--- a/java/src/IceInternal/FixedReference.java
+++ b/java/src/IceInternal/FixedReference.java
@@ -24,7 +24,7 @@ public class FixedReference extends Reference
         _fixedConnections = fixedConns;
     }
 
-    public Ice.ConnectionI[]
+    public final Ice.ConnectionI[]
     getFixedConnections()
     {
         return _fixedConnections;
diff --git a/java/src/IceInternal/IndirectReference.java b/java/src/IceInternal/IndirectReference.java
index 6e9239428a7..46c125c5175 100644
--- a/java/src/IceInternal/IndirectReference.java
+++ b/java/src/IceInternal/IndirectReference.java
@@ -28,13 +28,13 @@ public class IndirectReference extends RoutableReference
 	_locatorInfo = locInfo;
     }
 
-    public String
+    public final String
     getAdapterId()
     {
         return _adapterId;
     }
 
-    public LocatorInfo
+    public final LocatorInfo
     getLocatorInfo()
     {
         return _locatorInfo;
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 3096e2e3acd..82d19f76c49 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-// Generated by makeprops.py from file `PropertyNames.def', Mon Nov 29 11:38:13 2004
+// Generated by makeprops.py from file `../config/PropertyNames.def', Fri Dec  3 15:44:09 2004
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -171,9 +171,11 @@ public final class PropertyNames
         "IcePatch2.Admin.ThreadPool.SizeMax",
         "IcePatch2.Admin.ThreadPool.SizeWarn",
         "IcePatch2.Admin.ThreadPool.StackSize",
+        "IcePatch2.ChunkSize",
         "IcePatch2.Directory",
         "IcePatch2.Endpoints",
         "IcePatch2.PublishedEndpoints",
+        "IcePatch2.Thorough",
         "IcePatch2.ThreadPool.Size",
         "IcePatch2.ThreadPool.SizeMax",
         "IcePatch2.ThreadPool.SizeWarn",
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 9eddb37d5db..24fc16dc41e 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -29,7 +29,7 @@ public abstract class Reference implements Cloneable
         return _identity;
     }
 
-    public java.util.Map
+    public final java.util.Map
     getContext()
     {
         return _context;
@@ -53,7 +53,7 @@ public abstract class Reference implements Cloneable
         return _instance;
     }
 
-    public Reference
+    public final Reference
     changeMode(int newMode)
     {
         if(newMode == _mode)
@@ -65,7 +65,7 @@ public abstract class Reference implements Cloneable
 	return r;
     }
 
-    public Reference
+    public final Reference
     changeIdentity(Ice.Identity newIdentity)
     {
         if(newIdentity.equals(_identity))
@@ -77,7 +77,7 @@ public abstract class Reference implements Cloneable
 	return r;
     }
 
-    public Reference
+    public final Reference
     changeContext(java.util.Map newContext)
     {
         if(newContext.equals(_context))
@@ -89,7 +89,7 @@ public abstract class Reference implements Cloneable
 	return r;
     }
 
-    public Reference
+    public final Reference
     changeFacet(String newFacet)
     {
         if(newFacet.equals(_facet))
@@ -101,7 +101,7 @@ public abstract class Reference implements Cloneable
 	return r;
     }
 
-    public Reference
+    public final Reference
     changeSecure(boolean newSecure)
     {
         if(newSecure == _secure)
@@ -113,7 +113,7 @@ public abstract class Reference implements Cloneable
 	return r;
     }
 
-    public synchronized int
+    public final synchronized int
     hashCode()
     {
 	if(_hashInitialized)
diff --git a/java/src/IceInternal/RoutableReference.java b/java/src/IceInternal/RoutableReference.java
index bfa1d5836a6..bcd79b01591 100644
--- a/java/src/IceInternal/RoutableReference.java
+++ b/java/src/IceInternal/RoutableReference.java
@@ -11,13 +11,13 @@ package IceInternal;
 
 public abstract class RoutableReference extends Reference
 {
-    public RouterInfo
+    public final RouterInfo
     getRouterInfo()
     {
         return _routerInfo;
     }
 
-    public Endpoint[]
+    public final Endpoint[]
     getRoutedEndpoints()
     {
         if(_routerInfo != null)
@@ -32,7 +32,7 @@ public abstract class RoutableReference extends Reference
 	return new Endpoint[0];
     }
 
-    public boolean
+    public final boolean
     getCollocationOptimization()
     {
         return _collocationOptimization;