Deprecate Communicator::stringToIdentity and identityToString

11 files changed, 18 insertions, 29 deletions

diff --git a/csharp/src/Ice/CommunicatorI.cs b/csharp/src/Ice/CommunicatorI.cs
index e2e1f0015f4..dade480ecc5 100644
--- a/csharp/src/Ice/CommunicatorI.cs
+++ b/csharp/src/Ice/CommunicatorI.cs
@@ -60,12 +60,12 @@ namespace Ice
 
         public Ice.Identity stringToIdentity(string s)
         {
-            return instance_.stringToIdentity(s);
+            return Ice.Util.stringToIdentity(s);
         }
 
         public string identityToString(Ice.Identity ident)
         {
-            return instance_.identityToString(ident);
+            return Ice.Util.identityToString(ident);
         }
 
         public ObjectAdapter createObjectAdapter(string name)
diff --git a/csharp/src/Ice/Incoming.cs b/csharp/src/Ice/Incoming.cs
index 47d892986af..4fdf734e0b6 100644
--- a/csharp/src/Ice/Incoming.cs
+++ b/csharp/src/Ice/Incoming.cs
@@ -222,7 +222,7 @@ namespace IceInternal
                 IceUtilInternal.OutputBase output = new IceUtilInternal.OutputBase(sw);
                 output.setUseTab(false);
                 output.print("dispatch exception:");
-                output.print("\nidentity: " + instance_.identityToString(current_.id));
+                output.print("\nidentity: " + Ice.Util.identityToString(current_.id));
                 output.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(current_.facet, ""));
                 output.print("\noperation: " + current_.operation);
                 if(current_.con != null)
diff --git a/csharp/src/Ice/Instance.cs b/csharp/src/Ice/Instance.cs
index 09d3a9a83b1..2f910483385 100644
--- a/csharp/src/Ice/Instance.cs
+++ b/csharp/src/Ice/Instance.cs
@@ -359,17 +359,6 @@ namespace IceInternal
             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 Ice.ObjectPrx
         createAdmin(Ice.ObjectAdapter adminAdapter, Ice.Identity adminIdentity)
         {
diff --git a/csharp/src/Ice/InstrumentationI.cs b/csharp/src/Ice/InstrumentationI.cs
index 3eca65b7ed6..a6d733af7fe 100644
--- a/csharp/src/Ice/InstrumentationI.cs
+++ b/csharp/src/Ice/InstrumentationI.cs
@@ -395,7 +395,7 @@ namespace IceInternal
 
         public string getIdentity()
         {
-            return _current.adapter.getCommunicator().identityToString(_current.id);
+            return Ice.Util.identityToString(_current.id);
         }
 
         readonly private Ice.Current _current;
@@ -500,7 +500,7 @@ namespace IceInternal
                     catch(Ice.Exception)
                     {
                         // 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();
@@ -532,7 +532,7 @@ namespace IceInternal
         {
             if(_proxy != null)
             {
-                return _proxy.ice_getCommunicator().identityToString(_proxy.ice_getIdentity());
+                return Ice.Util.identityToString(_proxy.ice_getIdentity());
             }
             else
             {
diff --git a/csharp/src/Ice/LocatorInfo.cs b/csharp/src/Ice/LocatorInfo.cs
index 92497315fa1..01c064b9f4e 100644
--- a/csharp/src/Ice/LocatorInfo.cs
+++ b/csharp/src/Ice/LocatorInfo.cs
@@ -523,7 +523,7 @@ namespace IceInternal
             }
             else
             {
-                s.Append("object = " + r.getInstance().identityToString(r.getIdentity()) + "\n");
+                s.Append("object = " + Ice.Util.identityToString(r.getIdentity()) + "\n");
             }
 
             s.Append("endpoints = ");
@@ -569,13 +569,13 @@ namespace IceInternal
                 {
                     System.Text.StringBuilder s = new System.Text.StringBuilder();
                     s.Append("object not found\n");
-                    s.Append("object = " + instance.identityToString(@ref.getIdentity()));
+                    s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity()));
                     instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString());
                 }
 
                 Ice.NotRegisteredException e = new Ice.NotRegisteredException(ex);
                 e.kindOfObject = "object";
-                e.id = instance.identityToString(@ref.getIdentity());
+                e.id = Ice.Util.identityToString(@ref.getIdentity());
                 throw e;
             }
             catch(Ice.NotRegisteredException)
@@ -595,7 +595,7 @@ namespace IceInternal
                     }
                     else
                     {
-                        s.Append("object = " + instance.identityToString(@ref.getIdentity()) + "\n");
+                        s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity()) + "\n");
                     }
                     s.Append("reason = " + ex);
                     instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString());
@@ -634,7 +634,7 @@ namespace IceInternal
                 else
                 {
                     s.Append("object\n");
-                    s.Append("object = " + instance.identityToString(@ref.getIdentity()));
+                    s.Append("object = " + Ice.Util.identityToString(@ref.getIdentity()));
                 }
                 instance.initializationData().logger.trace(instance.traceLevels().locationCat, s.ToString());
             }
@@ -674,7 +674,7 @@ namespace IceInternal
                 Instance instance = @ref.getInstance();
                 System.Text.StringBuilder s = new System.Text.StringBuilder();
                 s.Append("searching for object by id\nobject = ");
-                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/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs
index 50bdc56ad33..03c3ff6333e 100644
--- a/csharp/src/Ice/ObjectAdapterI.cs
+++ b/csharp/src/Ice/ObjectAdapterI.cs
@@ -926,7 +926,7 @@ namespace Ice
                         {
                             Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException();
                             ex.kindOfObject = "object adapter with router";
-                            ex.id = instance_.identityToString(router.ice_getIdentity());
+                            ex.id = Ice.Util.identityToString(router.ice_getIdentity());
                             throw ex;
                         }
 
diff --git a/csharp/src/Ice/Reference.cs b/csharp/src/Ice/Reference.cs
index 5b827fc0935..37644c85a6e 100644
--- a/csharp/src/Ice/Reference.cs
+++ b/csharp/src/Ice/Reference.cs
@@ -295,7 +295,7 @@ namespace IceInternal
             // 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/csharp/src/Ice/ReferenceFactory.cs b/csharp/src/Ice/ReferenceFactory.cs
index 0bbdbc5a23c..1e106659258 100644
--- a/csharp/src/Ice/ReferenceFactory.cs
+++ b/csharp/src/Ice/ReferenceFactory.cs
@@ -134,7 +134,7 @@ namespace IceInternal
             //
             // 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/csharp/src/Ice/ServantManager.cs b/csharp/src/Ice/ServantManager.cs
index d1f5353d54c..a369af5ef1d 100644
--- a/csharp/src/Ice/ServantManager.cs
+++ b/csharp/src/Ice/ServantManager.cs
@@ -37,7 +37,7 @@ public sealed 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)
                     {
diff --git a/csharp/src/Ice/TraceUtil.cs b/csharp/src/Ice/TraceUtil.cs
index e191dfe7e05..f815b712473 100644
--- a/csharp/src/Ice/TraceUtil.cs
+++ b/csharp/src/Ice/TraceUtil.cs
@@ -177,7 +177,7 @@ namespace IceInternal
             {
                 Ice.Identity identity = new Ice.Identity();
                 identity.read__(str);
-                s.Write("\nidentity = " + str.instance().identityToString(identity));
+                s.Write("\nidentity = " + Ice.Util.identityToString(identity));
 
                 string[] facet = str.readStringSeq();
                 s.Write("\nfacet = ");
diff --git a/csharp/src/IceDiscovery/PluginI.cs b/csharp/src/IceDiscovery/PluginI.cs
index 2ec46a07d96..740256af9fd 100644
--- a/csharp/src/IceDiscovery/PluginI.cs
+++ b/csharp/src/IceDiscovery/PluginI.cs
@@ -115,7 +115,7 @@ namespace IceDiscovery
             // 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));