HP-RK API Review: Remove CIMInstance::toString method.

diff --git a/src/Pegasus/Common/CIMInstance.cpp b/src/Pegasus/Common/CIMInstance.cpp
index eded0ef3e46f318e35b3a15dc1918cdde7e1df39..61195333d44688eb8d961444b57cbca725eeb3c3 100644 (file)
--- a/src/Pegasus/Common/CIMInstance.cpp
+++ b/src/Pegasus/Common/CIMInstance.cpp
@@ -202,12 +202,6 @@ CIMObjectPath CIMInstance::buildPath(const CIMConstClass& cimClass) const
     return _rep->buildPath(cimClass);
 }
 
-String CIMInstance::toString() const
-{
-    _checkRep();
-    return _rep->toString();
-}
-
 void CIMInstance::_checkRep() const
 {
     if (!_rep)
@@ -350,12 +344,6 @@ CIMObjectPath CIMConstInstance::buildPath(const CIMConstClass& cimClass) const
     return _rep->buildPath(cimClass);
 }
 
-String CIMConstInstance::toString() const
-{
-    _checkRep();
-    return _rep->toString();
-}
-
 void CIMConstInstance::_checkRep() const
 {
     if (!_rep)

diff --git a/src/Pegasus/Common/CIMInstance.h b/src/Pegasus/Common/CIMInstance.h
index 7a7de4194e9a33ba446b8cb213909da601dc1697..b5d85cc9ecb2649b0fb9dcf940ff5ae67512e8d0 100644 (file)
--- a/src/Pegasus/Common/CIMInstance.h
+++ b/src/Pegasus/Common/CIMInstance.h
@@ -247,10 +247,6 @@ public:
      */
     Boolean isUninitialized() const;
 
-#ifdef PEGASUS_INTERNALONLY
-    String toString() const;
-#endif
-
 private:
 
     CIMInstanceRep* _rep;
@@ -319,10 +315,6 @@ public:
 
     Boolean isUninitialized() const;
 
-#ifdef PEGASUS_INTERNALONLY
-    String toString() const;
-#endif
-
 private:
 
     CIMInstanceRep* _rep;

diff --git a/src/Pegasus/Common/CIMInstanceRep.cpp b/src/Pegasus/Common/CIMInstanceRep.cpp
index c4e17632cb5e9d7bbbd4d29d85dc2a65f227b925..66819eabbc13c9e5fcf755cee519691d555c84ba 100644 (file)
--- a/src/Pegasus/Common/CIMInstanceRep.cpp
+++ b/src/Pegasus/Common/CIMInstanceRep.cpp
@@ -340,66 +340,4 @@ CIMObjectPath CIMInstanceRep::buildPath(
     return CIMObjectPath(String(), String(), className, keyBindings);
 }
 
-String CIMInstanceRep::toString() const
-{
-    String objectName;
-    CIMObjectPath object = getPath();
-
-    // Get the host:
-
-    if (object.getHost().size() && !object.getNameSpace().isNull())
-    {
-        objectName = "//";
-        objectName.append(object.getHost());
-        objectName.append("/");
-
-        objectName.append(object.getNameSpace().getString ());
-        objectName.append(":");
-    }
-
-    // Get the class name:
-
-    const CIMName& className = getClassName();
-    objectName.append(className.getString ());
-
-    //if (isClassName())
-    //    return objectName;
-
-    objectName.append('.');
-
-    // Append each key-value pair:
-
-    //const Array<CIMKeyBinding>& keyBindings = getKeyBindings();
-    CIMConstProperty prop;
-
-    for (Uint32 i = 0, n = getPropertyCount(); i < n; i++)
-    {
-        prop = getProperty(i);
-        objectName.append(prop.getName().getString ());
-        objectName.append('=');
-
-        //const String& value = _escapeSpecialCharacters(
-        //    prop.getValue());
-        objectName.append(prop.getValue().toString());
-
-        //CIMValue type = prop.getType();
-
-        //if (type == CIMKeyBinding::REFERENCE)
-        //    objectName.append('R');
-
-        //if (type == CIMKeyBinding::STRING || type == CIMKeyBinding::REFERENCE)
-        //    objectName.append('"');
-
-        //objectName.append(value);
-
-        //if (type == CIMKeyBinding::STRING || type == CIMKeyBinding::REFERENCE)
-        //    objectName.append('"');
-
-        if (i + 1 != n)
-            objectName.append(',');
-    }
-
-    return objectName;
-}
-
 PEGASUS_NAMESPACE_END

diff --git a/src/Pegasus/Common/CIMInstanceRep.h b/src/Pegasus/Common/CIMInstanceRep.h
index 3a951e6aeaedd63964d6d78ba9403c87e194cd2a..eb0e7ed67810c21ebe7894ab32fd9db65aecd64b 100644 (file)
--- a/src/Pegasus/Common/CIMInstanceRep.h
+++ b/src/Pegasus/Common/CIMInstanceRep.h
@@ -69,8 +69,6 @@ public:
 
     CIMObjectPath buildPath(const CIMConstClass& cimClass) const;
 
-    String toString() const;
-
 private:
 
     CIMInstanceRep();

diff --git a/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationTable.cpp b/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationTable.cpp
index f751241528b678c74af96bf1e62edbcada583f9b..b29a8609379e44a4bbd0f90c6b8537b71714b599 100644 (file)
--- a/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationTable.cpp
+++ b/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationTable.cpp
@@ -46,7 +46,7 @@ ProviderRegistrationTable::ProviderRegistrationTable(
     for (Uint32 i=0; i < _instances.size(); i++)
     {
         PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL4,
-                         _instances[i].toString());
+                         _instances[i].getPath().toString());
     }
     PEG_METHOD_EXIT();
 }