translator update

4 files changed, 509 insertions, 434 deletions

diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java
index 4fa73fe6c43..88f7773916e 100644
--- a/java/src/Ice/ObjectPrx.java
+++ b/java/src/Ice/ObjectPrx.java
@@ -10,450 +10,42 @@
 
 package Ice;
 
-public class ObjectPrx
+public interface ObjectPrx
 {
-    public final int
-    ice_hash()
-    {
-        return _reference.hashValue;
-    }
+    public int ice_hash();
 
-    public final boolean
-    ice_isA(String __id)
-    {
-        return ice_isA(__id, null);
-    }
+    public boolean ice_isA(String __id);
+    public boolean ice_isA(String __id, java.util.HashMap __context);
 
-    public final boolean
-    ice_isA(String __id, java.util.HashMap __context)
-    {
-        int __cnt = 0;
-        while (true)
-        {
-            try
-            {
-                _ObjectDel __del = __getDelegate();
-                return __del.ice_isA(__id, __context);
-            }
-            catch (LocationForward __ex)
-            {
-                __locationForward(__ex);
-            }
-            catch (IceInternal.NonRepeatable __ex)
-            {
-                __cnt = __handleException(__ex.get(), __cnt);
-            }
-            catch (LocalException __ex)
-            {
-                __cnt = __handleException(__ex, __cnt);
-            }
-        }
-    }
+    public void ice_ping();
+    public void ice_ping(java.util.HashMap __context);
 
-    public final void
-    ice_ping()
-    {
-        ice_ping(null);
-    }
+    public byte[] ice_invoke(String operation, boolean nonmutating,
+                             byte[] inParams);
+    public byte[] ice_invoke(String operation, boolean nonmutating,
+                             byte[] inParams, java.util.HashMap __context);
 
-    public final void
-    ice_ping(java.util.HashMap __context)
-    {
-        int __cnt = 0;
-        while (true)
-        {
-            try
-            {
-                _ObjectDel __del = __getDelegate();
-                __del.ice_ping(__context);
-                return;
-            }
-            catch (LocationForward __ex)
-            {
-                __locationForward(__ex);
-            }
-            catch (IceInternal.NonRepeatable __ex)
-            {
-                __cnt = __handleException(__ex.get(), __cnt);
-            }
-            catch (LocalException __ex)
-            {
-                __cnt = __handleException(__ex, __cnt);
-            }
-        }
-    }
+    public String ice_getIdentity();
 
-    public final byte[]
-    ice_invoke(String operation, boolean nonmutating, byte[] inParams)
-    {
-        return ice_invoke(operation, nonmutating, inParams, null);
-    }
+    public ObjectPrx ice_newIdentity(String newIdentity);
 
-    public final byte[]
-    ice_invoke(String operation, boolean nonmutating, byte[] inParams,
-               java.util.HashMap __context)
-    {
-        int __cnt = 0;
-        while (true)
-        {
-            try
-            {
-                _ObjectDel __del = __getDelegate();
-                return __del.ice_invoke(operation, nonmutating, inParams,
-                                        __context);
-            }
-            catch (LocationForward __ex)
-            {
-                __locationForward(__ex);
-            }
-            catch (IceInternal.NonRepeatable __ex)
-            {
-                if (nonmutating)
-                {
-                    __cnt = __handleException(__ex.get(), __cnt);
-                }
-                else
-                {
-                    __rethrowException(__ex.get());
-                }
-            }
-            catch (LocalException __ex)
-            {
-                __cnt = __handleException(__ex, __cnt);
-            }
-        }
-    }
+    public String ice_getFacet();
 
-    public final String
-    ice_getIdentity()
-    {
-        return _reference.identity;
-    }
+    public ObjectPrx ice_newFacet(String newFacet);
 
-    public final ObjectPrx
-    ice_newIdentity(String newIdentity)
-    {
-        if (newIdentity.equals(_reference.identity))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(_reference.changeIdentity(newIdentity));
-            return proxy;
-        }
-    }
+    public ObjectPrx ice_twoway();
 
-    public final String
-    ice_getFacet()
-    {
-        return _reference.facet;
-    }
+    public ObjectPrx ice_oneway();
 
-    public final ObjectPrx
-    ice_newFacet(String newFacet)
-    {
-        if (newFacet.equals(_reference.facet))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(_reference.changeFacet(newFacet));
-            return proxy;
-        }
-    }
+    public ObjectPrx ice_batchOneway();
 
-    public final ObjectPrx
-    ice_twoway()
-    {
-        IceInternal.Reference ref =
-            _reference.changeMode(IceInternal.Reference.ModeTwoway);
-        if (ref.equals(_reference))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(ref);
-            return proxy;
-        }
-    }
+    public ObjectPrx ice_datagram();
 
-    public final ObjectPrx
-    ice_oneway()
-    {
-        IceInternal.Reference ref =
-            _reference.changeMode(IceInternal.Reference.ModeOneway);
-        if (ref.equals(_reference))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(ref);
-            return proxy;
-        }
-    }
+    public ObjectPrx ice_batchDatagram();
 
-    public final ObjectPrx
-    ice_batchOneway()
-    {
-        IceInternal.Reference ref =
-            _reference.changeMode(IceInternal.Reference.ModeBatchOneway);
-        if (ref.equals(_reference))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(ref);
-            return proxy;
-        }
-    }
+    public ObjectPrx ice_secure(boolean b);
 
-    public final ObjectPrx
-    ice_datagram()
-    {
-        IceInternal.Reference ref =
-            _reference.changeMode(IceInternal.Reference.ModeDatagram);
-        if (ref.equals(_reference))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(ref);
-            return proxy;
-        }
-    }
+    public ObjectPrx ice_timeout(int t);
 
-    public final ObjectPrx
-    ice_batchDatagram()
-    {
-        IceInternal.Reference ref =
-            _reference.changeMode(IceInternal.Reference.ModeBatchDatagram);
-        if (ref.equals(_reference))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(ref);
-            return proxy;
-        }
-    }
-
-    public final ObjectPrx
-    ice_secure(boolean b)
-    {
-        IceInternal.Reference ref = _reference.changeSecure(b);
-        if (ref.equals(_reference))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(ref);
-            return proxy;
-        }
-    }
-
-    public final ObjectPrx
-    ice_timeout(int t)
-    {
-        IceInternal.Reference ref = _reference.changeTimeout(t);
-        if (ref.equals(_reference))
-        {
-            return this;
-        }
-        else
-        {
-            ObjectPrx proxy = new ObjectPrx();
-            proxy.setup(ref);
-            return proxy;
-        }
-    }
-
-    public final void
-    ice_flush()
-    {
-        _ObjectDel __del = __getDelegate();
-        __del.ice_flush();
-    }
-
-    public final IceInternal.Reference
-    __reference()
-    {
-        return _reference;
-    }
-
-    public final void
-    __copyFrom(Ice.ObjectPrx from)
-    {
-        setup(from.__reference());
-    }
-
-    public final synchronized int
-    __handleException(LocalException ex, int cnt)
-    {
-        _delegate = null;
-
-        final int max = 1; // TODO: Make number of retries configurable
-
-        try
-        {
-            throw ex;
-        }
-        catch (CloseConnectionException e)
-        {
-            //
-            // We always retry on a close connection exception, as this
-            // indicates graceful server shutdown.
-            //
-            // TODO: configurable timeout before we try again?
-        }
-        catch (SocketException e)
-        {
-            ++cnt;
-        }
-        /* TODO: SSL
-        catch (IceSecurity.SecurityException e) // TODO: bandaid to make retry
-        {                                       // w/ ssl work
-            ++cnt;
-        }
-        */
-        catch (DNSException e)
-        {
-            ++cnt;
-        }
-        catch (TimeoutException e)
-        {
-            ++cnt;
-        }
-
-        IceInternal.TraceLevels traceLevels =
-            _reference.instance.traceLevels();
-        Logger logger = _reference.instance.logger();
-
-        if (cnt > max)
-        {
-            if (traceLevels.retry >= 1)
-            {
-                String s = "cannot retry operation call because retry limit " +
-                    "has been exceeded\n" + ex;
-                logger.trace(traceLevels.retryCat, s);
-            }
-            throw ex;
-        }
-
-        if (traceLevels.retry >= 1)
-        {
-            String s = "re-trying operation call because of exception\n" + ex;
-            logger.trace(traceLevels.retryCat, s);
-        }
-
-        //
-        // Reset the endpoints to the original endpoints upon retry
-        //
-        _reference = _reference.changeEndpoints(_reference.origEndpoints);
-
-        return cnt;
-    }
-
-    public final synchronized void
-    __rethrowException(LocalException ex)
-    {
-        _delegate = null;
-
-        throw ex;
-    }
-
-    public final synchronized void
-    __locationForward(LocationForward ex)
-    {
-        _delegate = null;
-
-        if (!_reference.identity.equals(ex._prx._reference.identity))
-        {
-            throw new ReferenceIdentityException();
-        }
-
-        _reference = _reference.changeEndpoints(ex._prx._reference.endpoints);
-
-        /*
-        IceInternal.TraceLevels traceLevels =
-            _reference.instance.traceLevels();
-        Logger logger = _reference.instance.logger();
-
-        if (traceLevels.locationForward >= 1)
-        {
-            String s = "location forward for object with identity `" +
-                _reference.identity + "'";
-            logger.trace(traceLevels.locationForwardCat, s);
-        }
-        */
-    }
-
-    protected final synchronized _ObjectDel
-    __getDelegate()
-    {
-        if (_delegate == null)
-        {
-            /* TODO: Server
-            ObjectAdapter adapter = _reference.instance.objectAdapterFactory().
-                findObjectAdapter(this);
-            if (adapter != null)
-            {
-                _ObjectDelD delegate = __createDelegateD();
-                delegate.setup(_reference, adapter);
-                _delegate = delegate;
-            }
-            else
-            */
-            {
-                _ObjectDelM delegate = __createDelegateM();
-                delegate.setup(_reference);
-                _delegate = delegate;
-            }
-        }
-
-        return _delegate;
-    }
-
-    protected _ObjectDelM
-    __createDelegateM()
-    {
-        return new _ObjectDelM();
-    }
-
-    protected _ObjectDelD
-    __createDelegateD()
-    {
-        return new _ObjectDelD();
-    }
-
-    //
-    // Only for use by IceInternal.ProxyFactory
-    //
-    public final void
-    setup(IceInternal.Reference ref)
-    {
-        //
-        // No need to synchronize, as this operation is only called
-        // upon initial initialization.
-        //
-        _reference = ref;
-    }
-
-    private IceInternal.Reference _reference;
-    private _ObjectDel _delegate;
+    public void ice_flush();
 }
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
new file mode 100644
index 00000000000..91838985c77
--- /dev/null
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -0,0 +1,464 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+package Ice;
+
+public class ObjectPrxHelper implements ObjectPrx
+{
+    public final int
+    ice_hash()
+    {
+        return _reference.hashValue;
+    }
+
+    public final boolean
+    ice_isA(String __id)
+    {
+        return ice_isA(__id, null);
+    }
+
+    public final boolean
+    ice_isA(String __id, java.util.HashMap __context)
+    {
+        int __cnt = 0;
+        while (true)
+        {
+            try
+            {
+                _ObjectDel __del = __getDelegate();
+                return __del.ice_isA(__id, __context);
+            }
+            catch (LocationForward __ex)
+            {
+                __locationForward(__ex);
+            }
+            catch (IceInternal.NonRepeatable __ex)
+            {
+                __cnt = __handleException(__ex.get(), __cnt);
+            }
+            catch (LocalException __ex)
+            {
+                __cnt = __handleException(__ex, __cnt);
+            }
+        }
+    }
+
+    public final void
+    ice_ping()
+    {
+        ice_ping(null);
+    }
+
+    public final void
+    ice_ping(java.util.HashMap __context)
+    {
+        int __cnt = 0;
+        while (true)
+        {
+            try
+            {
+                _ObjectDel __del = __getDelegate();
+                __del.ice_ping(__context);
+                return;
+            }
+            catch (LocationForward __ex)
+            {
+                __locationForward(__ex);
+            }
+            catch (IceInternal.NonRepeatable __ex)
+            {
+                __cnt = __handleException(__ex.get(), __cnt);
+            }
+            catch (LocalException __ex)
+            {
+                __cnt = __handleException(__ex, __cnt);
+            }
+        }
+    }
+
+    public final byte[]
+    ice_invoke(String operation, boolean nonmutating, byte[] inParams)
+    {
+        return ice_invoke(operation, nonmutating, inParams, null);
+    }
+
+    public final byte[]
+    ice_invoke(String operation, boolean nonmutating, byte[] inParams,
+               java.util.HashMap __context)
+    {
+        int __cnt = 0;
+        while (true)
+        {
+            try
+            {
+                _ObjectDel __del = __getDelegate();
+                return __del.ice_invoke(operation, nonmutating, inParams,
+                                        __context);
+            }
+            catch (LocationForward __ex)
+            {
+                __locationForward(__ex);
+            }
+            catch (IceInternal.NonRepeatable __ex)
+            {
+                if (nonmutating)
+                {
+                    __cnt = __handleException(__ex.get(), __cnt);
+                }
+                else
+                {
+                    __rethrowException(__ex.get());
+                }
+            }
+            catch (LocalException __ex)
+            {
+                __cnt = __handleException(__ex, __cnt);
+            }
+        }
+    }
+
+    public final String
+    ice_getIdentity()
+    {
+        return _reference.identity;
+    }
+
+    public final ObjectPrx
+    ice_newIdentity(String newIdentity)
+    {
+        if (newIdentity.equals(_reference.identity))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(_reference.changeIdentity(newIdentity));
+            return proxy;
+        }
+    }
+
+    public final String
+    ice_getFacet()
+    {
+        return _reference.facet;
+    }
+
+    public final ObjectPrx
+    ice_newFacet(String newFacet)
+    {
+        if (newFacet.equals(_reference.facet))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(_reference.changeFacet(newFacet));
+            return proxy;
+        }
+    }
+
+    public final ObjectPrx
+    ice_twoway()
+    {
+        IceInternal.Reference ref =
+            _reference.changeMode(IceInternal.Reference.ModeTwoway);
+        if (ref.equals(_reference))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(ref);
+            return proxy;
+        }
+    }
+
+    public final ObjectPrx
+    ice_oneway()
+    {
+        IceInternal.Reference ref =
+            _reference.changeMode(IceInternal.Reference.ModeOneway);
+        if (ref.equals(_reference))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(ref);
+            return proxy;
+        }
+    }
+
+    public final ObjectPrx
+    ice_batchOneway()
+    {
+        IceInternal.Reference ref =
+            _reference.changeMode(IceInternal.Reference.ModeBatchOneway);
+        if (ref.equals(_reference))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(ref);
+            return proxy;
+        }
+    }
+
+    public final ObjectPrx
+    ice_datagram()
+    {
+        IceInternal.Reference ref =
+            _reference.changeMode(IceInternal.Reference.ModeDatagram);
+        if (ref.equals(_reference))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(ref);
+            return proxy;
+        }
+    }
+
+    public final ObjectPrx
+    ice_batchDatagram()
+    {
+        IceInternal.Reference ref =
+            _reference.changeMode(IceInternal.Reference.ModeBatchDatagram);
+        if (ref.equals(_reference))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(ref);
+            return proxy;
+        }
+    }
+
+    public final ObjectPrx
+    ice_secure(boolean b)
+    {
+        IceInternal.Reference ref = _reference.changeSecure(b);
+        if (ref.equals(_reference))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(ref);
+            return proxy;
+        }
+    }
+
+    public final ObjectPrx
+    ice_timeout(int t)
+    {
+        IceInternal.Reference ref = _reference.changeTimeout(t);
+        if (ref.equals(_reference))
+        {
+            return this;
+        }
+        else
+        {
+            ObjectPrxHelper proxy = new ObjectPrxHelper();
+            proxy.setup(ref);
+            return proxy;
+        }
+    }
+
+    public final void
+    ice_flush()
+    {
+        _ObjectDel __del = __getDelegate();
+        __del.ice_flush();
+    }
+
+    public final IceInternal.Reference
+    __reference()
+    {
+        return _reference;
+    }
+
+    public final void
+    __copyFrom(ObjectPrx from)
+    {
+        ObjectPrxHelper h = (ObjectPrxHelper)from;
+        setup(h.__reference());
+    }
+
+    public final synchronized int
+    __handleException(LocalException ex, int cnt)
+    {
+        _delegate = null;
+
+        final int max = 1; // TODO: Make number of retries configurable
+
+        try
+        {
+            throw ex;
+        }
+        catch (CloseConnectionException e)
+        {
+            //
+            // We always retry on a close connection exception, as this
+            // indicates graceful server shutdown.
+            //
+            // TODO: configurable timeout before we try again?
+        }
+        catch (SocketException e)
+        {
+            ++cnt;
+        }
+        /* TODO: SSL
+        catch (IceSecurity.SecurityException e) // TODO: bandaid to make retry
+        {                                       // w/ ssl work
+            ++cnt;
+        }
+        */
+        catch (DNSException e)
+        {
+            ++cnt;
+        }
+        catch (TimeoutException e)
+        {
+            ++cnt;
+        }
+
+        IceInternal.TraceLevels traceLevels =
+            _reference.instance.traceLevels();
+        Logger logger = _reference.instance.logger();
+
+        if (cnt > max)
+        {
+            if (traceLevels.retry >= 1)
+            {
+                String s = "cannot retry operation call because retry limit " +
+                    "has been exceeded\n" + ex;
+                logger.trace(traceLevels.retryCat, s);
+            }
+            throw ex;
+        }
+
+        if (traceLevels.retry >= 1)
+        {
+            String s = "re-trying operation call because of exception\n" + ex;
+            logger.trace(traceLevels.retryCat, s);
+        }
+
+        //
+        // Reset the endpoints to the original endpoints upon retry
+        //
+        _reference = _reference.changeEndpoints(_reference.origEndpoints);
+
+        return cnt;
+    }
+
+    public final synchronized void
+    __rethrowException(LocalException ex)
+    {
+        _delegate = null;
+
+        throw ex;
+    }
+
+    public final synchronized void
+    __locationForward(LocationForward ex)
+    {
+        _delegate = null;
+
+        ObjectPrxHelper h = (ObjectPrxHelper)ex._prx;
+        if (!_reference.identity.equals(h.__reference().identity))
+        {
+            throw new ReferenceIdentityException();
+        }
+
+        _reference =
+            _reference.changeEndpoints(h.__reference().endpoints);
+
+        /*
+        IceInternal.TraceLevels traceLevels =
+            _reference.instance.traceLevels();
+        Logger logger = _reference.instance.logger();
+
+        if (traceLevels.locationForward >= 1)
+        {
+            String s = "location forward for object with identity `" +
+                _reference.identity + "'";
+            logger.trace(traceLevels.locationForwardCat, s);
+        }
+        */
+    }
+
+    protected final synchronized _ObjectDel
+    __getDelegate()
+    {
+        if (_delegate == null)
+        {
+            /* TODO: Server
+            ObjectAdapter adapter = _reference.instance.objectAdapterFactory().
+                findObjectAdapter(this);
+            if (adapter != null)
+            {
+                _ObjectDelD delegate = __createDelegateD();
+                delegate.setup(_reference, adapter);
+                _delegate = delegate;
+            }
+            else
+            */
+            {
+                _ObjectDelM delegate = __createDelegateM();
+                delegate.setup(_reference);
+                _delegate = delegate;
+            }
+        }
+
+        return _delegate;
+    }
+
+    protected _ObjectDelM
+    __createDelegateM()
+    {
+        return new _ObjectDelM();
+    }
+
+    protected _ObjectDelD
+    __createDelegateD()
+    {
+        // TODO: Server
+        //return new _ObjectDelD();
+        return null;
+    }
+
+    //
+    // Only for use by IceInternal.ProxyFactory
+    //
+    public final void
+    setup(IceInternal.Reference ref)
+    {
+        //
+        // No need to synchronize, as this operation is only called
+        // upon initial initialization.
+        //
+        _reference = ref;
+    }
+
+    private IceInternal.Reference _reference;
+    private _ObjectDel _delegate;
+}
diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
new file mode 100644
index 00000000000..b8150266335
--- /dev/null
+++ b/java/src/Ice/_ObjectDelD.java
@@ -0,0 +1,16 @@
+// **********************************************************************
+//
+// Copyright (c) 2001
+// MutableRealms, Inc.
+// Huntsville, AL, USA
+//
+// All Rights Reserved
+//
+// **********************************************************************
+
+package Ice;
+
+public interface _ObjectDelD
+{
+    // TODO: Server
+}
diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java
index aff694b485b..341491b58f8 100644
--- a/java/src/IceInternal/ProxyFactory.java
+++ b/java/src/IceInternal/ProxyFactory.java
@@ -22,7 +22,8 @@ public final class ProxyFactory
     public String
     proxyToString(Ice.ObjectPrx proxy)
     {
-        return proxy.__reference().toString();
+        Ice.ObjectPrxHelper h = (Ice.ObjectPrxHelper)proxy;
+        return h.__reference().toString();
     }
 
     public Ice.ObjectPrx
@@ -44,7 +45,7 @@ public final class ProxyFactory
     public Ice.ObjectPrx
     referenceToProxy(Reference reference)
     {
-        Ice.ObjectPrx proxy = new Ice.ObjectPrx();
+        Ice.ObjectPrxHelper proxy = new Ice.ObjectPrxHelper();
         proxy.setup(reference);
         return proxy;
     }
@@ -54,8 +55,10 @@ public final class ProxyFactory
     {
         if (proxy != null)
         {
-            s.writeString(proxy.__reference().identity);
-            proxy.__reference().streamWrite(s);
+            Ice.ObjectPrxHelper h = (Ice.ObjectPrxHelper)proxy;
+            Reference ref = h.__reference();
+            s.writeString(ref.identity);
+            ref.streamWrite(s);
         }
         else
         {