diff options
Diffstat (limited to 'java/src')
21 files changed, 36 insertions, 48 deletions
diff --git a/java/src/Ice/src/main/java/Ice/CommunicatorI.java b/java/src/Ice/src/main/java/Ice/CommunicatorI.java index 371a3a39aaf..1713b0dc05e 100644 --- a/java/src/Ice/src/main/java/Ice/CommunicatorI.java +++ b/java/src/Ice/src/main/java/Ice/CommunicatorI.java @@ -71,14 +71,14 @@ public final class CommunicatorI implements Communicator public Ice.Identity stringToIdentity(String s) { - return _instance.stringToIdentity(s); + return Ice.Util.stringToIdentity(s); } @Override public String identityToString(Ice.Identity ident) { - return _instance.identityToString(ident); + return Ice.Util.identityToString(ident); } @Override diff --git a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java index f645c6c5ccd..1aeef2206fa 100644 --- a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -980,7 +980,7 @@ public final class ObjectAdapterI implements ObjectAdapter if(_routerInfo.getAdapter() != null) { throw new AlreadyRegisteredException("object adapter with router", - _instance.identityToString(router.ice_getIdentity())); + Ice.Util.identityToString(router.ice_getIdentity())); } // diff --git a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java index 5b9f377d807..095948736e3 100644 --- a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java @@ -319,7 +319,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb public String getIdentity() { - return _current.adapter.getCommunicator().identityToString(_current.id); + return Ice.Util.identityToString(_current.id); } final private Ice.Current _current; @@ -428,7 +428,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb catch(Exception ex) { // Either a fixed proxy or the communicator is destroyed. - os.append(_proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity())); + os.append(Ice.Util.identityToString(_proxy.ice_getIdentity())); os.append(" [").append(_operation).append(']'); } _id = os.toString(); @@ -458,7 +458,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb { if(_proxy != null) { - return _proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity()); + return Ice.Util.identityToString(_proxy.ice_getIdentity()); } else { diff --git a/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java index c57bc1ad407..ebbf963aba9 100644 --- a/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionObserverI.java @@ -59,4 +59,4 @@ public class ConnectionObserverI private int _sentBytes; private int _receivedBytes; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java index 151343941af..93c853c9853 100644 --- a/java/src/Ice/src/main/java/IceInternal/IncomingBase.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingBase.java @@ -235,7 +235,7 @@ class IncomingBase IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print("dispatch exception:"); - out.print("\nidentity: " + _instance.identityToString(_current.id)); + out.print("\nidentity: " + Ice.Util.identityToString(_current.id)); out.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(_current.facet, "")); out.print("\noperation: " + _current.operation); if(_current.con != null) diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index 1f019001136..1543bc1ebf1 100644 --- a/java/src/Ice/src/main/java/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java @@ -420,18 +420,6 @@ public final class Instance implements Ice.ClassResolver return _implicitContext; } - public Ice.Identity - stringToIdentity(String s) - { - return Ice.Util.stringToIdentity(s); - } - - public String - identityToString(Ice.Identity ident) - { - return Ice.Util.identityToString(ident); - } - public synchronized Ice.ObjectPrx createAdmin(Ice.ObjectAdapter adminAdapter, Ice.Identity adminIdentity) { diff --git a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java index 87afdb394b7..82c4dea0e25 100644 --- a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java +++ b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java @@ -466,7 +466,7 @@ public final class LocatorInfo else { s.append("object = "); - s.append(ref.getInstance().identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } @@ -518,13 +518,13 @@ public final class LocatorInfo StringBuilder s = new StringBuilder(128); s.append("object not found\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); } Ice.NotRegisteredException e = new Ice.NotRegisteredException(); e.kindOfObject = "object"; - e.id = instance.identityToString(ref.getIdentity()); + e.id = Ice.Util.identityToString(ref.getIdentity()); throw e; } catch(Ice.NotRegisteredException ex) @@ -547,7 +547,7 @@ public final class LocatorInfo else { s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } s.append("reason = " + ex); @@ -591,7 +591,7 @@ public final class LocatorInfo { s.append("object\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); s.append("\n"); } instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); @@ -630,7 +630,7 @@ public final class LocatorInfo StringBuilder s = new StringBuilder(128); s.append("searching for object by id\n"); s.append("object = "); - s.append(instance.identityToString(ref.getIdentity())); + s.append(Ice.Util.identityToString(ref.getIdentity())); instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.toString()); } diff --git a/java/src/Ice/src/main/java/IceInternal/Reference.java b/java/src/Ice/src/main/java/IceInternal/Reference.java index e765cec180c..b7ea1dd2f32 100644 --- a/java/src/Ice/src/main/java/IceInternal/Reference.java +++ b/java/src/Ice/src/main/java/IceInternal/Reference.java @@ -311,7 +311,7 @@ public abstract class Reference implements Cloneable // the reference parser uses as separators, then we enclose // the identity string in quotes. // - String id = _instance.identityToString(_identity); + String id = Ice.Util.identityToString(_identity); if(IceUtilInternal.StringUtil.findFirstOf(id, " :@") != -1) { s.append('"'); diff --git a/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java index 874f977c471..ed36537017e 100644 --- a/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java +++ b/java/src/Ice/src/main/java/IceInternal/ReferenceFactory.java @@ -127,7 +127,7 @@ public final class ReferenceFactory // // Parsing the identity may raise IdentityParseException. // - Ice.Identity ident = _instance.stringToIdentity(idstr); + Ice.Identity ident = Ice.Util.stringToIdentity(idstr); if(ident.name.length() == 0) { diff --git a/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java index 12af3e0b1c4..f7c35f706eb 100644 --- a/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/RemoteObserverI.java @@ -31,4 +31,4 @@ public class RemoteObserverI _delegate.reply(size); } } -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/ServantManager.java b/java/src/Ice/src/main/java/IceInternal/ServantManager.java index 4382a3044eb..2789304f276 100644 --- a/java/src/Ice/src/main/java/IceInternal/ServantManager.java +++ b/java/src/Ice/src/main/java/IceInternal/ServantManager.java @@ -32,7 +32,7 @@ public final class ServantManager if(m.containsKey(facet)) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length() > 0) { @@ -77,7 +77,7 @@ public final class ServantManager if(m == null || (obj = m.remove(facet)) == null) { Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; if(facet.length() > 0) { @@ -120,7 +120,7 @@ public final class ServantManager if(m == null) { Ice.NotRegisteredException ex = new Ice.NotRegisteredException(); - ex.id = _instance.identityToString(ident); + ex.id = Ice.Util.identityToString(ident); ex.kindOfObject = "servant"; throw ex; } diff --git a/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java index 2dc06f8b1c2..553e46840bf 100644 --- a/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/ThreadObserverI.java @@ -65,4 +65,4 @@ public class ThreadObserverI private Ice.Instrumentation.ThreadState _oldState; private Ice.Instrumentation.ThreadState _newState; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java index ec6d9ff910c..2ff165c475d 100644 --- a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java +++ b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java @@ -168,7 +168,7 @@ public final class TraceUtil { Ice.Identity identity = new Ice.Identity(); identity.__read(stream); - out.write("\nidentity = " + stream.instance().identityToString(identity)); + out.write("\nidentity = " + Ice.Util.identityToString(identity)); String[] facet = stream.readStringSeq(); out.write("\nfacet = "); diff --git a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java index 8d5aac39062..84dfc57d19f 100644 --- a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java +++ b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java @@ -185,4 +185,4 @@ public class MetricsHelper<T> } private AttributeResolver _attributes; -}
\ No newline at end of file +} diff --git a/java/src/Ice/src/main/java/IceMX/ObserverFactory.java b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java index a629ee38b7e..ca06b0a8c00 100644 --- a/java/src/Ice/src/main/java/IceMX/ObserverFactory.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverFactory.java @@ -139,4 +139,4 @@ public class ObserverFactory<T extends Metrics, O extends Observer<T>> private java.util.List<MetricsMap<T>> _maps = new java.util.ArrayList<MetricsMap<T>>(); private volatile boolean _enabled; private Runnable _updater; -}
\ No newline at end of file +} diff --git a/java/src/IceBox/src/main/java/IceBox/Admin.java b/java/src/IceBox/src/main/java/IceBox/Admin.java index 0b363f83c6a..52e39ee771e 100644 --- a/java/src/IceBox/src/main/java/IceBox/Admin.java +++ b/java/src/IceBox/src/main/java/IceBox/Admin.java @@ -84,7 +84,7 @@ public final class Admin return 1; } - managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" :" + managerEndpoints; + managerProxy = "\"" + Ice.Util.identityToString(managerIdentity) + "\" :" + managerEndpoints; } else { @@ -95,7 +95,7 @@ public final class Admin return 1; } - managerProxy = "\"" + communicator().identityToString(managerIdentity) + "\" @" + managerAdapterId; + managerProxy = "\"" + Ice.Util.identityToString(managerIdentity) + "\" @" + managerAdapterId; } base = communicator().stringToProxy(managerProxy); diff --git a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java index 3b586d4ccf7..4f45834c7ea 100644 --- a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java @@ -106,7 +106,7 @@ public class PluginI implements Ice.Plugin // Add lookup and lookup reply Ice objects // LookupI lookup = new LookupI(locatorRegistry, LookupPrxHelper.uncheckedCast(lookupPrx), properties); - _multicastAdapter.add(lookup, _communicator.stringToIdentity("IceDiscovery/Lookup")); + _multicastAdapter.add(lookup, Ice.Util.stringToIdentity("IceDiscovery/Lookup")); Ice.ObjectPrx lookupReply = _replyAdapter.addWithUUID(new LookupReplyI(lookup)).ice_datagram(); lookup.setLookupReply(LookupReplyPrxHelper.uncheckedCast(lookupReply)); diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java index 30d5e204a2d..a06e8617f97 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java @@ -2079,7 +2079,7 @@ public class Coordinator cb.setRegistry(RegistryPrxHelper. uncheckedCast(_communicator.stringToProxy( - "\"" + _communicator.identityToString(masterRegistryId) + "\""))); + "\"" + Ice.Util.identityToString(masterRegistryId) + "\""))); } // diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java index 0c63f23da50..4c21bee85bd 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Fallback.java @@ -75,4 +75,4 @@ public class Fallback extends javax.swing.JApplet System.exit(1); } } -}
\ No newline at end of file +} diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java index ed358694cee..4e6ad314dce 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/MainProxy.java @@ -93,4 +93,4 @@ public class MainProxy } private static String[] _args = new String[]{}; -}
\ No newline at end of file +} diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java index 64a0718824d..fa178e40271 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/SessionKeeper.java @@ -1184,7 +1184,7 @@ public class SessionKeeper { Ice.LocatorPrx prx = Ice.LocatorPrxHelper.uncheckedCast( communicator.stringToProxy( - communicator.identityToString(locator.ice_getIdentity()) + + Ice.Util.identityToString(locator.ice_getIdentity()) + ":" + e.toString())); if(_directDiscoveryEndpointModel.indexOf(prx) == -1) @@ -2288,7 +2288,7 @@ public class SessionKeeper id.name = "Locator"; id.category = _directInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_directCustomEndpointValue.getText()); _coordinator.getCommunicator().stringToProxy(endpoint.toString()); @@ -2345,7 +2345,7 @@ public class SessionKeeper id.name = "router"; id.category = _routedInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_routedCustomEndpointValue.getText()); _coordinator.getCommunicator().stringToProxy(endpoint.toString()); @@ -3189,7 +3189,7 @@ public class SessionKeeper id.name = "Locator"; id.category = _directInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_directCustomEndpointValue.getText()); return containsSecureEndpoints(endpoint.toString()); @@ -3207,7 +3207,7 @@ public class SessionKeeper id.name = "router"; id.category = _routedInstanceName.getText(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(_routedCustomEndpointValue.getText()); return containsSecureEndpoints(endpoint.toString()); @@ -3399,7 +3399,7 @@ public class SessionKeeper id.name = inf.getDirect() ? "Locator" : "router"; id.category = inf.getInstanceName(); StringBuilder endpoint = new StringBuilder(); - endpoint.append(_coordinator.getCommunicator().identityToString(id)); + endpoint.append(Ice.Util.identityToString(id)); endpoint.append(":"); endpoint.append(inf.getEndpoint()); ssl = containsSecureEndpoints(endpoint.toString()); |