diff options
Diffstat (limited to 'java-compat')
79 files changed, 1150 insertions, 1150 deletions
diff --git a/java-compat/src/Ice/src/main/java/Ice/Blobject.java b/java-compat/src/Ice/src/main/java/Ice/Blobject.java index f1521d0ab6f..85056b318a5 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Blobject.java +++ b/java-compat/src/Ice/src/main/java/Ice/Blobject.java @@ -38,7 +38,7 @@ public abstract class Blobject extends Ice.ObjectImpl @Override public boolean - __dispatch(IceInternal.Incoming in, Current current) + _iceDispatch(IceInternal.Incoming in, Current current) throws UserException { byte[] inEncaps; diff --git a/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java b/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java index 44b07542a65..0fd86644a44 100644 --- a/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java +++ b/java-compat/src/Ice/src/main/java/Ice/BlobjectAsync.java @@ -37,7 +37,7 @@ public abstract class BlobjectAsync extends Ice.ObjectImpl @Override public boolean - __dispatch(IceInternal.Incoming in, Current current) + _iceDispatch(IceInternal.Incoming in, Current current) throws UserException { byte[] inEncaps = in.readParamEncaps(); diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback.java b/java-compat/src/Ice/src/main/java/Ice/Callback.java index 0d852d6d4c6..e428460b7cd 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback.java @@ -38,19 +38,19 @@ public abstract class Callback extends IceInternal.CallbackBase } @Override - public final void __completed(AsyncResult r) + public final void _iceCompleted(AsyncResult r) { completed(r); } @Override - public final void __sent(AsyncResult r) + public final void _iceSent(AsyncResult r) { sent(r); } @Override - public final boolean __hasSentCallback() + public final boolean _iceHasSentCallback() { return true; } diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java index 7a71fb8a8cc..5b7901bab3e 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Communicator_flushBatchRequests.java @@ -31,26 +31,26 @@ public abstract class Callback_Communicator_flushBatchRequests extends IceIntern } @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { try { - __result.getCommunicator().end_flushBatchRequests(__result); + result.getCommunicator().end_flushBatchRequests(result); } - catch(LocalException __ex) + catch(LocalException ex) { - exception(__ex); + exception(ex); } } @Override - public final void __sent(AsyncResult __result) + public final void _iceSent(AsyncResult result) { - sent(__result.sentSynchronously()); + sent(result.sentSynchronously()); } @Override - public final boolean __hasSentCallback() + public final boolean _iceHasSentCallback() { return true; } diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java index 3c24bca2512..a02c10edf56 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_flushBatchRequests.java @@ -31,26 +31,26 @@ public abstract class Callback_Connection_flushBatchRequests extends IceInternal } @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { try { - __result.getConnection().end_flushBatchRequests(__result); + result.getConnection().end_flushBatchRequests(result); } - catch(LocalException __ex) + catch(LocalException ex) { - exception(__ex); + exception(ex); } } @Override - public final void __sent(AsyncResult __result) + public final void _iceSent(AsyncResult result) { - sent(__result.sentSynchronously()); + sent(result.sentSynchronously()); } @Override - public final boolean __hasSentCallback() + public final boolean _iceHasSentCallback() { return true; } diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java index f65533fdaf1..c8d57275c94 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_getConnection.java @@ -18,14 +18,14 @@ public abstract class Callback_Object_ice_getConnection extends IceInternal.Twow /** * Called when the invocation completes successfully. * - * @param __ret The connection being used by the proxy. + * @param ret The connection being used by the proxy. **/ @Override - public abstract void response(Ice.Connection __ret); + public abstract void response(Ice.Connection ret); @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_getConnection_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_getConnection_completed(this, result); } } diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java index 541989f45da..75b4e4a09d9 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_id.java @@ -18,14 +18,14 @@ public abstract class Callback_Object_ice_id extends IceInternal.TwowayCallback /** * Called when the invocation completes successfully. * - * @param __ret The Slice type id of the most-derived interface supported by the target object. + * @param ret The Slice type id of the most-derived interface supported by the target object. **/ @Override - public abstract void response(String __ret); + public abstract void response(String ret); @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_id_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_id_completed(this, result); } } diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java index ab2ecbd5a95..a71d690a6ef 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_ids.java @@ -18,14 +18,14 @@ public abstract class Callback_Object_ice_ids extends IceInternal.TwowayCallback /** * Called when the invocation completes successfully. * - * @param __ret The Slice type ids of the interfaces supported by the target object. + * @param ret The Slice type ids of the interfaces supported by the target object. **/ @Override - public abstract void response(String[] __ret); + public abstract void response(String[] ret); @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_ids_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_ids_completed(this, result); } } diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java index a60a22ce7ff..ccd179edb6b 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_invoke.java @@ -29,8 +29,8 @@ public abstract class Callback_Object_ice_invoke public abstract void response(boolean ret, byte[] outParams); @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_invoke_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_invoke_completed(this, result); } } diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java index 8ccba433133..af875d4b391 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Object_ice_isA.java @@ -17,14 +17,14 @@ public abstract class Callback_Object_ice_isA extends IceInternal.TwowayCallback /** * Called when the invocation completes successfully. * - * @param __ret True if the target object supports the given interface, false otherwise. + * @param ret True if the target object supports the given interface, false otherwise. **/ @Override - public abstract void response(boolean __ret); + public abstract void response(boolean ret); @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_isA_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_isA_completed(this, result); } } diff --git a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java index 8ca4682639c..de973f2c75a 100644 --- a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java +++ b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java @@ -233,29 +233,29 @@ public final class CommunicatorI implements Communicator @Override public AsyncResult - begin_flushBatchRequests(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_flushBatchRequests(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { return begin_flushBatchRequestsInternal( - new IceInternal.Functional_CallbackBase(false, __exceptionCb, __sentCb) + new IceInternal.Functional_CallbackBase(false, exceptionCb, sentCb) { @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { try { - __result.getCommunicator().end_flushBatchRequests(__result); + result.getCommunicator().end_flushBatchRequests(result); } - catch(Exception __ex) + catch(Exception ex) { - __exceptionCb.apply(__ex); + _exceptionCb.apply(ex); } } }); } - private static final String __flushBatchRequests_name = "flushBatchRequests"; + private static final String _flushBatchRequests_name = "flushBatchRequests"; private Ice.AsyncResult begin_flushBatchRequestsInternal(IceInternal.CallbackBase cb) @@ -269,7 +269,7 @@ public final class CommunicatorI implements Communicator // IceInternal.CommunicatorFlushBatch result = new IceInternal.CommunicatorFlushBatch(this, _instance, - __flushBatchRequests_name, + _flushBatchRequests_name, cb); connectionFactory.flushAsyncBatchRequests(result); @@ -289,8 +289,8 @@ public final class CommunicatorI implements Communicator end_flushBatchRequests(AsyncResult r) { IceInternal.CommunicatorFlushBatch ri = - IceInternal.CommunicatorFlushBatch.check(r, this, __flushBatchRequests_name); - ri.__wait(); + IceInternal.CommunicatorFlushBatch.check(r, this, _flushBatchRequests_name); + ri.waitForResponseOrUserEx(); } diff --git a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java index cac2a6fb3d2..92d1c6fee04 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java @@ -423,7 +423,7 @@ public final class ConnectionI extends IceInternal.EventHandler end_flushBatchRequests(begin_flushBatchRequests()); } - private static final String __flushBatchRequests_name = "flushBatchRequests"; + private static final String _flushBatchRequests_name = "flushBatchRequests"; @Override public Ice.AsyncResult begin_flushBatchRequests() @@ -444,22 +444,22 @@ public final class ConnectionI extends IceInternal.EventHandler } @Override - public AsyncResult begin_flushBatchRequests(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + public AsyncResult begin_flushBatchRequests(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_flushBatchRequestsInternal(new IceInternal.Functional_CallbackBase(false, __exceptionCb, __sentCb) + return begin_flushBatchRequestsInternal(new IceInternal.Functional_CallbackBase(false, exceptionCb, sentCb) { @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { try { - __result.getConnection().end_flushBatchRequests(__result); + result.getConnection().end_flushBatchRequests(result); } - catch(Exception __ex) + catch(Exception ex) { - __exceptionCb.apply(__ex); + _exceptionCb.apply(ex); } } }); @@ -468,7 +468,7 @@ public final class ConnectionI extends IceInternal.EventHandler private Ice.AsyncResult begin_flushBatchRequestsInternal(IceInternal.CallbackBase cb) { IceInternal.ConnectionFlushBatch result = - new IceInternal.ConnectionFlushBatch(this, _communicator, _instance, __flushBatchRequests_name, cb); + new IceInternal.ConnectionFlushBatch(this, _communicator, _instance, _flushBatchRequests_name, cb); result.invoke(); return result; } @@ -477,8 +477,8 @@ public final class ConnectionI extends IceInternal.EventHandler public void end_flushBatchRequests(AsyncResult ir) { IceInternal.ConnectionFlushBatch r = - IceInternal.ConnectionFlushBatch.check(ir, this, __flushBatchRequests_name); - r.__wait(); + IceInternal.ConnectionFlushBatch.check(ir, this, _flushBatchRequests_name); + r.waitForResponseOrUserEx(); } @Override @@ -887,10 +887,10 @@ public final class ConnectionI extends IceInternal.EventHandler throw ex; } - _readProtocol.__read(_readStream); + _readProtocol.read(_readStream); IceInternal.Protocol.checkSupportedProtocol(_readProtocol); - _readProtocolEncoding.__read(_readStream); + _readProtocolEncoding.read(_readStream); IceInternal.Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding); _readStream.readByte(); // messageType @@ -1885,8 +1885,8 @@ public final class ConnectionI extends IceInternal.EventHandler // OutputStream os = new OutputStream(_instance, IceInternal.Protocol.currentProtocolEncoding); os.writeBlob(IceInternal.Protocol.magic); - IceInternal.Protocol.currentProtocol.__write(os); - IceInternal.Protocol.currentProtocolEncoding.__write(os); + IceInternal.Protocol.currentProtocol.write(os); + IceInternal.Protocol.currentProtocolEncoding.write(os); os.writeByte(IceInternal.Protocol.closeConnectionMsg); os.writeByte((byte) 0); // compression status: always report 0 for // CloseConnection in Java. @@ -1918,8 +1918,8 @@ public final class ConnectionI extends IceInternal.EventHandler { OutputStream os = new OutputStream(_instance, IceInternal.Protocol.currentProtocolEncoding); os.writeBlob(IceInternal.Protocol.magic); - IceInternal.Protocol.currentProtocol.__write(os); - IceInternal.Protocol.currentProtocolEncoding.__write(os); + IceInternal.Protocol.currentProtocol.write(os); + IceInternal.Protocol.currentProtocolEncoding.write(os); os.writeByte(IceInternal.Protocol.validateConnectionMsg); os.writeByte((byte) 0); os.writeInt(IceInternal.Protocol.headerSize); // Message size. @@ -1969,8 +1969,8 @@ public final class ConnectionI extends IceInternal.EventHandler if(_writeStream.isEmpty()) { _writeStream.writeBlob(IceInternal.Protocol.magic); - IceInternal.Protocol.currentProtocol.__write(_writeStream); - IceInternal.Protocol.currentProtocolEncoding.__write(_writeStream); + IceInternal.Protocol.currentProtocol.write(_writeStream); + IceInternal.Protocol.currentProtocolEncoding.write(_writeStream); _writeStream.writeByte(IceInternal.Protocol.validateConnectionMsg); _writeStream.writeByte((byte) 0); // Compression status // (always zero for @@ -2043,10 +2043,10 @@ public final class ConnectionI extends IceInternal.EventHandler throw ex; } - _readProtocol.__read(_readStream); + _readProtocol.read(_readStream); IceInternal.Protocol.checkSupportedProtocol(_readProtocol); - _readProtocolEncoding.__read(_readStream); + _readProtocolEncoding.read(_readStream); IceInternal.Protocol.checkSupportedProtocolEncoding(_readProtocolEncoding); byte messageType = _readStream.readByte(); diff --git a/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java b/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java index cd926273a1c..6bd982836af 100644 --- a/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java +++ b/java-compat/src/Ice/src/main/java/Ice/DispatchInterceptor.java @@ -37,7 +37,7 @@ public abstract class DispatchInterceptor extends ObjectImpl @Override public boolean - __dispatch(IceInternal.Incoming in, Current current) + _iceDispatch(IceInternal.Incoming in, Current current) throws Ice.UserException { try diff --git a/java-compat/src/Ice/src/main/java/Ice/InputStream.java b/java-compat/src/Ice/src/main/java/Ice/InputStream.java index b1895b6d19e..46ad2ffdbf1 100644 --- a/java-compat/src/Ice/src/main/java/Ice/InputStream.java +++ b/java-compat/src/Ice/src/main/java/Ice/InputStream.java @@ -581,7 +581,7 @@ public class InputStream _encapsStack.sz = sz; EncodingVersion encoding = new EncodingVersion(); - encoding.__read(this); + encoding.read(this); IceInternal.Protocol.checkSupportedEncoding(encoding); // Make sure the encoding is supported. _encapsStack.setEncoding(encoding); @@ -691,7 +691,7 @@ public class InputStream if(encoding != null) { - encoding.__read(this); + encoding.read(this); _buf.b.position(_buf.b.position() - 6); } else @@ -745,7 +745,7 @@ public class InputStream throw new UnmarshalOutOfBoundsException(); } EncodingVersion encoding = new EncodingVersion(); - encoding.__read(this); + encoding.read(this); try { _buf.b.position(_buf.b.position() + sz - 6); @@ -2321,7 +2321,7 @@ public class InputStream // // Read the instance. // - v.__read(_stream); + v._iceRead(_stream); if(_patchMap != null) { @@ -2495,7 +2495,7 @@ public class InputStream // if(userEx != null) { - userEx.__read(_stream); + userEx._read(_stream); if(usesClasses) { readPendingValues(); @@ -2800,7 +2800,7 @@ public class InputStream // if(userEx != null) { - userEx.__read(_stream); + userEx._read(_stream); throw userEx; // Never reached. diff --git a/java-compat/src/Ice/src/main/java/Ice/Object.java b/java-compat/src/Ice/src/main/java/Ice/Object.java index 9e206cc5daa..16be3bc3b48 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Object.java +++ b/java-compat/src/Ice/src/main/java/Ice/Object.java @@ -157,11 +157,11 @@ public interface Object boolean ice_dispatch(Request request) throws Ice.UserException; - boolean __dispatch(IceInternal.Incoming in, Current current) + boolean _iceDispatch(IceInternal.Incoming in, Current current) throws Ice.UserException; - void __write(OutputStream __os); - void __read(InputStream __is); + void _iceWrite(OutputStream ostr); + void _iceRead(InputStream istr); public static final String ice_staticId = "::Ice::Object"; } diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java index 53abcf4b4b6..f0497ea6b7c 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -517,7 +517,7 @@ public final class ObjectAdapterI implements ObjectAdapter { checkForDeactivation(); - IceInternal.Reference ref = ((ObjectPrxHelperBase)proxy).__reference(); + IceInternal.Reference ref = ((ObjectPrxHelperBase)proxy)._getReference(); return findFacet(ref.getIdentity(), ref.getFacet()); } @@ -673,7 +673,7 @@ public final class ObjectAdapterI implements ObjectAdapter // it can be called for AMI invocations if the proxy has no delegate set yet. // - IceInternal.Reference ref = ((ObjectPrxHelperBase)proxy).__reference(); + IceInternal.Reference ref = ((ObjectPrxHelperBase)proxy)._getReference(); if(ref.isWellKnown()) { // diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java b/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java index 8977247d96d..f00078df4c9 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectImpl.java @@ -45,7 +45,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io return c; } - public final static String[] __ids = + private final static String[] _ids = { "::Ice::Object" }; @@ -61,7 +61,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io public boolean ice_isA(String s) { - return s.equals(__ids[0]); + return s.equals(_ids[0]); } /** @@ -76,19 +76,19 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io public boolean ice_isA(String s, Current current) { - return s.equals(__ids[0]); + return s.equals(_ids[0]); } public static boolean - ___ice_isA(Ice.Object __obj, IceInternal.Incoming __inS, Current __current) + _iceD_ice_isA(Ice.Object obj, IceInternal.Incoming inS, Current current) { - InputStream __is = __inS.startReadParams(); - String __id = __is.readString(); - __inS.endReadParams(); - boolean __ret = __obj.ice_isA(__id, __current); - OutputStream __os = __inS.startWriteParams(); - __os.writeBool(__ret); - __inS.endWriteParams(); + InputStream istr = inS.startReadParams(); + String id = istr.readString(); + inS.endReadParams(); + boolean ret = obj.ice_isA(id, current); + OutputStream ostr = inS.startWriteParams(); + ostr.writeBool(ret); + inS.endWriteParams(); return false; } @@ -115,11 +115,11 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io } public static boolean - ___ice_ping(Ice.Object __obj, IceInternal.Incoming __inS, Current __current) + _iceD_ice_ping(Ice.Object obj, IceInternal.Incoming inS, Current current) { - __inS.readEmptyParams(); - __obj.ice_ping(__current); - __inS.writeEmptyParams(); + inS.readEmptyParams(); + obj.ice_ping(current); + inS.writeEmptyParams(); return false; } @@ -132,7 +132,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io public String[] ice_ids() { - return __ids; + return _ids; } /** @@ -145,17 +145,17 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io public String[] ice_ids(Current current) { - return __ids; + return _ids; } public static boolean - ___ice_ids(Ice.Object __obj, IceInternal.Incoming __inS, Current __current) + _iceD_ice_ids(Ice.Object obj, IceInternal.Incoming inS, Current current) { - __inS.readEmptyParams(); - String[] __ret = __obj.ice_ids(__current); - OutputStream __os = __inS.startWriteParams(); - __os.writeStringSeq(__ret); - __inS.endWriteParams(); + inS.readEmptyParams(); + String[] ret = obj.ice_ids(current); + OutputStream ostr = inS.startWriteParams(); + ostr.writeStringSeq(ret); + inS.endWriteParams(); return false; } @@ -168,7 +168,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io public String ice_id() { - return __ids[0]; + return _ids[0]; } /** @@ -181,17 +181,17 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io public String ice_id(Current current) { - return __ids[0]; + return _ids[0]; } public static boolean - ___ice_id(Ice.Object __obj, IceInternal.Incoming __inS, Current __current) + _iceD_ice_id(Ice.Object obj, IceInternal.Incoming inS, Current current) { - __inS.readEmptyParams(); - String __ret = __obj.ice_id(__current); - OutputStream __os = __inS.startWriteParams(); - __os.writeString(__ret); - __inS.endWriteParams(); + inS.readEmptyParams(); + String ret = obj.ice_id(current); + OutputStream ostr = inS.startWriteParams(); + ostr.writeString(ret); + inS.endWriteParams(); return false; } @@ -203,7 +203,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io public static String ice_staticId() { - return __ids[0]; + return _ids[0]; } /** @@ -258,7 +258,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io { } - private final static String[] __all = + private final static String[] _all = { "ice_id", "ice_ids", @@ -290,7 +290,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io in.push(cb); try { - return __dispatch(in, in.getCurrent()); + return _iceDispatch(in, in.getCurrent()); } finally { @@ -299,7 +299,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io } else { - return __dispatch(in, in.getCurrent()); + return _iceDispatch(in, in.getCurrent()); } } @@ -322,10 +322,10 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io @Override public boolean - __dispatch(IceInternal.Incoming in, Current current) + _iceDispatch(IceInternal.Incoming in, Current current) throws Ice.UserException { - int pos = java.util.Arrays.binarySearch(__all, current.operation); + int pos = java.util.Arrays.binarySearch(_all, current.operation); if(pos < 0) { throw new Ice.OperationNotExistException(current.id, current.facet, current.operation); @@ -335,19 +335,19 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io { case 0: { - return ___ice_id(this, in, current); + return _iceD_ice_id(this, in, current); } case 1: { - return ___ice_ids(this, in, current); + return _iceD_ice_ids(this, in, current); } case 2: { - return ___ice_isA(this, in, current); + return _iceD_ice_isA(this, in, current); } case 3: { - return ___ice_ping(this, in, current); + return _iceD_ice_ping(this, in, current); } } @@ -357,29 +357,29 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io @Override public void - __write(OutputStream os) + _iceWrite(OutputStream os) { os.startValue(null); - __writeImpl(os); + _iceWriteImpl(os); os.endValue(); } @Override public void - __read(InputStream is) + _iceRead(InputStream is) { is.startValue(); - __readImpl(is); + _iceReadImpl(is); is.endValue(false); } protected void - __writeImpl(OutputStream os) + _iceWriteImpl(OutputStream os) { } protected void - __readImpl(InputStream is) + _iceReadImpl(InputStream is) { } @@ -404,7 +404,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io } protected static void - __checkMode(OperationMode expected, OperationMode received) + _iceCheckMode(OperationMode expected, OperationMode received) { if(expected != received) { diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java index b97f6e16a43..4489a0a5c62 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrx.java @@ -24,138 +24,138 @@ public interface ObjectPrx /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. + * @param id The type ID of the Slice interface to test against. * @return <code>true</code> if the target object has the interface - * specified by <code>__id</code> or derives from the interface - * specified by <code>__id</code>. + * specified by <code>id</code> or derives from the interface + * specified by <code>id</code>. **/ - boolean ice_isA(String __id); + boolean ice_isA(String id); /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. - * @param __context The context map for the invocation. + * @param id The type ID of the Slice interface to test against. + * @param context The context map for the invocation. * @return <code>true</code> if the target object has the interface - * specified by <code>__id</code> or derives from the interface - * specified by <code>__id</code>. + * specified by <code>id</code> or derives from the interface + * specified by <code>id</code>. **/ - boolean ice_isA(String __id, java.util.Map<String, String> __context); + boolean ice_isA(String id, java.util.Map<String, String> context); /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. + * @param id The type ID of the Slice interface to test against. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id); + AsyncResult begin_ice_isA(String id); /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. - * @param __context The context map for the invocation. + * @param id The type ID of the Slice interface to test against. + * @param context The context map for the invocation. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, java.util.Map<String, String> __context); + AsyncResult begin_ice_isA(String id, java.util.Map<String, String> context); /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. - * @param __cb The asynchronous callback object. + * @param id The type ID of the Slice interface to test against. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, Callback __cb); + AsyncResult begin_ice_isA(String id, Callback cb); /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param id The type ID of the Slice interface to test against. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, java.util.Map<String, String> __context, Callback __cb); + AsyncResult begin_ice_isA(String id, java.util.Map<String, String> context, Callback cb); /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. - * @param __cb The asynchronous callback object. + * @param id The type ID of the Slice interface to test against. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, Callback_Object_ice_isA __cb); + AsyncResult begin_ice_isA(String id, Callback_Object_ice_isA cb); /** * Tests whether this object supports a specific Slice interface. * - * @param __id The type ID of the Slice interface to test against. - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param id The type ID of the Slice interface to test against. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, java.util.Map<String, String> __context, Callback_Object_ice_isA __cb); + AsyncResult begin_ice_isA(String id, java.util.Map<String, String> context, Callback_Object_ice_isA cb); /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param id The Slice type ID of an interface. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_isA(String id, IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param id The Slice type ID of an interface. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_isA(String id, IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, java.util.Map<String, String> __context, - IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_isA(String id, java.util.Map<String, String> context, + IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_isA(String __id, java.util.Map<String, String> __context, - IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_isA(String id, java.util.Map<String, String> context, + IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Completes the asynchronous ice_isA request. * - * @param __result The asynchronous result. + * @param result The asynchronous result. * @return <code>true</code> if this proxy supports the specified interface; <code>false</code>, otherwise. **/ - boolean end_ice_isA(AsyncResult __result); + boolean end_ice_isA(AsyncResult result); /** * Tests whether the target object of this proxy can be reached. @@ -165,9 +165,9 @@ public interface ObjectPrx /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. **/ - void ice_ping(java.util.Map<String, String> __context); + void ice_ping(java.util.Map<String, String> context); /** * Tests whether the target object of this proxy can be reached. @@ -179,99 +179,99 @@ public interface ObjectPrx /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(java.util.Map<String, String> __context); + AsyncResult begin_ice_ping(java.util.Map<String, String> context); /** * Tests whether the target object of this proxy can be reached. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(Callback __cb); + AsyncResult begin_ice_ping(Callback cb); /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(java.util.Map<String, String> __context, Callback __cb); + AsyncResult begin_ice_ping(java.util.Map<String, String> context, Callback cb); /** * Tests whether the target object of this proxy can be reached. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(Callback_Object_ice_ping __cb); + AsyncResult begin_ice_ping(Callback_Object_ice_ping cb); /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(java.util.Map<String, String> __context, Callback_Object_ice_ping __cb); + AsyncResult begin_ice_ping(java.util.Map<String, String> context, Callback_Object_ice_ping cb); /** * Tests whether the target object of this proxy can be reached. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_ping(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Tests whether the target object of this proxy can be reached. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_ping(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(java.util.Map<String, String> __context, - IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_ping(java.util.Map<String, String> context, + IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ping(java.util.Map<String, String> __context, - IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_ping(java.util.Map<String, String> context, + IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Completes the asynchronous ice_ping request. * - * @param __result The asynchronous result. + * @param result The asynchronous result. **/ - void end_ice_ping(AsyncResult __result); + void end_ice_ping(AsyncResult result); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. @@ -284,11 +284,11 @@ public interface ObjectPrx /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The Slice type IDs of the interfaces supported by the target object, in base-to-derived * order. The first element of the returned array is always <code>::Ice::Object</code>. **/ - String[] ice_ids(java.util.Map<String, String> __context); + String[] ice_ids(java.util.Map<String, String> context); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. @@ -300,101 +300,101 @@ public interface ObjectPrx /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(java.util.Map<String, String> __context); + AsyncResult begin_ice_ids(java.util.Map<String, String> context); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(Callback __cb); + AsyncResult begin_ice_ids(Callback cb); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(java.util.Map<String, String> __context, Callback __cb); + AsyncResult begin_ice_ids(java.util.Map<String, String> context, Callback cb); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(Callback_Object_ice_ids __cb); + AsyncResult begin_ice_ids(Callback_Object_ice_ids cb); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(java.util.Map<String, String> __context, Callback_Object_ice_ids __cb); + AsyncResult begin_ice_ids(java.util.Map<String, String> context, Callback_Object_ice_ids cb); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_ids(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_ids(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_ids(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Completes the asynchronous ice_ids request. * - * @param __result The asynchronous result. + * @param result The asynchronous result. * @return The Slice type IDs of the interfaces supported by the target object, in base-to-derived * order. The first element of the returned array is always <code>::Ice::Object</code>. **/ - String[] end_ice_ids(AsyncResult __result); + String[] end_ice_ids(AsyncResult result); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. @@ -406,10 +406,10 @@ public interface ObjectPrx /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The Slice type ID of the most-derived interface. **/ - String ice_id(java.util.Map<String, String> __context); + String ice_id(java.util.Map<String, String> context); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. @@ -421,100 +421,100 @@ public interface ObjectPrx /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(java.util.Map<String, String> __context); + AsyncResult begin_ice_id(java.util.Map<String, String> context); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(Callback __cb); + AsyncResult begin_ice_id(Callback cb); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(java.util.Map<String, String> __context, Callback __cb); + AsyncResult begin_ice_id(java.util.Map<String, String> context, Callback cb); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(Callback_Object_ice_id __cb); + AsyncResult begin_ice_id(Callback_Object_ice_id cb); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(java.util.Map<String, String> __context, Callback_Object_ice_id __cb); + AsyncResult begin_ice_id(java.util.Map<String, String> context, Callback_Object_ice_id cb); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_id(IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_id(IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_id(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_id(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_id(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Completes the asynchronous ice_id request. * - * @param __result The asynchronous result. + * @param result The asynchronous result. * @return The Slice type ID of the most-derived interface. **/ - String end_ice_id(AsyncResult __result); + String end_ice_id(AsyncResult result); /** * Invokes an operation dynamically. @@ -543,7 +543,7 @@ public interface ObjectPrx * @param inParams The encoded in-parameters for the operation. * @param outParams The encoded out-paramaters and return value * for the operation. The return value follows any out-parameters. - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return If the operation completed successfully, the return value * is <code>true</code>. If the operation raises a user exception, * the return value is <code>false</code>; in this case, <code>outParams</code> @@ -554,7 +554,7 @@ public interface ObjectPrx * @see OperationMode **/ boolean ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams, - java.util.Map<String, String> __context); + java.util.Map<String, String> context); /** * Invokes an operation dynamically and asynchronously. @@ -576,14 +576,14 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> __context); + java.util.Map<String, String> context); /** * Invokes an operation dynamically and asynchronously. @@ -592,13 +592,13 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ - AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, Callback __cb); + AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, Callback cb); /** * Invokes an operation dynamically and asynchronously. @@ -607,15 +607,15 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> __context, Callback __cb); + java.util.Map<String, String> context, Callback cb); /** * Invokes an operation dynamically and asynchronously. @@ -624,14 +624,14 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - Callback_Object_ice_invoke __cb); + Callback_Object_ice_invoke cb); /** * Invokes an operation dynamically and asynchronously. @@ -640,15 +640,15 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> __context, Callback_Object_ice_invoke __cb); + java.util.Map<String, String> context, Callback_Object_ice_invoke cb); public interface FunctionalCallback_Object_ice_invoke_Response { @@ -662,18 +662,18 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - FunctionalCallback_Object_ice_invoke_Response __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Invokes an operation dynamically and asynchronously. @@ -682,16 +682,16 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - FunctionalCallback_Object_ice_invoke_Response __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Invokes an operation dynamically and asynchronously. @@ -699,21 +699,21 @@ public interface ObjectPrx * @param operation The name of the operation to invoke. * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * for the operation. The return value follows any out-parameters. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> __context, - FunctionalCallback_Object_ice_invoke_Response __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + java.util.Map<String, String> context, + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Invokes an operation dynamically and asynchronously. @@ -721,32 +721,32 @@ public interface ObjectPrx * @param operation The name of the operation to invoke. * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * for the operation. The return value follows any out-parameters. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. * * @see Blobject * @see OperationMode **/ AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> __context, - FunctionalCallback_Object_ice_invoke_Response __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + java.util.Map<String, String> context, + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Completes the asynchronous ice_invoke request. * * @param outParams The encoded out-paramaters and return value. - * @param __result The asynchronous result. + * @param result The asynchronous result. * @return If the operation completed successfully, the return value * is <code>true</code>. If the operation raises a user exception, * the return value is <code>false</code>; in this case, <code>outParams</code> * contains the encoded user exception. If the operation raises a run-time exception, * it throws it directly. **/ - boolean end_ice_invoke(ByteSeqHolder outParams, AsyncResult __result); + boolean end_ice_invoke(ByteSeqHolder outParams, AsyncResult result); /** * Returns the identity embedded in this proxy. @@ -1113,37 +1113,37 @@ public interface ObjectPrx /** * Asynchronously gets the connection for this proxy. The call does not block. * - * @param __cb The callback object to notify the application when the operation is complete. + * @param cb The callback object to notify the application when the operation is complete. * @return The asynchronous result object. **/ - AsyncResult begin_ice_getConnection(Callback __cb); + AsyncResult begin_ice_getConnection(Callback cb); /** * Asynchronously gets the connection for this proxy. The call does not block. * - * @param __cb The callback object to notify the application when the operation is complete. + * @param cb The callback object to notify the application when the operation is complete. * @return The asynchronous result object. **/ - AsyncResult begin_ice_getConnection(Callback_Object_ice_getConnection __cb); + AsyncResult begin_ice_getConnection(Callback_Object_ice_getConnection cb); /** * Asynchronously gets the connection for this proxy. The call does not block. * - * @param __responseCb The callback object to notify the application when there is a response available. - * @param __exceptionCb The callback object to notify the application when an exception occurs while getting + * @param responseCb The callback object to notify the application when there is a response available. + * @param exceptionCb The callback object to notify the application when an exception occurs while getting * the connection. * @return The asynchronous result object. **/ - AsyncResult begin_ice_getConnection(IceInternal.Functional_GenericCallback1<Ice.Connection> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb); + AsyncResult begin_ice_getConnection(IceInternal.Functional_GenericCallback1<Ice.Connection> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb); /** * Completes the asynchronous get connection. * - * @param __result The asynchronous result. + * @param result The asynchronous result. * @return The connection object. **/ - Ice.Connection end_ice_getConnection(AsyncResult __result); + Ice.Connection end_ice_getConnection(AsyncResult result); /** * Returns the cached {@link Connection} for this proxy. If the proxy does not yet have an established @@ -1173,37 +1173,37 @@ public interface ObjectPrx /** * Asynchronously flushes any pending batched requests for this communicator. The call does not block. * - * @param __cb The callback object to notify the application when the flush is complete. + * @param cb The callback object to notify the application when the flush is complete. * @return The asynchronous result object. **/ - AsyncResult begin_ice_flushBatchRequests(Callback __cb); + AsyncResult begin_ice_flushBatchRequests(Callback cb); /** * Asynchronously flushes any pending batched requests for this communicator. The call does not block. * - * @param __cb The callback object to notify the application when the flush is complete. + * @param cb The callback object to notify the application when the flush is complete. * @return The asynchronous result object. **/ - AsyncResult begin_ice_flushBatchRequests(Callback_Object_ice_flushBatchRequests __cb); + AsyncResult begin_ice_flushBatchRequests(Callback_Object_ice_flushBatchRequests cb); /** * Asynchronously flushes any pending batched requests for this communicator. The call does not block. * - * @param __responseCb The asynchronous completion callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous completion callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ - AsyncResult begin_ice_flushBatchRequests(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb); + AsyncResult begin_ice_flushBatchRequests(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb); /** * Completes the asynchronous flush request. * - * @param __result The asynchronous result. + * @param result The asynchronous result. **/ - void end_ice_flushBatchRequests(AsyncResult __result); + void end_ice_flushBatchRequests(AsyncResult result); /** * Returns whether this proxy equals the passed object. Two proxies are equal if they are equal in all respects, @@ -1215,5 +1215,5 @@ public interface ObjectPrx @Override boolean equals(java.lang.Object r); - void __write(OutputStream os); + void _write(OutputStream os); } diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java index 77c758ef68e..6cd18a11792 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelper.java @@ -65,7 +65,7 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase boolean ok = bb.ice_isA("::Ice::Object"); assert(ok); ObjectPrxHelper h = new ObjectPrxHelper(); - h.__copyFrom(bb); + h._copyFrom(bb); d = h; } catch(Ice.FacetNotExistException ex) @@ -98,7 +98,7 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase boolean ok = bb.ice_isA("::Ice::Object", ctx); assert(ok); ObjectPrxHelper h = new ObjectPrxHelper(); - h.__copyFrom(bb); + h._copyFrom(bb); d = h; } catch(Ice.FacetNotExistException ex) @@ -137,7 +137,7 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase { Ice.ObjectPrx bb = b.ice_facet(f); ObjectPrxHelper h = new ObjectPrxHelper(); - h.__copyFrom(bb); + h._copyFrom(bb); d = h; } return d; diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java index fa60f0a62f2..cb6ccb2adb2 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java @@ -59,298 +59,298 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. + * @param id The Slice type ID of an interface. * @return <code>true</code> if this proxy supports the specified interface; <code>false</code>, otherwise. **/ @Override public final boolean - ice_isA(String __id) + ice_isA(String id) { - return ice_isA(__id, null, false); + return _iceI_ice_isA(id, null, false); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. * @return <code>true</code> if this proxy supports the specified interface; <code>false</code>, otherwise. **/ @Override public final boolean - ice_isA(String __id, java.util.Map<String, String> __context) + ice_isA(String id, java.util.Map<String, String> context) { - return ice_isA(__id, __context, true); + return _iceI_ice_isA(id, context, true); } - private static final String __ice_isA_name = "ice_isA"; + private static final String _ice_isA_name = "ice_isA"; private boolean - ice_isA(String __id, java.util.Map<String, String> __context, boolean __explicitCtx) + _iceI_ice_isA(String id, java.util.Map<String, String> context, boolean explicitCtx) { - __checkTwowayOnly(__ice_isA_name); - return end_ice_isA(begin_ice_isA(__id, __context, __explicitCtx, true, null)); + _checkTwowayOnly(_ice_isA_name); + return end_ice_isA(_iceI_begin_ice_isA(id, context, explicitCtx, true, null)); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. + * @param id The Slice type ID of an interface. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id) + begin_ice_isA(String id) { - return begin_ice_isA(__id, null, false, false, null); + return _iceI_begin_ice_isA(id, null, false, false, null); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, java.util.Map<String, String> __context) + begin_ice_isA(String id, java.util.Map<String, String> context) { - return begin_ice_isA(__id, __context, true, false, null); + return _iceI_begin_ice_isA(id, context, true, false, null); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __cb The asynchronous callback object. + * @param id The Slice type ID of an interface. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, Callback __cb) + begin_ice_isA(String id, Callback cb) { - return begin_ice_isA(__id, null, false, false, __cb); + return _iceI_begin_ice_isA(id, null, false, false, cb); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. - * @param __cb The asynchronous callback object. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, java.util.Map<String, String> __context, Callback __cb) + begin_ice_isA(String id, java.util.Map<String, String> context, Callback cb) { - return begin_ice_isA(__id, __context, true, false, __cb); + return _iceI_begin_ice_isA(id, context, true, false, cb); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __cb The asynchronous callback object. + * @param id The Slice type ID of an interface. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, Callback_Object_ice_isA __cb) + begin_ice_isA(String id, Callback_Object_ice_isA cb) { - return begin_ice_isA(__id, null, false, false, __cb); + return _iceI_begin_ice_isA(id, null, false, false, cb); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. - * @param __cb The asynchronous callback object. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, java.util.Map<String, String> __context, Callback_Object_ice_isA __cb) + begin_ice_isA(String id, java.util.Map<String, String> context, Callback_Object_ice_isA cb) { - return begin_ice_isA(__id, __context, true, false, __cb); + return _iceI_begin_ice_isA(id, context, true, false, cb); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param id The Slice type ID of an interface. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, - IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_isA(String id, + IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_isA(__id, null, false, false, __responseCb, __exceptionCb, null); + return _iceI_begin_ice_isA(id, null, false, false, responseCb, exceptionCb, null); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param id The Slice type ID of an interface. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, - IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_isA(String id, + IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_isA(__id, null, false, false, __responseCb, __exceptionCb, __sentCb); + return _iceI_begin_ice_isA(id, null, false, false, responseCb, exceptionCb, sentCb); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, - java.util.Map<String, String> __context, - IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_isA(String id, + java.util.Map<String, String> context, + IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_isA(__id, __context, true, false, __responseCb, __exceptionCb, null); + return _iceI_begin_ice_isA(id, context, true, false, responseCb, exceptionCb, null); } /** * Tests whether this proxy supports a given interface. * - * @param __id The Slice type ID of an interface. - * @param __context The <code>Context</code> map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param id The Slice type ID of an interface. + * @param context The <code>Context</code> map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_isA(String __id, - java.util.Map<String, String> __context, - IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_isA(String id, + java.util.Map<String, String> context, + IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_isA(__id, __context, true, false, __responseCb, __exceptionCb, __sentCb); + return _iceI_begin_ice_isA(id, context, true, false, responseCb, exceptionCb, sentCb); } private AsyncResult - begin_ice_isA(String __id, - java.util.Map<String, String> __context, - boolean __explicitCtx, - boolean __synchronous, - IceInternal.Functional_BoolCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) - { - return begin_ice_isA(__id, __context, __explicitCtx, __synchronous, - new IceInternal.Functional_TwowayCallbackBool(__responseCb, __exceptionCb, __sentCb) - { - @Override - public final void __completed(AsyncResult __result) - { - ObjectPrxHelperBase.__ice_isA_completed(this, __result); - } - }); + _iceI_begin_ice_isA(String id, + java.util.Map<String, String> context, + boolean explicitCtx, + boolean synchronous, + IceInternal.Functional_BoolCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) + { + return _iceI_begin_ice_isA(id, context, explicitCtx, synchronous, + new IceInternal.Functional_TwowayCallbackBool(responseCb, exceptionCb, sentCb) + { + @Override + public final void _iceCompleted(AsyncResult result) + { + ObjectPrxHelperBase._iceI_ice_isA_completed(this, result); + } + }); } private AsyncResult - begin_ice_isA(String __id, java.util.Map<String, String> __context, boolean __explicitCtx, - boolean __synchronous, IceInternal.CallbackBase __cb) + _iceI_begin_ice_isA(String id, java.util.Map<String, String> context, boolean explicitCtx, + boolean synchronous, IceInternal.CallbackBase cb) { - __checkAsyncTwowayOnly(__ice_isA_name); - IceInternal.OutgoingAsync __result = getOutgoingAsync(__ice_isA_name, __cb); + _checkAsyncTwowayOnly(_ice_isA_name); + IceInternal.OutgoingAsync result = getOutgoingAsync(_ice_isA_name, cb); try { - __result.prepare(__ice_isA_name, OperationMode.Nonmutating, __context, __explicitCtx, __synchronous); - OutputStream __os = __result.startWriteParams(Ice.FormatType.DefaultFormat); - __os.writeString(__id); - __result.endWriteParams(); - __result.invoke(); + result.prepare(_ice_isA_name, OperationMode.Nonmutating, context, explicitCtx, synchronous); + OutputStream ostr = result.startWriteParams(Ice.FormatType.DefaultFormat); + ostr.writeString(id); + result.endWriteParams(); + result.invoke(); } - catch(Exception __ex) + catch(Exception ex) { - __result.abort(__ex); + result.abort(ex); } - return __result; + return result; } /** * Completes the asynchronous ice_isA request. * - * @param __r The asynchronous result. + * @param r The asynchronous result. * @return <code>true</code> if this proxy supports the specified interface; <code>false</code>, otherwise. **/ @Override public final boolean - end_ice_isA(AsyncResult __r) + end_ice_isA(AsyncResult r) { - IceInternal.OutgoingAsync __result = IceInternal.OutgoingAsync.check(__r, this, __ice_isA_name); + IceInternal.OutgoingAsync result = IceInternal.OutgoingAsync.check(r, this, _ice_isA_name); try { - if(!__result.__wait()) + if(!result.waitForResponseOrUserEx()) { try { - __result.throwUserException(); + result.throwUserException(); } - catch(UserException __ex) + catch(UserException ex) { - throw new UnknownUserException(__ex.ice_id(), __ex); + throw new UnknownUserException(ex.ice_id(), ex); } } - boolean __ret; - InputStream __is = __result.startReadParams(); - __ret = __is.readBool(); - __result.endReadParams(); - return __ret; + boolean ret; + InputStream istr = result.startReadParams(); + ret = istr.readBool(); + result.endReadParams(); + return ret; } finally { - if(__result != null) + if(result != null) { - __result.cacheMessageBuffers(); + result.cacheMessageBuffers(); } } } - static public void __ice_isA_completed(TwowayCallbackBool __cb, AsyncResult __result) + static public void _iceI_ice_isA_completed(TwowayCallbackBool cb, AsyncResult result) { - boolean __ret = false; + boolean ret = false; try { - __ret = __result.getProxy().end_ice_isA(__result); + ret = result.getProxy().end_ice_isA(result); } - catch(LocalException __ex) + catch(LocalException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - catch(SystemException __ex) + catch(SystemException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - __cb.response(__ret); + cb.response(ret); } /** @@ -360,27 +360,27 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final void ice_ping() { - ice_ping(null, false); + _iceI_ice_ping(null, false); } /** * Tests whether the target object of this proxy can be reached. * - * @param __context The <code>Context</code> map for the invocation. + * @param context The <code>Context</code> map for the invocation. **/ @Override public final void - ice_ping(java.util.Map<String, String> __context) + ice_ping(java.util.Map<String, String> context) { - ice_ping(__context, true); + _iceI_ice_ping(context, true); } - private static final String __ice_ping_name = "ice_ping"; + private static final String _ice_ping_name = "ice_ping"; private void - ice_ping(java.util.Map<String, String> __context, boolean __explicitCtx) + _iceI_ice_ping(java.util.Map<String, String> context, boolean explicitCtx) { - end_ice_ping(begin_ice_ping(__context, __explicitCtx, true, null)); + end_ice_ping(_iceI_begin_ice_ping(context, explicitCtx, true, null)); } /** @@ -392,175 +392,175 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final AsyncResult begin_ice_ping() { - return begin_ice_ping(null, false, false, null); + return _iceI_begin_ice_ping(null, false, false, null); } /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(java.util.Map<String, String> __context) + begin_ice_ping(java.util.Map<String, String> context) { - return begin_ice_ping(__context, true, false, null); + return _iceI_begin_ice_ping(context, true, false, null); } /** * Tests whether the target object of this proxy can be reached. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(Callback __cb) + begin_ice_ping(Callback cb) { - return begin_ice_ping(null, false, false, __cb); + return _iceI_begin_ice_ping(null, false, false, cb); } /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(java.util.Map<String, String> __context, Callback __cb) + begin_ice_ping(java.util.Map<String, String> context, Callback cb) { - return begin_ice_ping(__context, true, false, __cb); + return _iceI_begin_ice_ping(context, true, false, cb); } /** * Tests whether the target object of this proxy can be reached. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(Callback_Object_ice_ping __cb) + begin_ice_ping(Callback_Object_ice_ping cb) { - return begin_ice_ping(null, false, false, __cb); + return _iceI_begin_ice_ping(null, false, false, cb); } /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(java.util.Map<String, String> __context, Callback_Object_ice_ping __cb) + begin_ice_ping(java.util.Map<String, String> context, Callback_Object_ice_ping cb) { - return begin_ice_ping(__context, true, false, __cb); + return _iceI_begin_ice_ping(context, true, false, cb); } /** * Tests whether the target object of this proxy can be reached. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_ping(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_ping(null, false, false, - new IceInternal.Functional_OnewayCallback(__responseCb, __exceptionCb, null)); + return _iceI_begin_ice_ping(null, false, false, + new IceInternal.Functional_OnewayCallback(responseCb, exceptionCb, null)); } /** * Tests whether the target object of this proxy can be reached. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_ping(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_ping(null, false, false, new IceInternal.Functional_OnewayCallback(__responseCb, - __exceptionCb, __sentCb)); + return _iceI_begin_ice_ping(null, false, false, new IceInternal.Functional_OnewayCallback(responseCb, + exceptionCb, sentCb)); } /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(java.util.Map<String, String> __context, - IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_ping(java.util.Map<String, String> context, + IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_ping(__context, true, false, new IceInternal.Functional_OnewayCallback(__responseCb, - __exceptionCb, null)); + return _iceI_begin_ice_ping(context, true, false, new IceInternal.Functional_OnewayCallback(responseCb, + exceptionCb, null)); } /** * Tests whether the target object of this proxy can be reached. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ping(java.util.Map<String, String> __context, - IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_ping(java.util.Map<String, String> context, + IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_ping(__context, true, false, - new IceInternal.Functional_OnewayCallback(__responseCb, __exceptionCb, __sentCb)); + return _iceI_begin_ice_ping(context, true, false, + new IceInternal.Functional_OnewayCallback(responseCb, exceptionCb, sentCb)); } - private AsyncResult begin_ice_ping(java.util.Map<String, String> __context, boolean __explicitCtx, - boolean __synchronous, IceInternal.CallbackBase __cb) + private AsyncResult _iceI_begin_ice_ping(java.util.Map<String, String> context, boolean explicitCtx, + boolean synchronous, IceInternal.CallbackBase cb) { - IceInternal.OutgoingAsync __result = getOutgoingAsync(__ice_ping_name, __cb); + IceInternal.OutgoingAsync result = getOutgoingAsync(_ice_ping_name, cb); try { - __result.prepare(__ice_ping_name, OperationMode.Nonmutating, __context, __explicitCtx, __synchronous); - __result.writeEmptyParams(); - __result.invoke(); + result.prepare(_ice_ping_name, OperationMode.Nonmutating, context, explicitCtx, synchronous); + result.writeEmptyParams(); + result.invoke(); } - catch(Exception __ex) + catch(Exception ex) { - __result.abort(__ex); + result.abort(ex); } - return __result; + return result; } /** * Completes the asynchronous ping request. * - * @param __result The asynchronous result. + * @param result The asynchronous result. **/ @Override public final void - end_ice_ping(AsyncResult __result) + end_ice_ping(AsyncResult result) { - __end(__result, __ice_ping_name); + _end(result, _ice_ping_name); } /** @@ -573,30 +573,30 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final String[] ice_ids() { - return ice_ids(null, false); + return _iceI_ice_ids(null, false); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The <code>Context</code> map for the invocation. + * @param context The <code>Context</code> map for the invocation. * @return The Slice type IDs of the interfaces supported by the target object, in base-to-derived * order. The first element of the returned array is always <code>::Ice::Object</code>. **/ @Override public final String[] - ice_ids(java.util.Map<String, String> __context) + ice_ids(java.util.Map<String, String> context) { - return ice_ids(__context, true); + return _iceI_ice_ids(context, true); } - private static final String __ice_ids_name = "ice_ids"; + private static final String _ice_ids_name = "ice_ids"; private String[] - ice_ids(java.util.Map<String, String> __context, boolean __explicitCtx) + _iceI_ice_ids(java.util.Map<String, String> context, boolean explicitCtx) { - __checkTwowayOnly(__ice_id_name); - return end_ice_ids(begin_ice_ids(__context, __explicitCtx, true, null)); + _checkTwowayOnly(_ice_id_name); + return end_ice_ids(_iceI_begin_ice_ids(context, explicitCtx, true, null)); } /** @@ -608,240 +608,240 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final AsyncResult begin_ice_ids() { - return begin_ice_ids(null, false, false, null); + return _iceI_begin_ice_ids(null, false, false, null); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(java.util.Map<String, String> __context) + begin_ice_ids(java.util.Map<String, String> context) { - return begin_ice_ids(__context, true, false, null); + return _iceI_begin_ice_ids(context, true, false, null); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(Callback __cb) + begin_ice_ids(Callback cb) { - return begin_ice_ids(null, false, false,__cb); + return _iceI_begin_ice_ids(null, false, false,cb); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(java.util.Map<String, String> __context, Callback __cb) + begin_ice_ids(java.util.Map<String, String> context, Callback cb) { - return begin_ice_ids(__context, true, false,__cb); + return _iceI_begin_ice_ids(context, true, false,cb); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(Callback_Object_ice_ids __cb) + begin_ice_ids(Callback_Object_ice_ids cb) { - return begin_ice_ids(null, false, false,__cb); + return _iceI_begin_ice_ids(null, false, false,cb); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(java.util.Map<String, String> __context, Callback_Object_ice_ids __cb) + begin_ice_ids(java.util.Map<String, String> context, Callback_Object_ice_ids cb) { - return begin_ice_ids(__context, true, false,__cb); + return _iceI_begin_ice_ids(context, true, false,cb); } private class FunctionalCallback_Object_ice_ids extends IceInternal.Functional_TwowayCallbackArg1<String[]> { - FunctionalCallback_Object_ice_ids(IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + FunctionalCallback_Object_ice_ids(IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - super(__responseCb, __exceptionCb, __sentCb); + super(responseCb, exceptionCb, sentCb); } @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_ids_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_ids_completed(this, result); } } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_ids(null, false, false, new FunctionalCallback_Object_ice_ids(__responseCb, __exceptionCb, - null)); + return _iceI_begin_ice_ids(null, false, false, new FunctionalCallback_Object_ice_ids(responseCb, exceptionCb, + null)); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_ids(IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_ids(null, false, false, new FunctionalCallback_Object_ice_ids(__responseCb, __exceptionCb, - __sentCb)); + return _iceI_begin_ice_ids(null, false, false, new FunctionalCallback_Object_ice_ids(responseCb, exceptionCb, + sentCb)); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_ids(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_ids(__context, true, false, new FunctionalCallback_Object_ice_ids(__responseCb, __exceptionCb, - null)); + return _iceI_begin_ice_ids(context, true, false, new FunctionalCallback_Object_ice_ids(responseCb, exceptionCb, + null)); } /** * Returns the Slice type IDs of the interfaces supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_ids(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String[]> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_ids(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String[]> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_ids(__context, true, false, - new FunctionalCallback_Object_ice_ids(__responseCb, __exceptionCb, __sentCb)); + return _iceI_begin_ice_ids(context, true, false, + new FunctionalCallback_Object_ice_ids(responseCb, exceptionCb, sentCb)); } - private AsyncResult begin_ice_ids(java.util.Map<String, String> __context, boolean __explicitCtx, - boolean __synchronous, IceInternal.CallbackBase __cb) + private AsyncResult _iceI_begin_ice_ids(java.util.Map<String, String> context, boolean explicitCtx, + boolean synchronous, IceInternal.CallbackBase cb) { - __checkAsyncTwowayOnly(__ice_ids_name); - IceInternal.OutgoingAsync __result = getOutgoingAsync(__ice_ids_name, __cb); + _checkAsyncTwowayOnly(_ice_ids_name); + IceInternal.OutgoingAsync result = getOutgoingAsync(_ice_ids_name, cb); try { - __result.prepare(__ice_ids_name, OperationMode.Nonmutating, __context, __explicitCtx, __synchronous); - __result.writeEmptyParams(); - __result.invoke(); + result.prepare(_ice_ids_name, OperationMode.Nonmutating, context, explicitCtx, synchronous); + result.writeEmptyParams(); + result.invoke(); } - catch(Exception __ex) + catch(Exception ex) { - __result.abort(__ex); + result.abort(ex); } - return __result; + return result; } /** * Completes the asynchronous ice_ids request. * - * @param __r The asynchronous result. + * @param r The asynchronous result. * @return The Slice type IDs of the interfaces supported by the target object, in base-to-derived * order. The first element of the returned array is always <code>::Ice::Object</code>. **/ @Override public final String[] - end_ice_ids(AsyncResult __r) + end_ice_ids(AsyncResult r) { - IceInternal.OutgoingAsync __result = IceInternal.OutgoingAsync.check(__r, this, __ice_ids_name); + IceInternal.OutgoingAsync result = IceInternal.OutgoingAsync.check(r, this, _ice_ids_name); try { - if(!__result.__wait()) + if(!result.waitForResponseOrUserEx()) { try { - __result.throwUserException(); + result.throwUserException(); } - catch(UserException __ex) + catch(UserException ex) { - throw new UnknownUserException(__ex.ice_id(), __ex); + throw new UnknownUserException(ex.ice_id(), ex); } } - String[] __ret = null; - InputStream __is = __result.startReadParams(); - __ret = StringSeqHelper.read(__is); - __result.endReadParams(); - return __ret; + String[] ret = null; + InputStream istr = result.startReadParams(); + ret = StringSeqHelper.read(istr); + result.endReadParams(); + return ret; } finally { - if(__result != null) + if(result != null) { - __result.cacheMessageBuffers(); + result.cacheMessageBuffers(); } } } - static public void __ice_ids_completed(TwowayCallbackArg1<String[]> __cb, AsyncResult __result) + static public void _iceI_ice_ids_completed(TwowayCallbackArg1<String[]> cb, AsyncResult result) { - String[] __ret = null; + String[] ret = null; try { - __ret = __result.getProxy().end_ice_ids(__result); + ret = result.getProxy().end_ice_ids(result); } - catch(LocalException __ex) + catch(LocalException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - catch(SystemException __ex) + catch(SystemException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - __cb.response(__ret); + cb.response(ret); } /** @@ -853,29 +853,29 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final String ice_id() { - return ice_id(null, false); + return _iceI_ice_id(null, false); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The <code>Context</code> map for the invocation. + * @param context The <code>Context</code> map for the invocation. * @return The Slice type ID of the most-derived interface. **/ @Override public final String - ice_id(java.util.Map<String, String> __context) + ice_id(java.util.Map<String, String> context) { - return ice_id(__context, true); + return _iceI_ice_id(context, true); } - private static final String __ice_id_name = "ice_id"; + private static final String _ice_id_name = "ice_id"; private String - ice_id(java.util.Map<String, String> __context, boolean __explicitCtx) + _iceI_ice_id(java.util.Map<String, String> context, boolean explicitCtx) { - __checkTwowayOnly(__ice_id_name); - return end_ice_id(begin_ice_id(__context, __explicitCtx, true, null)); + _checkTwowayOnly(_ice_id_name); + return end_ice_id(_iceI_begin_ice_id(context, explicitCtx, true, null)); } /** @@ -887,74 +887,74 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final AsyncResult begin_ice_id() { - return begin_ice_id(null, false, false, null); + return _iceI_begin_ice_id(null, false, false, null); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(java.util.Map<String, String> __context) + begin_ice_id(java.util.Map<String, String> context) { - return begin_ice_id(__context, true, false, null); + return _iceI_begin_ice_id(context, true, false, null); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(Callback __cb) + begin_ice_id(Callback cb) { - return begin_ice_id(null, false, false, __cb); + return _iceI_begin_ice_id(null, false, false, cb); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(java.util.Map<String, String> __context, Callback __cb) + begin_ice_id(java.util.Map<String, String> context, Callback cb) { - return begin_ice_id(__context, true, false, __cb); + return _iceI_begin_ice_id(context, true, false, cb); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(Callback_Object_ice_id __cb) + begin_ice_id(Callback_Object_ice_id cb) { - return begin_ice_id(null, false, false, __cb); + return _iceI_begin_ice_id(null, false, false, cb); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(java.util.Map<String, String> __context, Callback_Object_ice_id __cb) + begin_ice_id(java.util.Map<String, String> context, Callback_Object_ice_id cb) { - return begin_ice_id(__context, true, false, __cb); + return _iceI_begin_ice_id(context, true, false, cb); } private class FunctionalCallback_Object_ice_id extends IceInternal.Functional_TwowayCallbackArg1<String> @@ -967,156 +967,156 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_id_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_id_completed(this, result); } } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_id(IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_id(null, false, false, new FunctionalCallback_Object_ice_id(__responseCb, __exceptionCb, null)); + return _iceI_begin_ice_id(null, false, false, new FunctionalCallback_Object_ice_id(responseCb, exceptionCb, null)); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_id(IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_id(null, false, false, new FunctionalCallback_Object_ice_id(__responseCb, __exceptionCb, __sentCb)); + return _iceI_begin_ice_id(null, false, false, new FunctionalCallback_Object_ice_id(responseCb, exceptionCb, sentCb)); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_id(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_id(__context, true, false, new FunctionalCallback_Object_ice_id(__responseCb, __exceptionCb, null)); + return _iceI_begin_ice_id(context, true, false, new FunctionalCallback_Object_ice_id(responseCb, exceptionCb, null)); } /** * Returns the Slice type ID of the most-derived interface supported by the target object of this proxy. * - * @param __context The context map for the invocation. - * @param __responseCb The asynchronous response callback object. - * @param __exceptionCb The asynchronous exception callback object. - * @param __sentCb The asynchronous sent callback object. + * @param context The context map for the invocation. + * @param responseCb The asynchronous response callback object. + * @param exceptionCb The asynchronous exception callback object. + * @param sentCb The asynchronous sent callback object. * @return The asynchronous result object. **/ @Override public final AsyncResult - begin_ice_id(java.util.Map<String, String> __context, - IceInternal.Functional_GenericCallback1<String> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_id(java.util.Map<String, String> context, + IceInternal.Functional_GenericCallback1<String> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_id(__context, true, false, - new FunctionalCallback_Object_ice_id(__responseCb, __exceptionCb, __sentCb)); + return _iceI_begin_ice_id(context, true, false, + new FunctionalCallback_Object_ice_id(responseCb, exceptionCb, sentCb)); } - private AsyncResult begin_ice_id(java.util.Map<String, String> __context, boolean __explicitCtx, - boolean __synchronous, IceInternal.CallbackBase __cb) + private AsyncResult _iceI_begin_ice_id(java.util.Map<String, String> context, boolean explicitCtx, + boolean synchronous, IceInternal.CallbackBase cb) { - __checkAsyncTwowayOnly(__ice_id_name); - IceInternal.OutgoingAsync __result = getOutgoingAsync(__ice_id_name, __cb); + _checkAsyncTwowayOnly(_ice_id_name); + IceInternal.OutgoingAsync result = getOutgoingAsync(_ice_id_name, cb); try { - __result.prepare(__ice_id_name, OperationMode.Nonmutating, __context, __explicitCtx, __synchronous); - __result.writeEmptyParams(); - __result.invoke(); + result.prepare(_ice_id_name, OperationMode.Nonmutating, context, explicitCtx, synchronous); + result.writeEmptyParams(); + result.invoke(); } - catch(Exception __ex) + catch(Exception ex) { - __result.abort(__ex); + result.abort(ex); } - return __result; + return result; } /** * Completes the asynchronous ice_id request. * - * @param __r The asynchronous result. + * @param r The asynchronous result. * @return The Slice type ID of the most-derived interface. **/ @Override public final String - end_ice_id(AsyncResult __r) + end_ice_id(AsyncResult r) { - IceInternal.OutgoingAsync __result = IceInternal.OutgoingAsync.check(__r, this, __ice_id_name); + IceInternal.OutgoingAsync result = IceInternal.OutgoingAsync.check(r, this, _ice_id_name); try { - if(!__result.__wait()) + if(!result.waitForResponseOrUserEx()) { try { - __result.throwUserException(); + result.throwUserException(); } - catch(UserException __ex) + catch(UserException ex) { - throw new UnknownUserException(__ex.ice_id(), __ex); + throw new UnknownUserException(ex.ice_id(), ex); } } - String __ret = null; - InputStream __is = __result.startReadParams(); - __ret = __is.readString(); - __result.endReadParams(); - return __ret; + String ret = null; + InputStream istr = result.startReadParams(); + ret = istr.readString(); + result.endReadParams(); + return ret; } finally { - if(__result != null) + if(result != null) { - __result.cacheMessageBuffers(); + result.cacheMessageBuffers(); } } } - static public void __ice_id_completed(TwowayCallbackArg1<String> __cb, AsyncResult __result) + static public void _iceI_ice_id_completed(TwowayCallbackArg1<String> cb, AsyncResult result) { - String __ret = null; + String ret = null; try { - __ret = __result.getProxy().end_ice_id(__result); + ret = result.getProxy().end_ice_id(result); } - catch(LocalException __ex) + catch(LocalException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - catch(SystemException __ex) + catch(SystemException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - __cb.response(__ret); + cb.response(ret); } /** @@ -1140,7 +1140,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final boolean ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams) { - return ice_invoke(operation, mode, inParams, outParams, null, false); + return _iceI_ice_invoke(operation, mode, inParams, outParams, null, false); } /** @@ -1164,17 +1164,17 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams, java.util.Map<String, String> context) { - return ice_invoke(operation, mode, inParams, outParams, context, true); + return _iceI_ice_invoke(operation, mode, inParams, outParams, context, true); } private boolean - ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams, - java.util.Map<String, String> context, boolean explicitCtx) + _iceI_ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams, + java.util.Map<String, String> context, boolean explicitCtx) { - return end_ice_invoke(outParams, begin_ice_invoke(operation, mode, inParams, context, explicitCtx, true, null)); + return end_ice_invoke(outParams, _iceI_begin_ice_invoke(operation, mode, inParams, context, explicitCtx, true, null)); } - private static final String __ice_invoke_name = "ice_invoke"; + private static final String _ice_invoke_name = "ice_invoke"; /** * Invokes an operation dynamically and asynchronously. @@ -1191,7 +1191,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public final AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams) { - return begin_ice_invoke(operation, mode, inParams, null, false, false, null); + return _iceI_begin_ice_invoke(operation, mode, inParams, null, false, false, null); } /** @@ -1201,7 +1201,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __context The context map for the invocation. + * @param context The context map for the invocation. * @return The asynchronous result object. * * @see Blobject @@ -1210,9 +1210,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable @Override public final AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> __context) + java.util.Map<String, String> context) { - return begin_ice_invoke(operation, mode, inParams, __context, true, false, null); + return _iceI_begin_ice_invoke(operation, mode, inParams, context, true, false, null); } /** @@ -1222,7 +1222,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject @@ -1230,9 +1230,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult - begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, Callback __cb) + begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, Callback cb) { - return begin_ice_invoke(operation, mode, inParams, null, false, false, __cb); + return _iceI_begin_ice_invoke(operation, mode, inParams, null, false, false, cb); } /** @@ -1242,8 +1242,8 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject @@ -1251,10 +1251,10 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult - begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, java.util.Map<String, String> __context, - Callback __cb) + begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, java.util.Map<String, String> context, + Callback cb) { - return begin_ice_invoke(operation, mode, inParams, __context, true, false, __cb); + return _iceI_begin_ice_invoke(operation, mode, inParams, context, true, false, cb); } /** @@ -1264,7 +1264,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __cb The asynchronous callback object. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject @@ -1272,9 +1272,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult - begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, Callback_Object_ice_invoke __cb) + begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, Callback_Object_ice_invoke cb) { - return begin_ice_invoke(operation, mode, inParams, null, false, false, __cb); + return _iceI_begin_ice_invoke(operation, mode, inParams, null, false, false, cb); } /** @@ -1284,8 +1284,8 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * for the operation. The return value follows any out-parameters. - * @param __context The context map for the invocation. - * @param __cb The asynchronous callback object. + * @param context The context map for the invocation. + * @param cb The asynchronous callback object. * @return The asynchronous result object. * * @see Blobject @@ -1293,10 +1293,10 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult - begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, java.util.Map<String, String> __context, - Callback_Object_ice_invoke __cb) + begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, java.util.Map<String, String> context, + Callback_Object_ice_invoke cb) { - return begin_ice_invoke(operation, mode, inParams, __context, true, false, __cb); + return _iceI_begin_ice_invoke(operation, mode, inParams, context, true, false, cb); } /** @@ -1316,11 +1316,11 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - FunctionalCallback_Object_ice_invoke_Response responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, - IceInternal.Functional_BoolCallback sentCb) + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_invoke(operation, mode, inParams, null, false, false, responseCb, exceptionCb, sentCb); + return _iceI_begin_ice_invoke(operation, mode, inParams, null, false, false, responseCb, exceptionCb, sentCb); } /** @@ -1339,10 +1339,10 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - FunctionalCallback_Object_ice_invoke_Response responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_invoke(operation, mode, inParams, null, false, false, responseCb, exceptionCb, null); + return _iceI_begin_ice_invoke(operation, mode, inParams, null, false, false, responseCb, exceptionCb, null); } /** @@ -1363,12 +1363,12 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> context, - FunctionalCallback_Object_ice_invoke_Response responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, - IceInternal.Functional_BoolCallback sentCb) + java.util.Map<String, String> context, + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_invoke(operation, mode, inParams, context, true, false, responseCb, exceptionCb, sentCb); + return _iceI_begin_ice_invoke(operation, mode, inParams, context, true, false, responseCb, exceptionCb, sentCb); } /** @@ -1388,20 +1388,20 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> context, - FunctionalCallback_Object_ice_invoke_Response responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) + java.util.Map<String, String> context, + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_invoke(operation, mode, inParams, context, true, false, responseCb, exceptionCb, null); + return _iceI_begin_ice_invoke(operation, mode, inParams, context, true, false, responseCb, exceptionCb, null); } - private AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, - java.util.Map<String, String> __context, - boolean __explicitCtx, - boolean __synchronous, - FunctionalCallback_Object_ice_invoke_Response __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + private AsyncResult _iceI_begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, + java.util.Map<String, String> context, + boolean explicitCtx, + boolean synchronous, + FunctionalCallback_Object_ice_invoke_Response responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { class CB extends IceInternal.Functional_TwowayCallback implements _Callback_Object_ice_invoke { @@ -1410,50 +1410,50 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable IceInternal.Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } @Override - public void response(boolean __ret, byte[] outParams) + public void response(boolean ret, byte[] outParams) { - __responseCb.apply(__ret, outParams); + _responseCb.apply(ret, outParams); } @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_invoke_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_invoke_completed(this, result); } - FunctionalCallback_Object_ice_invoke_Response __responseCb; + FunctionalCallback_Object_ice_invoke_Response _responseCb; } - return begin_ice_invoke(operation, mode, inParams, __context, __explicitCtx, __synchronous, - new CB(__responseCb, __exceptionCb, __sentCb)); + return _iceI_begin_ice_invoke(operation, mode, inParams, context, explicitCtx, synchronous, + new CB(responseCb, exceptionCb, sentCb)); } private AsyncResult - begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, java.util.Map<String, String> __context, - boolean __explicitCtx, boolean __synchronous, IceInternal.CallbackBase __cb) + _iceI_begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, java.util.Map<String, String> context, + boolean explicitCtx, boolean synchronous, IceInternal.CallbackBase cb) { - IceInternal.OutgoingAsync __result = getOutgoingAsync(__ice_invoke_name, __cb); + IceInternal.OutgoingAsync result = getOutgoingAsync(_ice_invoke_name, cb); try { - __result.prepare(operation, mode, __context, __explicitCtx, __synchronous); - __result.writeParamEncaps(inParams); - __result.invoke(); + result.prepare(operation, mode, context, explicitCtx, synchronous); + result.writeParamEncaps(inParams); + result.invoke(); } - catch(Exception __ex) + catch(Exception ex) { - __result.abort(__ex); + result.abort(ex); } - return __result; + return result; } /** * Completes the asynchronous ice_invoke request. * * @param outParams The encoded out-paramaters and return value. - * @param __r The asynchronous result. + * @param r The asynchronous result. * @return If the operation completed successfully, the return value * is <code>true</code>. If the operation raises a user exception, * the return value is <code>false</code>; in this case, <code>outParams</code> @@ -1462,49 +1462,49 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final boolean - end_ice_invoke(ByteSeqHolder outParams, AsyncResult __r) + end_ice_invoke(ByteSeqHolder outParams, AsyncResult r) { - IceInternal.OutgoingAsync __result = IceInternal.OutgoingAsync.check(__r, this, __ice_invoke_name); + IceInternal.OutgoingAsync result = IceInternal.OutgoingAsync.check(r, this, _ice_invoke_name); try { - boolean ok = __result.__wait(); + boolean ok = result.waitForResponseOrUserEx(); if(_reference.getMode() == IceInternal.Reference.ModeTwoway) { if(outParams != null) { - outParams.value = __result.readParamEncaps(); + outParams.value = result.readParamEncaps(); } } return ok; } finally { - if(__result != null) + if(result != null) { - __result.cacheMessageBuffers(); + result.cacheMessageBuffers(); } } } - public static void __ice_invoke_completed(_Callback_Object_ice_invoke __cb, AsyncResult __result) + public static void _iceI_ice_invoke_completed(_Callback_Object_ice_invoke cb, AsyncResult result) { ByteSeqHolder outParams = new ByteSeqHolder(); - boolean __ret = false; + boolean ret = false; try { - __ret = __result.getProxy().end_ice_invoke(outParams, __result); + ret = result.getProxy().end_ice_invoke(outParams, result); } - catch(LocalException __ex) + catch(LocalException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - catch(SystemException __ex) + catch(SystemException ex) { - __cb.exception(__ex); + cb.exception(ex); return; } - __cb.response(__ret, outParams.value); + cb.response(ret, outParams.value); } /** @@ -1540,7 +1540,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable else { ObjectPrxHelperBase proxy = new ObjectPrxHelperBase(); - proxy.__setup(_reference.changeIdentity(newIdentity)); + proxy._setup(_reference.changeIdentity(newIdentity)); return proxy; } } @@ -1553,7 +1553,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable **/ @Override public final java.util.Map<String, String> - ice_getContext() + ice_getContext() { return new java.util.HashMap<String, String>(_reference.getContext()); } @@ -1605,7 +1605,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable else { ObjectPrxHelperBase proxy = new ObjectPrxHelperBase(); - proxy.__setup(_reference.changeFacet(newFacet)); + proxy._setup(_reference.changeFacet(newFacet)); return proxy; } } @@ -2285,75 +2285,75 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_getConnection() { - return begin_ice_getConnectionInternal(null); + return _iceI_begin_ice_getConnectionInternal(null); } /** * Asynchronously gets the connection for this proxy. The call does not block. * - * @param __cb The callback object to notify the application when the flush is complete. + * @param cb The callback object to notify the application when the flush is complete. * @return The asynchronous result object. **/ @Override public AsyncResult - begin_ice_getConnection(Callback __cb) + begin_ice_getConnection(Callback cb) { - return begin_ice_getConnectionInternal(__cb); + return _iceI_begin_ice_getConnectionInternal(cb); } /** * Asynchronously gets the connection for this proxy. The call does not block. * - * @param __cb The callback object to notify the application when the flush is complete. + * @param cb The callback object to notify the application when the flush is complete. * @return The asynchronous result object. **/ @Override public AsyncResult - begin_ice_getConnection(Callback_Object_ice_getConnection __cb) + begin_ice_getConnection(Callback_Object_ice_getConnection cb) { - return begin_ice_getConnectionInternal(__cb); + return _iceI_begin_ice_getConnectionInternal(cb); } private class FunctionalCallback_Object_ice_getConnection extends IceInternal.Functional_TwowayCallbackArg1<Ice.Connection> { FunctionalCallback_Object_ice_getConnection( - IceInternal.Functional_GenericCallback1<Ice.Connection> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + IceInternal.Functional_GenericCallback1<Ice.Connection> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - super(__responseCb, __exceptionCb, null); + super(responseCb, exceptionCb, null); } @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { - ObjectPrxHelperBase.__ice_getConnection_completed(this, __result); + ObjectPrxHelperBase._iceI_ice_getConnection_completed(this, result); } } /** * Asynchronously gets the connection for this proxy. The call does not block. * - * @param __responseCb The callback object to notify the application when the there is a response available. - * @param __exceptionCb The callback object to notify the application when the there is an exception getting + * @param responseCb The callback object to notify the application when the there is a response available. + * @param exceptionCb The callback object to notify the application when the there is an exception getting * connection. * @return The asynchronous result object. **/ @Override public AsyncResult - begin_ice_getConnection(IceInternal.Functional_GenericCallback1<Ice.Connection> __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb) + begin_ice_getConnection(IceInternal.Functional_GenericCallback1<Ice.Connection> responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb) { - return begin_ice_getConnectionInternal( - new FunctionalCallback_Object_ice_getConnection(__responseCb, __exceptionCb)); + return _iceI_begin_ice_getConnectionInternal( + new FunctionalCallback_Object_ice_getConnection(responseCb, exceptionCb)); } - private static final String __ice_getConnection_name = "ice_getConnection"; + private static final String _ice_getConnection_name = "ice_getConnection"; private AsyncResult - begin_ice_getConnectionInternal(IceInternal.CallbackBase cb) + _iceI_begin_ice_getConnectionInternal(IceInternal.CallbackBase cb) { - IceInternal.ProxyGetConnection result = new IceInternal.ProxyGetConnection(this, __ice_getConnection_name, cb); + IceInternal.ProxyGetConnection result = new IceInternal.ProxyGetConnection(this, _ice_getConnection_name, cb); try { result.invoke(); @@ -2369,12 +2369,12 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public Ice.Connection end_ice_getConnection(AsyncResult r) { - IceInternal.ProxyGetConnection result = IceInternal.ProxyGetConnection.check(r, this, __ice_getConnection_name); - result.__wait(); + IceInternal.ProxyGetConnection result = IceInternal.ProxyGetConnection.check(r, this, _ice_getConnection_name); + result.waitForResponseOrUserEx(); return result.getConnection(); } - static public void __ice_getConnection_completed(TwowayCallbackArg1<Ice.Connection> cb, AsyncResult result) + static public void _iceI_ice_getConnection_completed(TwowayCallbackArg1<Ice.Connection> cb, AsyncResult result) { Ice.Connection ret = null; try @@ -2447,59 +2447,59 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_flushBatchRequests() { - return begin_ice_flushBatchRequestsInternal(null); + return _iceI_begin_ice_flushBatchRequestsInternal(null); } /** * Asynchronously flushes any pending batched requests for this communicator. The call does not block. * - * @param __cb The callback object to notify the application when the flush is complete. + * @param cb The callback object to notify the application when the flush is complete. * @return The asynchronous result object. **/ @Override public AsyncResult - begin_ice_flushBatchRequests(Callback __cb) + begin_ice_flushBatchRequests(Callback cb) { - return begin_ice_flushBatchRequestsInternal(__cb); + return _iceI_begin_ice_flushBatchRequestsInternal(cb); } /** * Asynchronously flushes any pending batched requests for this communicator. The call does not block. * - * @param __cb The callback object to notify the application when the flush is complete. + * @param cb The callback object to notify the application when the flush is complete. * @return The asynchronous result object. **/ @Override public AsyncResult - begin_ice_flushBatchRequests(Callback_Object_ice_flushBatchRequests __cb) + begin_ice_flushBatchRequests(Callback_Object_ice_flushBatchRequests cb) { - return begin_ice_flushBatchRequestsInternal(__cb); + return _iceI_begin_ice_flushBatchRequestsInternal(cb); } /** * Asynchronously flushes any pending batched requests for this communicator. The call does not block. * - * @param __exceptionCb The callback object to notify the application when the there is an exception flushing + * @param exceptionCb The callback object to notify the application when the there is an exception flushing * the requests. - * @param __sentCb The callback object to notify the application when the flush is complete. + * @param sentCb The callback object to notify the application when the flush is complete. * @return The asynchronous result object. **/ @Override public AsyncResult - begin_ice_flushBatchRequests(IceInternal.Functional_VoidCallback __responseCb, - IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + begin_ice_flushBatchRequests(IceInternal.Functional_VoidCallback responseCb, + IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_ice_flushBatchRequestsInternal( - new IceInternal.Functional_OnewayCallback(__responseCb, __exceptionCb, __sentCb)); + return _iceI_begin_ice_flushBatchRequestsInternal( + new IceInternal.Functional_OnewayCallback(responseCb, exceptionCb, sentCb)); } - private static final String __ice_flushBatchRequests_name = "ice_flushBatchRequests"; + private static final String _ice_flushBatchRequests_name = "ice_flushBatchRequests"; private AsyncResult - begin_ice_flushBatchRequestsInternal(IceInternal.CallbackBase cb) + _iceI_begin_ice_flushBatchRequestsInternal(IceInternal.CallbackBase cb) { - IceInternal.ProxyFlushBatch result = new IceInternal.ProxyFlushBatch(this, __ice_flushBatchRequests_name, cb); + IceInternal.ProxyFlushBatch result = new IceInternal.ProxyFlushBatch(this, _ice_flushBatchRequests_name, cb); try { result.invoke(); @@ -2515,8 +2515,8 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public void end_ice_flushBatchRequests(AsyncResult r) { - IceInternal.ProxyFlushBatch result = IceInternal.ProxyFlushBatch.check(r, this, __ice_flushBatchRequests_name); - result.__wait(); + IceInternal.ProxyFlushBatch result = IceInternal.ProxyFlushBatch.check(r, this, _ice_flushBatchRequests_name); + result.waitForResponseOrUserEx(); } /** @@ -2543,20 +2543,20 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable return false; } - public void __write(OutputStream os) + public void _write(OutputStream os) { - _reference.getIdentity().__write(os); + _reference.getIdentity().write(os); _reference.streamWrite(os); } public final IceInternal.Reference - __reference() + _getReference() { return _reference; } public final void - __copyFrom(ObjectPrx from) + _copyFrom(ObjectPrx from) { synchronized(from) { @@ -2567,10 +2567,10 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } public final int - __handleException(Exception ex, IceInternal.RequestHandler handler, OperationMode mode, boolean sent, - Holder<Integer> interval, int cnt) + _handleException(Exception ex, IceInternal.RequestHandler handler, OperationMode mode, boolean sent, + Holder<Integer> interval, int cnt) { - __updateRequestHandler(handler, null); // Clear the request handler + _updateRequestHandler(handler, null); // Clear the request handler // // We only retry local exception, system exceptions aren't retried. @@ -2614,7 +2614,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } public final void - __checkTwowayOnly(String name) + _checkTwowayOnly(String name) { // // No mutex lock necessary, there is nothing mutable in this @@ -2630,7 +2630,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } public final void - __checkAsyncTwowayOnly(String name) + _checkAsyncTwowayOnly(String name) { // // No mutex lock necessary, there is nothing mutable in this @@ -2644,12 +2644,12 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } public final void - __end(AsyncResult r, String operation) + _end(AsyncResult r, String operation) { IceInternal.ProxyOutgoingAsyncBase result = IceInternal.ProxyOutgoingAsyncBase.check(r, this, operation); try { - boolean ok = result.__wait(); + boolean ok = result.waitForResponseOrUserEx(); if(_reference.getMode() == IceInternal.Reference.ModeTwoway) { IceInternal.OutgoingAsync outAsync = (IceInternal.OutgoingAsync)result; @@ -2677,7 +2677,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } public final IceInternal.RequestHandler - __getRequestHandler() + _getRequestHandler() { if(_reference.getCacheConnection()) { @@ -2693,7 +2693,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } synchronized public final IceInternal.BatchRequestQueue - __getBatchRequestQueue() + _getBatchRequestQueue() { if(_batchRequestQueue == null) { @@ -2703,7 +2703,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } public IceInternal.RequestHandler - __setRequestHandler(IceInternal.RequestHandler handler) + _setRequestHandler(IceInternal.RequestHandler handler) { if(_reference.getCacheConnection()) { @@ -2720,7 +2720,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } public void - __updateRequestHandler(IceInternal.RequestHandler previous, IceInternal.RequestHandler handler) + _updateRequestHandler(IceInternal.RequestHandler previous, IceInternal.RequestHandler handler) { if(_reference.getCacheConnection() && previous != null) { @@ -2758,7 +2758,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable // Only for use by IceInternal.ProxyFactory // public final void - __setup(IceInternal.Reference ref) + _setup(IceInternal.Reference ref) { // // No need to synchronize, as this operation is only called @@ -2829,7 +2829,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable { throw new SyscallException(ex); } - h.__copyFrom(obj); + h._copyFrom(obj); d = proxyCls.cast(h); } } @@ -2862,7 +2862,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable if(explicitFacet) { ObjectPrxHelperBase h = ObjectPrxHelperBase.class.cast(helperCls.newInstance()); - h.__copyFrom(obj.ice_facet(facet)); + h._copyFrom(obj.ice_facet(facet)); d = proxyCls.cast(h); } else @@ -2874,7 +2874,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable else { ObjectPrxHelperBase h = ObjectPrxHelperBase.class.cast(helperCls.newInstance()); - h.__copyFrom(obj); + h._copyFrom(obj); d = proxyCls.cast(h); } } @@ -2921,7 +2921,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable try { ObjectPrxHelperBase proxy = getClass().newInstance(); - proxy.__setup(ref); + proxy._setup(ref); return proxy; } catch(InstantiationException e) @@ -2951,7 +2951,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable private void readObject(java.io.ObjectInputStream in) - throws java.io.IOException, ClassNotFoundException + throws java.io.IOException, ClassNotFoundException { String s = in.readUTF(); try diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java b/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java index 488986f98af..ba4e52e633e 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectReader.java @@ -22,13 +22,13 @@ public abstract class ObjectReader extends ObjectImpl public abstract void read(InputStream in); @Override - public void __write(OutputStream os) + public void _iceWrite(OutputStream os) { assert(false); } @Override - public void __read(InputStream is) + public void _iceRead(InputStream is) { read(is); } diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java b/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java index 91e474477a7..9ef741bafc1 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectWriter.java @@ -22,13 +22,13 @@ public abstract class ObjectWriter extends ObjectImpl public abstract void write(OutputStream out); @Override - public void __write(OutputStream os) + public void _iceWrite(OutputStream os) { write(os); } @Override - public void __read(Ice.InputStream is) + public void _iceRead(Ice.InputStream is) { assert(false); } diff --git a/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java b/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java index fd033d31500..dabf75a7aa7 100644 --- a/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java +++ b/java-compat/src/Ice/src/main/java/Ice/OnewayCallback.java @@ -46,32 +46,32 @@ public abstract class OnewayCallback extends IceInternal.CallbackBase } @Override - public final void __sent(AsyncResult __result) + public final void _iceSent(AsyncResult result) { - sent(__result.sentSynchronously()); + sent(result.sentSynchronously()); } @Override - public final boolean __hasSentCallback() + public final boolean _iceHasSentCallback() { return true; } @Override - public final void __completed(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { try { - ((ObjectPrxHelperBase)__result.getProxy()).__end(__result, __result.getOperation()); + ((ObjectPrxHelperBase)result.getProxy())._end(result, result.getOperation()); } - catch(LocalException __ex) + catch(LocalException ex) { - exception(__ex); + exception(ex); return; } - catch(SystemException __ex) + catch(SystemException ex) { - exception(__ex); + exception(ex); return; } response(); diff --git a/java-compat/src/Ice/src/main/java/Ice/OutputStream.java b/java-compat/src/Ice/src/main/java/Ice/OutputStream.java index ce2fe70f223..3b5df79e17e 100644 --- a/java-compat/src/Ice/src/main/java/Ice/OutputStream.java +++ b/java-compat/src/Ice/src/main/java/Ice/OutputStream.java @@ -386,7 +386,7 @@ public class OutputStream _encapsStack.start = _buf.size(); writeInt(0); // Placeholder for the encapsulation length. - _encapsStack.encoding.__write(this); + _encapsStack.encoding.write(this); } /** @@ -417,7 +417,7 @@ public class OutputStream { IceInternal.Protocol.checkSupportedEncoding(encoding); writeInt(6); // Size - encoding.__write(this); + encoding.write(this); } /** @@ -1573,12 +1573,12 @@ public class OutputStream { if(v != null) { - v.__write(this); + v._write(this); } else { Identity ident = new Identity(); - ident.__write(this); + ident.write(this); } } @@ -1866,9 +1866,9 @@ public class OutputStream // This allows reading the pending instances even if some part of // the exception was sliced. // - boolean usesClasses = v.__usesClasses(); + boolean usesClasses = v._usesClasses(); _stream.writeBool(usesClasses); - v.__write(_stream); + v._write(_stream); if(usesClasses) { writePendingValues(); @@ -1973,7 +1973,7 @@ public class OutputStream _stream.instance().initializationData().logger.warning(s); } - p.getKey().__write(_stream); + p.getKey()._iceWrite(_stream); } } _stream.writeSize(0); // Zero marker indicates end of sequence of sequences of instances. @@ -2073,7 +2073,7 @@ public class OutputStream @Override void writeException(UserException v) { - v.__write(_stream); + v._write(_stream); } @Override @@ -2320,7 +2320,7 @@ public class OutputStream } _stream.writeSize(1); // Class instance marker. - v.__write(_stream); + v._iceWrite(_stream); } private static final class InstanceData diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java index bedbe2970c6..82cae9ef918 100644 --- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java +++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallback.java @@ -17,14 +17,14 @@ public interface TwowayCallback /** * Called when the invocation raises an Ice run-time exception. * - * @param __ex The Ice run-time exception raised by the operation. + * @param ex The Ice run-time exception raised by the operation. **/ - public void exception(LocalException __ex); + public void exception(LocalException ex); /** * Called when the invocation raises an Ice system exception. * - * @param __ex The Ice system exception raised by the operation. + * @param ex The Ice system exception raised by the operation. **/ - public void exception(SystemException __ex); + public void exception(SystemException ex); } diff --git a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java index ecd25e75edb..d43c28c54eb 100644 --- a/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java +++ b/java-compat/src/Ice/src/main/java/Ice/TwowayCallbackUE.java @@ -11,5 +11,5 @@ package Ice; public interface TwowayCallbackUE extends TwowayCallback { - public void exception(UserException __ex); + public void exception(UserException ex); } diff --git a/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java b/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java index 98d3d45260c..d61409e6f33 100644 --- a/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java +++ b/java-compat/src/Ice/src/main/java/Ice/UnknownSlicedValue.java @@ -36,17 +36,17 @@ public final class UnknownSlicedValue extends ObjectImpl } @Override - public void __write(OutputStream __os) + public void _iceWrite(OutputStream ostr) { - __os.startValue(_slicedData); - __os.endValue(); + ostr.startValue(_slicedData); + ostr.endValue(); } @Override - public void __read(InputStream __is) + public void _iceRead(InputStream istr) { - __is.startValue(); - _slicedData = __is.endValue(true); + istr.startValue(); + _slicedData = istr.endValue(true); } private final String _unknownTypeId; diff --git a/java-compat/src/Ice/src/main/java/Ice/UserException.java b/java-compat/src/Ice/src/main/java/Ice/UserException.java index 1d78d42c722..6ac02e2ad54 100644 --- a/java-compat/src/Ice/src/main/java/Ice/UserException.java +++ b/java-compat/src/Ice/src/main/java/Ice/UserException.java @@ -87,30 +87,30 @@ public abstract class UserException extends java.lang.Exception implements Clone } public void - __write(OutputStream os) + _write(OutputStream os) { os.startException(null); - __writeImpl(os); + _writeImpl(os); os.endException(); } public void - __read(InputStream is) + _read(InputStream is) { is.startException(); - __readImpl(is); + _readImpl(is); is.endException(false); } public boolean - __usesClasses() + _usesClasses() { return false; } protected abstract void - __writeImpl(OutputStream os); + _writeImpl(OutputStream os); protected abstract void - __readImpl(InputStream is); + _readImpl(InputStream is); } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java b/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java index 41f49774a0e..605f17faaf1 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/AsyncResultI.java @@ -139,7 +139,7 @@ public class AsyncResultI implements AsyncResult try { - _callback.__sent(this); + _callback._iceSent(this); } catch(java.lang.RuntimeException ex) { @@ -183,7 +183,7 @@ public class AsyncResultI implements AsyncResult try { - _callback.__completed(this); + _callback._iceCompleted(this); } catch(RuntimeException ex) { @@ -244,7 +244,7 @@ public class AsyncResultI implements AsyncResult _cancellationHandler = handler; } - public final boolean __wait() + public final boolean waitForResponseOrUserEx() { try { @@ -308,7 +308,7 @@ public class AsyncResultI implements AsyncResult { _state |= StateDone | StateOK; _cancellationHandler = null; - if(_observer != null && (_callback == null || !_callback.__hasSentCallback())) + if(_observer != null && (_callback == null || !_callback._iceHasSentCallback())) { _observer.detach(); _observer = null; @@ -324,7 +324,7 @@ public class AsyncResultI implements AsyncResult cacheMessageBuffers(); } this.notifyAll(); - return !alreadySent && _callback != null && _callback.__hasSentCallback(); + return !alreadySent && _callback != null && _callback._iceHasSentCallback(); } } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java b/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java index b482e9a71cd..b45a1179ca8 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/CallbackBase.java @@ -11,9 +11,9 @@ package IceInternal; public abstract class CallbackBase { - public abstract void __completed(Ice.AsyncResult r); - public abstract void __sent(Ice.AsyncResult r); - public abstract boolean __hasSentCallback(); + public abstract void _iceCompleted(Ice.AsyncResult r); + public abstract void _iceSent(Ice.AsyncResult r); + public abstract boolean _iceHasSentCallback(); public static void check(boolean cb) { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java b/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java index 4f50988102a..9accb698840 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ConnectRequestHandler.java @@ -345,7 +345,7 @@ public class ConnectRequestHandler } for(Ice.ObjectPrxHelperBase proxy : _proxies) { - proxy.__updateRequestHandler(previous, _requestHandler); + proxy._updateRequestHandler(previous, _requestHandler); } } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java b/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java index 6ae5fe1b4c2..ed8532e8d12 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/FixedReference.java @@ -277,7 +277,7 @@ public class FixedReference extends Reference { handler = new QueueRequestHandler(getInstance(), handler); } - return proxy.__setRequestHandler(handler); + return proxy._setRequestHandler(handler); } @Override diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java index dc200518c10..21c314da5b6 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_CallbackBase.java @@ -16,35 +16,35 @@ public abstract class Functional_CallbackBase extends IceInternal.CallbackBase Functional_BoolCallback sentCb) { CallbackBase.check(responseCb || exceptionCb != null); - __exceptionCb = exceptionCb; - __sentCb = sentCb; + _exceptionCb = exceptionCb; + _sentCb = sentCb; } protected Functional_CallbackBase(Functional_GenericCallback1<Ice.Exception> exceptionCb, Functional_BoolCallback sentCb) { - __exceptionCb = exceptionCb; - __sentCb = sentCb; + _exceptionCb = exceptionCb; + _sentCb = sentCb; } @Override - public final void __sent(Ice.AsyncResult __result) + public final void _iceSent(Ice.AsyncResult result) { - if(__sentCb != null) + if(_sentCb != null) { - __sentCb.apply(__result.sentSynchronously()); + _sentCb.apply(result.sentSynchronously()); } } @Override - public final boolean __hasSentCallback() + public final boolean _iceHasSentCallback() { - return __sentCb != null; + return _sentCb != null; } @Override - public abstract void __completed(Ice.AsyncResult __result); + public abstract void _iceCompleted(Ice.AsyncResult result); - protected final Functional_GenericCallback1<Ice.Exception> __exceptionCb; - protected final Functional_BoolCallback __sentCb; + protected final Functional_GenericCallback1<Ice.Exception> _exceptionCb; + protected final Functional_BoolCallback _sentCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java index 7962cd4e336..48828a6a244 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_OnewayCallback.java @@ -17,28 +17,28 @@ public class Functional_OnewayCallback extends IceInternal.Functional_CallbackBa { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || exceptionCb != null); - __responseCb = responseCb; + _responseCb = responseCb; } @Override - public final void __completed(Ice.AsyncResult __result) + public final void _iceCompleted(Ice.AsyncResult result) { try { - ((Ice.ObjectPrxHelperBase)__result.getProxy()).__end(__result, __result.getOperation()); - if(__responseCb != null) + ((Ice.ObjectPrxHelperBase)result.getProxy())._end(result, result.getOperation()); + if(_responseCb != null) { - __responseCb.apply(); + _responseCb.apply(); } } - catch(Ice.Exception __ex) + catch(Ice.Exception ex) { - if(__exceptionCb != null) + if(_exceptionCb != null) { - __exceptionCb.apply(__ex); + _exceptionCb.apply(ex); } } } - private final Functional_VoidCallback __responseCb; + private final Functional_VoidCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java index f88b2d64ca6..f7b58652e3c 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallback.java @@ -27,18 +27,18 @@ public abstract class Functional_TwowayCallback extends IceInternal.Functional_C @Override public void exception(Ice.SystemException ex) { - if(__exceptionCb != null) + if(_exceptionCb != null) { - __exceptionCb.apply(ex); + _exceptionCb.apply(ex); } } @Override public final void exception(Ice.LocalException ex) { - if(__exceptionCb != null) + if(_exceptionCb != null) { - __exceptionCb.apply(ex); + _exceptionCb.apply(ex); } } } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java index c7b52ea9c52..7863604e081 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java @@ -17,7 +17,7 @@ public abstract class Functional_TwowayCallbackArg1<T> extends Functional_Twoway Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } protected Functional_TwowayCallbackArg1(boolean userExceptionCb, @@ -27,17 +27,17 @@ public abstract class Functional_TwowayCallbackArg1<T> extends Functional_Twoway { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - __responseCb = responseCb; + _responseCb = responseCb; } @Override public void response(T arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_GenericCallback1<T> __responseCb; + final private Functional_GenericCallback1<T> _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java index ed810994d8e..5669785c796 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackArg1UE<T> Functional_BoolCallback sentCb) { super(userExceptionCb != null, responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java index 973b107f1ff..85fa0654657 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java @@ -16,7 +16,7 @@ public abstract class Functional_TwowayCallbackBool extends Functional_TwowayCal Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - this.__responseCb = responseCb; + this._responseCb = responseCb; } protected Functional_TwowayCallbackBool(boolean userExceptionCb, @@ -26,17 +26,17 @@ public abstract class Functional_TwowayCallbackBool extends Functional_TwowayCal { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - this.__responseCb = responseCb; + this._responseCb = responseCb; } @Override public void response(boolean arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_BoolCallback __responseCb; + final private Functional_BoolCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java index 28d2a92777f..026e028bc90 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackBoolUE Functional_BoolCallback sentCb) { super(userExceptionCb != null, responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java index 986163e8d80..c455fd21f18 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java @@ -16,7 +16,7 @@ public abstract class Functional_TwowayCallbackByte extends Functional_TwowayCal Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } protected Functional_TwowayCallbackByte(boolean userExceptionCb, @@ -26,17 +26,17 @@ public abstract class Functional_TwowayCallbackByte extends Functional_TwowayCal { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - __responseCb = responseCb; + _responseCb = responseCb; } @Override public void response(byte arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_ByteCallback __responseCb; + final private Functional_ByteCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java index 1c0fb9bb8bc..9d220e66690 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackByteUE Functional_BoolCallback sentCb) { super(userExceptionCb != null, responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java index 879014d73e5..391e8a39db0 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java @@ -17,7 +17,7 @@ public abstract class Functional_TwowayCallbackDouble Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } protected Functional_TwowayCallbackDouble(boolean userExceptionCb, @@ -27,16 +27,16 @@ public abstract class Functional_TwowayCallbackDouble { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - __responseCb = responseCb; + _responseCb = responseCb; } public void response(double arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_DoubleCallback __responseCb; + final private Functional_DoubleCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java index a8d28cf12fe..617ea0d5c3d 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackDoubleUE Functional_BoolCallback sentCb) { super(userExceptionCb != null, responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java index 7ea9b1f9753..0071e10777d 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java @@ -17,7 +17,7 @@ public abstract class Functional_TwowayCallbackFloat Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } protected Functional_TwowayCallbackFloat(boolean userExceptionCb, @@ -27,17 +27,17 @@ public abstract class Functional_TwowayCallbackFloat { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - __responseCb = responseCb; + _responseCb = responseCb; } @Override public void response(float arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_FloatCallback __responseCb; + final private Functional_FloatCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java index d5dc8141064..468f98222b6 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java @@ -18,17 +18,17 @@ public abstract class Functional_TwowayCallbackFloatUE Functional_BoolCallback sentCb) { super(userExceptionCb != null, responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java index 8c6fea2818e..1a1cb8bef1f 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java @@ -17,7 +17,7 @@ public abstract class Functional_TwowayCallbackInt Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } protected Functional_TwowayCallbackInt(boolean userExceptionCb, @@ -27,17 +27,17 @@ public abstract class Functional_TwowayCallbackInt { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - __responseCb = responseCb; + _responseCb = responseCb; } @Override public void response(int arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_IntCallback __responseCb; + final private Functional_IntCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java index b749b44b1ad..8fea1d3eb15 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackIntUE Functional_BoolCallback sentCb) { super(userExceptionCb != null, responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java index bc6c654643e..5bcc7dfc55e 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java @@ -17,7 +17,7 @@ public abstract class Functional_TwowayCallbackLong Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } protected Functional_TwowayCallbackLong(boolean userExceptionCb, @@ -27,17 +27,17 @@ public abstract class Functional_TwowayCallbackLong { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - __responseCb = responseCb; + _responseCb = responseCb; } @Override public void response(long arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_LongCallback __responseCb; + final private Functional_LongCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java index 2eb6985fcb8..4421250e891 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackLongUE Functional_BoolCallback sentCb) { super(responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java index f6c835f0721..4eec9c26380 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java @@ -17,7 +17,7 @@ public abstract class Functional_TwowayCallbackShort Functional_BoolCallback sentCb) { super(responseCb != null, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } protected Functional_TwowayCallbackShort(boolean userExceptionCb, @@ -27,17 +27,17 @@ public abstract class Functional_TwowayCallbackShort { super(exceptionCb, sentCb); CallbackBase.check(responseCb != null || (userExceptionCb && exceptionCb != null)); - __responseCb = responseCb; + _responseCb = responseCb; } @Override public void response(short arg) { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(arg); + _responseCb.apply(arg); } } - final private Functional_ShortCallback __responseCb; + final private Functional_ShortCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java index 47ff52de87c..91fa655453d 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackShortUE Functional_BoolCallback sentCb) { super(responseCb, exceptionCb, sentCb); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + private final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java index 5ae5d838274..8c6cbee0e01 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackUE.java @@ -18,17 +18,17 @@ public abstract class Functional_TwowayCallbackUE extends Functional_TwowayCallb { super(exceptionCb, sentCb); CallbackBase.check(responseCb || (userExceptionCb != null && exceptionCb != null)); - __userExceptionCb = userExceptionCb; + _userExceptionCb = userExceptionCb; } @Override public final void exception(Ice.UserException ex) { - if(__userExceptionCb != null) + if(_userExceptionCb != null) { - __userExceptionCb.apply(ex); + _userExceptionCb.apply(ex); } } - protected final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; + protected final Functional_GenericCallback1<Ice.UserException> _userExceptionCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java index 080b4ad863a..92e6eea0c4d 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java @@ -19,17 +19,17 @@ public abstract class Functional_TwowayCallbackVoidUE Functional_BoolCallback sentCb) { super(responseCb != null, userExceptionCb, exceptionCb, sentCb); - __responseCb = responseCb; + _responseCb = responseCb; } @Override public void response() { - if(__responseCb != null) + if(_responseCb != null) { - __responseCb.apply(); + _responseCb.apply(); } } - private final Functional_VoidCallback __responseCb; + private final Functional_VoidCallback _responseCb; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java b/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java index 1dbfdc3554a..5234074afc0 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Incoming.java @@ -101,7 +101,7 @@ final public class Incoming extends IncomingBase implements Ice.Request // // Read the current. // - _current.id.__read(_is); + _current.id.read(_is); // // For compatibility with the old FacetPath. @@ -211,7 +211,7 @@ final public class Incoming extends IncomingBase implements Ice.Request Thread.currentThread().setContextClassLoader(_servant.getClass().getClassLoader()); } - _servant.__dispatch(this, _current); + _servant._iceDispatch(this, _current); // // If the request was not dispatched asynchronously, send the response. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java index 2723ce7a7b7..df4a9d419c7 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingBase.java @@ -345,7 +345,7 @@ class IncomingBase { assert(false); } - ex.id.__write(_os); + ex.id.write(_os); // // For compatibility with the old FacetPath. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java b/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java index 65f0c20840c..b1f1b846abe 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/LocatorInfo.java @@ -25,7 +25,7 @@ public final class LocatorInfo EndpointI[] endpoints = null; if(proxy != null) { - Reference r = ((Ice.ObjectPrxHelperBase)proxy).__reference(); + Reference r = ((Ice.ObjectPrxHelperBase)proxy)._getReference(); if(_ref.isWellKnown() && !Protocol.isSupported(_ref.getEncoding(), r.getEncoding())) { // @@ -647,7 +647,7 @@ public final class LocatorInfo private void finishRequest(Reference ref, java.util.List<Reference> wellKnownRefs, Ice.ObjectPrx proxy, boolean notRegistered) { - if(proxy == null || ((Ice.ObjectPrxHelperBase)proxy).__reference().isIndirect()) + if(proxy == null || ((Ice.ObjectPrxHelperBase)proxy)._getReference().isIndirect()) { // // Remove the cached references of well-known objects for which we tried @@ -661,11 +661,11 @@ public final class LocatorInfo if(!ref.isWellKnown()) { - if(proxy != null && !((Ice.ObjectPrxHelperBase)proxy).__reference().isIndirect()) + if(proxy != null && !((Ice.ObjectPrxHelperBase)proxy)._getReference().isIndirect()) { // Cache the adapter endpoints. _table.addAdapterEndpoints(ref.getAdapterId(), - ((Ice.ObjectPrxHelperBase)proxy).__reference().getEndpoints()); + ((Ice.ObjectPrxHelperBase)proxy)._getReference().getEndpoints()); } else if(notRegistered) // If the adapter isn't registered anymore, remove it from the cache. { @@ -680,10 +680,10 @@ public final class LocatorInfo } else { - if(proxy != null && !((Ice.ObjectPrxHelperBase)proxy).__reference().isWellKnown()) + if(proxy != null && !((Ice.ObjectPrxHelperBase)proxy)._getReference().isWellKnown()) { // Cache the well-known object reference. - _table.addObjectReference(ref.getIdentity(), ((Ice.ObjectPrxHelperBase)proxy).__reference()); + _table.addObjectReference(ref.getIdentity(), ((Ice.ObjectPrxHelperBase)proxy)._getReference()); } else if(notRegistered) // If the well-known object isn't registered anymore, remove it from the cache. { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java b/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java index 201dacf41b2..35acf199ec3 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/LocatorManager.java @@ -58,7 +58,7 @@ public final class LocatorManager LocatorKey set(Ice.LocatorPrx locator) { - Reference r = ((Ice.ObjectPrxHelperBase)locator).__reference(); + Reference r = ((Ice.ObjectPrxHelperBase)locator)._getReference(); _id = r.getIdentity(); _encoding = r.getEncoding(); return this; diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java b/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java index 290be728304..663d31d1836 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ObserverHelper.java @@ -40,7 +40,7 @@ public final class ObserverHelper get(Ice.ObjectPrx proxy, String op, java.util.Map<String, String> context) { CommunicatorObserver obsv = - ((Ice.ObjectPrxHelperBase)proxy).__reference().getInstance().initializationData().observer; + ((Ice.ObjectPrxHelperBase)proxy)._getReference().getInstance().initializationData().observer; if(obsv != null) { InvocationObserver observer; diff --git a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java index 85e5522be77..2d47a89a4da 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/OutgoingAsync.java @@ -27,21 +27,21 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase public OutgoingAsync(Ice.ObjectPrx prx, String operation, CallbackBase cb) { super((Ice.ObjectPrxHelperBase)prx, operation, cb); - _encoding = Protocol.getCompatibleEncoding(_proxy.__reference().getEncoding()); + _encoding = Protocol.getCompatibleEncoding(_proxy._getReference().getEncoding()); _is = null; } public OutgoingAsync(Ice.ObjectPrx prx, String operation, CallbackBase cb, Ice.InputStream is, Ice.OutputStream os) { super((Ice.ObjectPrxHelperBase)prx, operation, cb, os); - _encoding = Protocol.getCompatibleEncoding(_proxy.__reference().getEncoding()); + _encoding = Protocol.getCompatibleEncoding(_proxy._getReference().getEncoding()); _is = is; } public void prepare(String operation, Ice.OperationMode mode, java.util.Map<String, String> ctx, boolean explicitCtx, boolean synchronous) { - Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy.__reference().getProtocol())); + Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy._getReference().getProtocol())); _mode = mode; _synchronous = synchronous; @@ -52,7 +52,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase } _observer = ObserverHelper.get(_proxy, operation, ctx); - switch(_proxy.__reference().getMode()) + switch(_proxy._getReference().getMode()) { case Reference.ModeTwoway: case Reference.ModeOneway: @@ -65,14 +65,14 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase case Reference.ModeBatchOneway: case Reference.ModeBatchDatagram: { - _proxy.__getBatchRequestQueue().prepareBatchRequest(_os); + _proxy._getBatchRequestQueue().prepareBatchRequest(_os); break; } } - Reference ref = _proxy.__reference(); + Reference ref = _proxy._getReference(); - ref.getIdentity().__write(_os); + ref.getIdentity().write(_os); // // For compatibility with the old FacetPath. @@ -135,7 +135,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase public int invokeCollocated(CollocatedRequestHandler handler) { // The stream cannot be cached if the proxy is not a twoway or there is an invocation timeout set. - if(!_proxy.ice_isTwoway() || _proxy.__reference().getInvocationTimeout() > 0) + if(!_proxy.ice_isTwoway() || _proxy._getReference().getInvocationTimeout() > 0) { // Disable caching by marking the streams as cached! _state |= StateCachedBuffers; @@ -146,7 +146,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase @Override public void abort(Ice.Exception ex) { - int mode = _proxy.__reference().getMode(); + int mode = _proxy._getReference().getMode(); if(mode == Reference.ModeBatchOneway || mode == Reference.ModeBatchDatagram) { // @@ -154,7 +154,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase // must notify the connection about that we give up ownership // of the batch stream. // - _proxy.__getBatchRequestQueue().abortBatchRequest(_os); + _proxy._getBatchRequestQueue().abortBatchRequest(_os); } super.abort(ex); @@ -162,14 +162,14 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase public void invoke() { - int mode = _proxy.__reference().getMode(); + int mode = _proxy._getReference().getMode(); if(mode == Reference.ModeBatchOneway || mode == Reference.ModeBatchDatagram) { // // NOTE: we don't call sent/completed callbacks for batch AMI requests // _sentSynchronously = true; - _proxy.__getBatchRequestQueue().finishBatchRequest(_os, _proxy, getOperation()); + _proxy._getBatchRequestQueue().finishBatchRequest(_os, _proxy, getOperation()); finished(true); } else @@ -233,7 +233,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase case ReplyStatus.replyOperationNotExist: { Ice.Identity id = new Ice.Identity(); - id.__read(_is); + id.read(_is); // // For compatibility with the old FacetPath. @@ -408,7 +408,7 @@ public class OutgoingAsync extends ProxyOutgoingAsyncBase @Override public void cacheMessageBuffers() { - if(_proxy.__reference().getInstance().cacheMessageBuffers() > 0) + if(_proxy._getReference().getInstance().cacheMessageBuffers() > 0) { synchronized(this) { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java index ed3f1b81bd6..8b96b2081bc 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java @@ -26,7 +26,7 @@ public final class ProxyFactory if(proxy != null) { Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase)proxy; - return h.__reference().toString(); + return h._getReference().toString(); } else { @@ -48,7 +48,7 @@ public final class ProxyFactory if(proxy != null) { Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase)proxy; - return h.__reference().toProperty(prefix); + return h._getReference().toProperty(prefix); } else { @@ -60,7 +60,7 @@ public final class ProxyFactory streamToProxy(Ice.InputStream s) { Ice.Identity ident = new Ice.Identity(); - ident.__read(s); + ident.read(s); Reference ref = _instance.referenceFactory().create(ident, s); return referenceToProxy(ref); @@ -72,7 +72,7 @@ public final class ProxyFactory if(ref != null) { Ice.ObjectPrxHelperBase proxy = new Ice.ObjectPrxHelperBase(); - proxy.__setup(ref); + proxy._setup(ref); return proxy; } else diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java index eb49b24c6f1..7a53d1b2c24 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFlushBatch.java @@ -28,7 +28,7 @@ public class ProxyFlushBatch extends ProxyOutgoingAsyncBase { super(prx, operation, callback); _observer = ObserverHelper.get(prx, operation); - _batchRequestNum = prx.__getBatchRequestQueue().swap(_os); + _batchRequestNum = prx._getBatchRequestQueue().swap(_os); } @Override @@ -54,7 +54,7 @@ public class ProxyFlushBatch extends ProxyOutgoingAsyncBase public void invoke() { - Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy.__reference().getProtocol())); + Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(_proxy._getReference().getProtocol())); invokeImpl(true); // userThread = true } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java index a38c6c28c7a..bf9a5388f07 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java @@ -80,7 +80,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase // require could end up waiting for the flush of the // connection to be done. // - _proxy.__updateRequestHandler(_handler, null); // Clear request handler and always retry. + _proxy._updateRequestHandler(_handler, null); // Clear request handler and always retry. _instance.retryQueue().add(this, 0); } catch(Ice.Exception exc) @@ -99,7 +99,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase public void cancelable(final CancellationHandler handler) { - if(_proxy.__reference().getInvocationTimeout() == -2 && _cachedConnection != null) + if(_proxy._getReference().getInvocationTimeout() == -2 && _cachedConnection != null) { final int timeout = _cachedConnection.timeout(); if(timeout > 0) @@ -138,7 +138,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase protected ProxyOutgoingAsyncBase(Ice.ObjectPrxHelperBase prx, String op, CallbackBase delegate) { - super(prx.ice_getCommunicator(), prx.__reference().getInstance(), op, delegate); + super(prx.ice_getCommunicator(), prx._getReference().getInstance(), op, delegate); _proxy = prx; _mode = Ice.OperationMode.Normal; _cnt = 0; @@ -147,7 +147,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase protected ProxyOutgoingAsyncBase(Ice.ObjectPrxHelperBase prx, String op, CallbackBase delegate, Ice.OutputStream os) { - super(prx.ice_getCommunicator(), prx.__reference().getInstance(), op, delegate, os); + super(prx.ice_getCommunicator(), prx._getReference().getInstance(), op, delegate, os); _proxy = prx; _mode = Ice.OperationMode.Normal; _cnt = 0; @@ -172,7 +172,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase { if(userThread) { - int invocationTimeout = _proxy.__reference().getInvocationTimeout(); + int invocationTimeout = _proxy._getReference().getInvocationTimeout(); if(invocationTimeout > 0) { _future = _instance.timer().schedule( @@ -200,7 +200,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase { _sent = false; _handler = null; - _handler = _proxy.__getRequestHandler(); + _handler = _proxy._getRequestHandler(); int status = _handler.sendAsyncRequest(this); if((status & AsyncStatus.Sent) > 0) { @@ -224,7 +224,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase } catch(RetryException ex) { - _proxy.__updateRequestHandler(_handler, null); // Clear request handler and always retry. + _proxy._updateRequestHandler(_handler, null); // Clear request handler and always retry. } catch(Ice.Exception ex) { @@ -304,7 +304,7 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase protected int handleException(Ice.Exception exc) { Ice.Holder<Integer> interval = new Ice.Holder<Integer>(); - _cnt = _proxy.__handleException(exc, _handler, _mode, _sent, interval, _cnt); + _cnt = _proxy._handleException(exc, _handler, _mode, _sent, interval, _cnt); return interval.value; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java index 48ac1b0788a..cbe05e19cd9 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/Reference.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/Reference.java @@ -283,8 +283,8 @@ public abstract class Reference implements Cloneable if(!s.getEncoding().equals(Ice.Util.Encoding_1_0)) { - _protocol.__write(s); - _encoding.__write(s); + _protocol.write(s); + _encoding.write(s); } // Derived class writes the remainder of the reference. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java index a6ee6082bab..4162156654e 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ReferenceFactory.java @@ -587,9 +587,9 @@ public final class ReferenceFactory if(!s.getEncoding().equals(Ice.Util.Encoding_1_0)) { protocol = new Ice.ProtocolVersion(); - protocol.__read(s); + protocol.read(s); encoding = new Ice.EncodingVersion(); - encoding.__read(s); + encoding.read(s); } else { @@ -743,7 +743,7 @@ public final class ReferenceFactory LocatorInfo locatorInfo = null; if(_defaultLocator != null) { - if(!((Ice.ObjectPrxHelperBase)_defaultLocator).__reference().getEncoding().equals(encoding)) + if(!((Ice.ObjectPrxHelperBase)_defaultLocator)._getReference().getEncoding().equals(encoding)) { locatorInfo = _instance.locatorManager().get( (Ice.LocatorPrx)_defaultLocator.ice_encodingVersion(encoding)); @@ -783,7 +783,7 @@ public final class ReferenceFactory Ice.LocatorPrx locator = Ice.LocatorPrxHelper.uncheckedCast(_communicator.propertyToProxy(property)); if(locator != null) { - if(!((Ice.ObjectPrxHelperBase)locator).__reference().getEncoding().equals(encoding)) + if(!((Ice.ObjectPrxHelperBase)locator)._getReference().getEncoding().equals(encoding)) { locatorInfo = _instance.locatorManager().get((Ice.LocatorPrx)locator.ice_encodingVersion(encoding)); } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java index ff4022724a9..053b7e53499 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/RequestHandlerFactory.java @@ -28,7 +28,7 @@ public final class RequestHandlerFactory Ice.ObjectAdapter adapter = _instance.objectAdapterFactory().findObjectAdapter(proxy); if(adapter != null) { - return proxy.__setRequestHandler(new CollocatedRequestHandler(ref, adapter)); + return proxy._setRequestHandler(new CollocatedRequestHandler(ref, adapter)); } } @@ -73,7 +73,7 @@ public final class RequestHandlerFactory ref.getConnection(handler); } } - return proxy.__setRequestHandler(handler.connect(proxy)); + return proxy._setRequestHandler(handler.connect(proxy)); } void diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java b/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java index bdca554000a..6f84899597d 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/RoutableReference.java @@ -394,7 +394,7 @@ public class RoutableReference extends Reference if(_routerInfo != null) { Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase)_routerInfo.getRouter(); - java.util.Map<String, String> routerProperties = h.__reference().toProperty(prefix + ".Router"); + java.util.Map<String, String> routerProperties = h._getReference().toProperty(prefix + ".Router"); for(java.util.Map.Entry<String, String> p : routerProperties.entrySet()) { properties.put(p.getKey(), p.getValue()); @@ -404,7 +404,7 @@ public class RoutableReference extends Reference if(_locatorInfo != null) { Ice.ObjectPrxHelperBase h = (Ice.ObjectPrxHelperBase)_locatorInfo.getLocator(); - java.util.Map<String, String> locatorProperties = h.__reference().toProperty(prefix + ".Locator"); + java.util.Map<String, String> locatorProperties = h._getReference().toProperty(prefix + ".Locator"); for(java.util.Map.Entry<String, String> p : locatorProperties.entrySet()) { properties.put(p.getKey(), p.getValue()); diff --git a/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java b/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java index 1de08e756fe..e5fdff0e14b 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/RouterInfo.java @@ -197,7 +197,7 @@ public final class RouterInfo // // If getClientProxy() return nil, use router endpoints. // - _clientEndpoints = ((Ice.ObjectPrxHelperBase)_router).__reference().getEndpoints(); + _clientEndpoints = ((Ice.ObjectPrxHelperBase)_router)._getReference().getEndpoints(); } else { @@ -213,7 +213,7 @@ public final class RouterInfo clientProxy = clientProxy.ice_timeout(_router.ice_getConnection().timeout()); } - _clientEndpoints = ((Ice.ObjectPrxHelperBase)clientProxy).__reference().getEndpoints(); + _clientEndpoints = ((Ice.ObjectPrxHelperBase)clientProxy)._getReference().getEndpoints(); } } return _clientEndpoints; @@ -228,7 +228,7 @@ public final class RouterInfo } serverProxy = serverProxy.ice_router(null); // The server proxy cannot be routed. - _serverEndpoints = ((Ice.ObjectPrxHelperBase)serverProxy).__reference().getEndpoints(); + _serverEndpoints = ((Ice.ObjectPrxHelperBase)serverProxy)._getReference().getEndpoints(); return _serverEndpoints; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java b/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java index d50797350e5..f433f823bd1 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/TraceUtil.java @@ -173,7 +173,7 @@ public final class TraceUtil } Ice.Identity identity = new Ice.Identity(); - identity.__read(stream); + identity.read(stream); out.write("\nidentity = " + Ice.Util.identityToString(identity, toStringMode)); String[] facet = stream.readStringSeq(); diff --git a/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java b/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java index 713f965d848..c06003629d5 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/TwowayCallback.java @@ -16,19 +16,19 @@ public abstract class TwowayCallback extends CallbackBase implements Ice.TwowayC } @Override - public void exception(Ice.SystemException __ex) + public void exception(Ice.SystemException ex) { - exception(new Ice.UnknownException(__ex)); + exception(new Ice.UnknownException(ex)); } @Override - public final void __sent(Ice.AsyncResult __result) + public final void _iceSent(Ice.AsyncResult result) { - sent(__result.sentSynchronously()); + sent(result.sentSynchronously()); } @Override - public final boolean __hasSentCallback() + public final boolean _iceHasSentCallback() { return true; } diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java index 8c1d0bc837d..740e33354c8 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpEndpointI.java @@ -256,8 +256,8 @@ final class UdpEndpointI extends IPEndpointI super.streamWriteImpl(s); if(s.getEncoding().equals(Ice.Util.Encoding_1_0)) { - Ice.Util.Protocol_1_0.__write(s); - Ice.Util.Encoding_1_0.__write(s); + Ice.Util.Protocol_1_0.write(s); + Ice.Util.Encoding_1_0.write(s); } // Not transmitted. //s.writeBool(_connect); diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java b/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java index 3184c250734..ab73a18b8c7 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ValueWriter.java @@ -84,7 +84,7 @@ public final class ValueWriter { writeName(name, out); Ice.ObjectPrxHelperBase proxy = (Ice.ObjectPrxHelperBase)value; - out.print(proxy.__reference().toString()); + out.print(proxy._getReference().toString()); } else if(value instanceof Ice.Object) { diff --git a/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java b/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java index 09ab74f754f..eb0fa9a3a01 100644 --- a/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java +++ b/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/InitBean.java @@ -41,4 +41,4 @@ public class InitBean implements Init init() { } -}
\ No newline at end of file +} diff --git a/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java b/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java index 4140c7c8fd7..da731b86903 100644 --- a/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java +++ b/java-compat/test/ejb/src/ejb1/com/zeroc/ejb/ServiceI.java @@ -38,4 +38,4 @@ public class ServiceI extends _ServiceDisp { service.addAccount(s); } -}
\ No newline at end of file +} diff --git a/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java b/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java index 277f121cc79..236add0a74f 100644 --- a/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java +++ b/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/InitBean.java @@ -41,4 +41,4 @@ public class InitBean implements Init init() { } -}
\ No newline at end of file +} diff --git a/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java b/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java index 4140c7c8fd7..da731b86903 100644 --- a/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java +++ b/java-compat/test/ejb/src/ejb2/com/zeroc/ejb/ServiceI.java @@ -38,4 +38,4 @@ public class ServiceI extends _ServiceDisp { service.addAccount(s); } -}
\ No newline at end of file +} diff --git a/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java b/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java index 8c63779681c..edad0380d0e 100644 --- a/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java +++ b/java-compat/test/src/main/java/test/Ice/interrupt/TestControllerI.java @@ -32,7 +32,7 @@ class TestControllerI extends test.Ice.interrupt.Test._TestIntfControllerDisp @Override synchronized public void - interrupt(Ice.Current __current) + interrupt(Ice.Current current) throws test.Ice.interrupt.Test.CannotInterruptException { if(_threads.isEmpty()) diff --git a/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java b/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java index 4c006512435..8a1e74ecad3 100644 --- a/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java +++ b/java-compat/test/src/main/java/test/Ice/packagemd/InitialI.java @@ -19,28 +19,28 @@ import test.Ice.packagemd.Test1._notify; public final class InitialI extends _InitialDisp { public Ice.Object - getTest1C2AsObject(Ice.Current __current) + getTest1C2AsObject(Ice.Current current) { return new C2(); } @Override public C1 - getTest1C2AsC1(Ice.Current __current) + getTest1C2AsC1(Ice.Current current) { return new C2(); } @Override public C2 - getTest1C2AsC2(Ice.Current __current) + getTest1C2AsC2(Ice.Current current) { return new C2(); } @Override public void - throwTest1E2AsE1(Ice.Current __current) + throwTest1E2AsE1(Ice.Current current) throws E1 { throw new E2(); @@ -48,7 +48,7 @@ public final class InitialI extends _InitialDisp @Override public void - throwTest1E2AsE2(Ice.Current __current) + throwTest1E2AsE2(Ice.Current current) throws E2 { throw new E2(); @@ -56,35 +56,35 @@ public final class InitialI extends _InitialDisp @Override public void - throwTest1Notify(Ice.Current __current) + throwTest1Notify(Ice.Current current) throws _notify { throw new _notify(); } public Ice.Object - getTest2C2AsObject(Ice.Current __current) + getTest2C2AsObject(Ice.Current current) { return new test.Ice.packagemd.testpkg.Test2.C2(); } @Override public test.Ice.packagemd.testpkg.Test2.C1 - getTest2C2AsC1(Ice.Current __current) + getTest2C2AsC1(Ice.Current current) { return new test.Ice.packagemd.testpkg.Test2.C2(); } @Override public test.Ice.packagemd.testpkg.Test2.C2 - getTest2C2AsC2(Ice.Current __current) + getTest2C2AsC2(Ice.Current current) { return new test.Ice.packagemd.testpkg.Test2.C2(); } @Override public void - throwTest2E2AsE1(Ice.Current __current) + throwTest2E2AsE1(Ice.Current current) throws test.Ice.packagemd.testpkg.Test2.E1 { throw new test.Ice.packagemd.testpkg.Test2.E2(); @@ -92,35 +92,35 @@ public final class InitialI extends _InitialDisp @Override public void - throwTest2E2AsE2(Ice.Current __current) + throwTest2E2AsE2(Ice.Current current) throws test.Ice.packagemd.testpkg.Test2.E2 { throw new test.Ice.packagemd.testpkg.Test2.E2(); } public Ice.Object - getTest3C2AsObject(Ice.Current __current) + getTest3C2AsObject(Ice.Current current) { return new test.Ice.packagemd.testpkg.Test3.C2(); } @Override public test.Ice.packagemd.testpkg.Test3.C1 - getTest3C2AsC1(Ice.Current __current) + getTest3C2AsC1(Ice.Current current) { return new test.Ice.packagemd.testpkg.Test3.C2(); } @Override public test.Ice.packagemd.testpkg.Test3.C2 - getTest3C2AsC2(Ice.Current __current) + getTest3C2AsC2(Ice.Current current) { return new test.Ice.packagemd.testpkg.Test3.C2(); } @Override public void - throwTest3E2AsE1(Ice.Current __current) + throwTest3E2AsE1(Ice.Current current) throws test.Ice.packagemd.testpkg.Test3.E1 { throw new test.Ice.packagemd.testpkg.Test3.E2(); @@ -128,7 +128,7 @@ public final class InitialI extends _InitialDisp @Override public void - throwTest3E2AsE2(Ice.Current __current) + throwTest3E2AsE2(Ice.Current current) throws test.Ice.packagemd.testpkg.Test3.E2 { throw new test.Ice.packagemd.testpkg.Test3.E2(); @@ -136,8 +136,8 @@ public final class InitialI extends _InitialDisp @Override public void - shutdown(Ice.Current __current) + shutdown(Ice.Current current) { - __current.adapter.getCommunicator().shutdown(); + current.adapter.getCommunicator().shutdown(); } } diff --git a/java-compat/test/src/main/java/test/Ice/stream/Client.java b/java-compat/test/src/main/java/test/Ice/stream/Client.java index b00dd482951..6bce9f33e62 100644 --- a/java-compat/test/src/main/java/test/Ice/stream/Client.java +++ b/java-compat/test/src/main/java/test/Ice/stream/Client.java @@ -43,7 +43,7 @@ public class Client extends test.Util.Application public void write(Ice.OutputStream out) { - obj.__write(out); + obj._iceWrite(out); called = true; } @@ -58,7 +58,7 @@ public class Client extends test.Util.Application read(Ice.InputStream in) { obj = new MyClass(); - obj.__read(in); + obj._iceRead(in); called = true; } diff --git a/java-compat/test/src/main/java/test/Slice/keyword/Client.java b/java-compat/test/src/main/java/test/Slice/keyword/Client.java index c972b6320f1..62f377f3fbe 100644 --- a/java-compat/test/src/main/java/test/Slice/keyword/Client.java +++ b/java-compat/test/src/main/java/test/Slice/keyword/Client.java @@ -40,10 +40,10 @@ public class Client @Override public void - checkedCast_async(AMD_catch_checkedCast __cb, int _clone, Ice.Current __current) + checkedCast_async(AMD_catch_checkedCast cb, int _clone, Ice.Current current) { int _continue = 0; - __cb.ice_response(_continue); + cb.ice_response(_continue); } } @@ -56,9 +56,9 @@ public class Client @Override public void - _do(Ice.Current __current) + _do(Ice.Current current) { - assert __current.operation.equals("do"); + assert current.operation.equals("do"); } } @@ -71,7 +71,7 @@ public class Client @Override public void - foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current __current) + foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current current) { } } @@ -103,21 +103,21 @@ public class Client @Override public void - checkedCast_async(AMD_catch_checkedCast __cb, int _clone, Ice.Current __current) + checkedCast_async(AMD_catch_checkedCast cb, int _clone, Ice.Current current) { int _continue = 0; - __cb.ice_response(_continue); + cb.ice_response(_continue); } @Override public void - _do(Ice.Current __current) + _do(Ice.Current current) { } @Override public void - foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current __current) + foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current current) { } } |