(file) Return to CIMClassRep.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/CIMClassRep.cpp between version 1.76.4.1 and 1.90

version 1.76.4.1, 2007/12/19 14:51:11 version 1.90, 2008/12/01 17:49:47
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; Symantec Corporation; The Open Group.  
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // Permission is hereby granted, free of charge, to any person obtaining a
 // of this software and associated documentation files (the "Software"), to  // copy of this software and associated documentation files (the "Software"),
 // deal in the Software without restriction, including without limitation the  // to deal in the Software without restriction, including without limitation
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // sell copies of the Software, and to permit persons to whom the Software is  // and/or sell copies of the Software, and to permit persons to whom the
 // furnished to do so, subject to the following conditions:  // Software is furnished to do so, subject to the following conditions:
 // //
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // The above copyright notice and this permission notice shall be included
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // in all copies or substantial portions of the Software.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   //
   //////////////////////////////////////////////////////////////////////////
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include "CIMClassRep.h" #include "CIMClassRep.h"
 #include "DeclContext.h" #include "DeclContext.h"
 #include "Resolver.h" #include "Resolver.h"
 #include "Indentor.h"  
 #include "CIMName.h" #include "CIMName.h"
 #include "CIMQualifierNames.h" #include "CIMQualifierNames.h"
 #include "CIMScope.h" #include "CIMScope.h"
 #include "XmlWriter.h"  
 #include "MofWriter.h"  
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/MessageLoader.h> #include <Pegasus/Common/MessageLoader.h>
 #include "CIMNameUnchecked.h"  
 #include "StrLit.h" #include "StrLit.h"
 #include "CIMInstanceRep.h" #include "CIMInstanceRep.h"
   #include "CIMPropertyInternal.h"
   #include "CIMMethodRep.h"
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
 PEGASUS_USING_STD; PEGASUS_USING_STD;
Line 96 
Line 92 
     value.get(flag);     value.get(flag);
     return flag;     return flag;
 } }
 void CIMClassRep::setSuperClassName(const CIMName& superClassName)  
 {  
     _superClassName = superClassName;  
 }  
  
 void CIMClassRep::addProperty(const CIMProperty& x) void CIMClassRep::addProperty(const CIMProperty& x)
 { {
Line 151 
Line 143 
     _methods.append(x);     _methods.append(x);
 } }
  
 Uint32 CIMClassRep::findMethod(const CIMName& name) const  
 {  
     for (Uint32 i = 0, n = _methods.size(); i < n; i++)  
     {  
         if (name.equal(_methods[i].getName()))  
             return i;  
     }  
   
     return PEG_NOT_FOUND;  
 }  
   
 CIMMethod CIMClassRep::getMethod(Uint32 index)  
 {  
     if (index >= _methods.size())  
         throw IndexOutOfBoundsException();  
   
     return _methods[index];  
 }  
   
 Uint32 CIMClassRep::getMethodCount() const  
 {  
     return _methods.size();  
 }  
   
 void CIMClassRep::removeMethod(Uint32 index)  
 {  
     if (index >= _methods.size())  
         throw IndexOutOfBoundsException();  
   
     _methods.remove(index);  
 }  
   
 void CIMClassRep::resolve( void CIMClassRep::resolve(
     DeclContext* context,     DeclContext* context,
     const CIMNamespaceName& nameSpace)     const CIMNamespaceName& nameSpace)
 { {
     PEG_METHOD_ENTER(TRC_OBJECTRESOLUTION, "CIMClassRep::resolve()");     PEG_METHOD_ENTER(TRC_OBJECTRESOLUTION, "CIMClassRep::resolve()");
 #if 0  
     if (_resolved)  
         throw ClassAlreadyResolved(_reference.getClassName());  
 #endif  
     if (!context)     if (!context)
         throw NullPointer();         throw NullPointer();
  
     PEG_TRACE_STRING(TRC_OBJECTRESOLUTION, Tracer::LEVEL3,      PEG_TRACE((TRC_OBJECTRESOLUTION, Tracer::LEVEL4,
         String("CIMClassRep::resolve  class = ") +          "CIMClassRep::resolve  class = %s, superclass = %s",
         _reference.getClassName().getString() + ", superclass = " +          (const char*)_reference.getClassName().getString().getCString(),
         _superClassName.getString());          (const char*)_superClassName.getString().getCString()));
  
     if (!_superClassName.isNull())     if (!_superClassName.isNull())
     {     {
Line 213 
Line 170 
             throw PEGASUS_CIM_EXCEPTION(CIM_ERR_INVALID_SUPERCLASS,             throw PEGASUS_CIM_EXCEPTION(CIM_ERR_INVALID_SUPERCLASS,
                 _superClassName.getString());                 _superClassName.getString());
  
 #if 0  
         if (!superClass._rep->_resolved)  
             throw ClassNotResolved(_superClassName);  
 #endif  
         // If subclass is abstract but superclass not, throw CIM Exception         // If subclass is abstract but superclass not, throw CIM Exception
  
         /* ATTN:KS-24 Mar 2002 P1 - Test this and confirm that rule is correct         /* ATTN:KS-24 Mar 2002 P1 - Test this and confirm that rule is correct
Line 291 
Line 244 
             // insert it (setting the propagated flag). Otherwise, change             // insert it (setting the propagated flag). Otherwise, change
             // the class-origin and propagated flag accordingly.             // the class-origin and propagated flag accordingly.
  
             Uint32 index = PEG_NOT_FOUND;              Uint32 index = findProperty(superClassProperty.getName());
             /* ATTN: KS move to simpler version of the find  
             for (Uint32 j = m, n = _properties.size(); j < n; j++)  
             {  
                 if (_properties[j].getName() == superClassProperty.getName())  
                 {  
                     index = j;  
                     break;  
                 }  
             }  
             */  
             index = findProperty(superClassProperty.getName());  
  
             // If property exists in super class but not in this one, then             // If property exists in super class but not in this one, then
             // clone and insert it. Otherwise, the properties class             // clone and insert it. Otherwise, the properties class
Line 324 
Line 266 
                 // but not on the subclass's, then add it to the subclass's                 // but not on the subclass's, then add it to the subclass's
                 // property's qualifier list.                 // property's qualifier list.
                 CIMProperty subproperty = _properties[index];                 CIMProperty subproperty = _properties[index];
                 for (Uint32 i = 0, n = superproperty.getQualifierCount();                  for (Uint32 j = 0, qc = superproperty.getQualifierCount();
                      i < n; i++)                       j < qc; j++)
                 {                 {
                     Uint32 index = PEG_NOT_FOUND;  
                     CIMQualifier superClassQualifier =                     CIMQualifier superClassQualifier =
                         superproperty.getQualifier(i);                          superproperty.getQualifier(j);
                     const CIMName name = superClassQualifier.getName();                     const CIMName name = superClassQualifier.getName();
                     /* ATTN KS This is replacement find function.                      if (subproperty.findQualifier(name) == PEG_NOT_FOUND)
                     if (Uint32 j = subproperty.findQualifier(q.getName()) ==  
                         PEG_NOT_FOUND)  
                     {  
                         subproperty.addQualifier(superClassQualifier);  
                     }  
                     */  
                     for (Uint32 j = 0, m = subproperty.getQualifierCount();  
                          j < m;  
                          j++)  
                     {  
                         CIMConstQualifier q = subproperty.getQualifier(j);  
                         if (name.equal(q.getName()))  
                         {  
                             index = j;  
                             break;  
                         }  
                     }  // end comparison of subclass property's qualifiers  
                     if (index == PEG_NOT_FOUND)  
                     {                     {
                         subproperty.addQualifier(superClassQualifier);                         subproperty.addQualifier(superClassQualifier);
                     }                     }
                     /*  
                     if ((index = subproperty.findQualifier(name)) ==  
                         PEG_NOT_FOUND)  
                     {  
                         subproperty.addQualifier(superClassQualifier);  
                     }  
                     */  
                 } // end iteration over superclass property's qualifiers                 } // end iteration over superclass property's qualifiers
             }             }
         }         }
Line 486 
Line 402 
             dummy,             dummy,
             true);             true);
     }     }
   
     // _resolved = true;  
 } }
  
 CIMInstance CIMClassRep::buildInstance(Boolean includeQualifiers, CIMInstance CIMClassRep::buildInstance(Boolean includeQualifiers,
Line 551 
Line 465 
     return newInstance;     return newInstance;
 } }
  
 void CIMClassRep::toXml(Buffer& out) const  
 {  
     // Class opening element:  
   
     out << STRLIT("<CLASS ");  
     out << STRLIT(" NAME=\"") << _reference.getClassName() << STRLIT("\" ");  
   
     if (!_superClassName.isNull())  
         out << STRLIT(" SUPERCLASS=\"") << _superClassName << STRLIT("\" ");  
   
     out << STRLIT(">\n");  
   
     // Append Class Qualifiers:  
   
     _qualifiers.toXml(out);  
   
     // Append Property definitions:  
   
     for (Uint32 i = 0, n = _properties.size(); i < n; i++)  
         XmlWriter::appendPropertyElement(out, _properties[i]);  
   
     // Append Method definitions:  
   
     for (Uint32 i = 0, n = _methods.size(); i < n; i++)  
         XmlWriter::appendMethodElement(out, _methods[i]);  
   
     // Class closing element:  
   
     out << STRLIT("</CLASS>\n");  
 }  
   
 /** toMof prepares an 8-bit string with the MOF for the class.  
     The BNF for this is:  
     <pre>  
     classDeclaration    =    [ qualifierList ]  
                              CLASS className [ alias ] [ superClass ]  
                              "{" *classFeature "}" ";"  
   
     superClass          =    :" className  
   
     classFeature        =    propertyDeclaration | methodDeclaration  
   
 */  
   
 void CIMClassRep::toMof(Buffer& out) const  
 {  
     // Get and format the class qualifiers  
     out << STRLIT("\n//    Class ") << _reference.getClassName();  
     if (_qualifiers.getCount())  
         out.append('\n');  
     out.append('\n');  
     _qualifiers.toMof(out);  
   
     // Separate qualifiers from Class Name  
     out.append('\n');  
   
     // output class statement  
     out << STRLIT("class ") << _reference.getClassName();  
   
     if (!_superClassName.isNull())  
         out << STRLIT(" : ") << _superClassName;  
   
     out << STRLIT("\n{");  
   
     // format the Properties:  
     for (Uint32 i = 0, n = _properties.size(); i < n; i++)  
     {  
         // Generate MOF if this property not propagated  
         // Note that the test is required only because  
         // there is an error in getclass that does not  
         // test the localOnly flag  
         // The inital "false" indicates to format as property declaration.  
         if (!_properties[i].getPropagated())  
             MofWriter::appendPropertyElement(true, out, _properties[i]);  
     }  
   
     // Format the Methods:  for non-propagated methods  
     for (Uint32 i = 0, n = _methods.size(); i < n; i++)  
     {  
         if (!_methods[i].getPropagated())  
             MofWriter::appendMethodElement(out, _methods[i]);  
     }  
   
     // Class closing element:  
     out << STRLIT("\n};\n");  
 }  
   
   
 CIMClassRep::CIMClassRep()  
 {  
 }  
   
 CIMClassRep::CIMClassRep(const CIMClassRep& x) : CIMClassRep::CIMClassRep(const CIMClassRep& x) :
     CIMObjectRep(x),     CIMObjectRep(x),
     _superClassName(x._superClassName)     _superClassName(x._superClassName)
Line 662 
Line 484 
     if (!tmprep)     if (!tmprep)
         return false;         return false;
  
       // If the pointers are the same, the objects must be identical
       if (this == tmprep)
       {
           return true;
       }
   
     if (!_superClassName.equal (tmprep->_superClassName))     if (!_superClassName.equal (tmprep->_superClassName))
         return false;         return false;
  
Line 670 
Line 498 
     //     //
  
     {     {
         const Array<CIMMethod>& tmp1 = _methods;          const MethodSet& tmp1 = _methods;
         const Array<CIMMethod>& tmp2 = tmprep->_methods;          const MethodSet& tmp2 = tmprep->_methods;
  
         if (tmp1.size() != tmp2.size())         if (tmp1.size() != tmp2.size())
             return false;             return false;
Line 689 
Line 517 
         }         }
     }     }
  
     if (_resolved != tmprep->_resolved)  
         return false;  
   
     return true;     return true;
 } }
  
Line 703 
Line 528 
     {     {
         CIMConstProperty property = getProperty(i);         CIMConstProperty property = getProperty(i);
  
         Uint32 index;          if (CIMPropertyInternal::isKeyProperty(property))
         if ((index = property.findQualifier(          {
             CIMNameUnchecked("key"))) != PEG_NOT_FOUND)  
         {  
             CIMValue value;  
             value = property.getQualifier (index).getValue ();  
             if (!value.isNull ())  
             {  
                 Boolean isKey;  
                 value.get (isKey);  
                 if (isKey)  
                     keyNames.append(property.getName());                     keyNames.append(property.getName());
             }             }
         }         }
     }     }
 }  
  
 Boolean CIMClassRep::hasKeys() const Boolean CIMClassRep::hasKeys() const
 { {
     for (Uint32 i = 0, n = getPropertyCount(); i < n; i++)     for (Uint32 i = 0, n = getPropertyCount(); i < n; i++)
     {     {
         CIMConstProperty property = getProperty(i);         CIMConstProperty property = getProperty(i);
           if (CIMPropertyInternal::isKeyProperty(property))
         Uint32 index;          {
         if ((index = property.findQualifier(  
             CIMNameUnchecked("key"))) != PEG_NOT_FOUND)  
         {  
             CIMValue value;  
             value = property.getQualifier (index).getValue ();  
             if (!value.isNull ())  
             {  
                 Boolean isKey;  
                 value.get (isKey);  
                 if (isKey)  
                     return true;                     return true;
             }             }
         }         }
     }  
   
     return false;     return false;
 } }
  

Legend:
Removed from v.1.76.4.1  
changed lines
  Added in v.1.90
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2