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

Diff for /pegasus/src/Pegasus/Common/CIMQualifierList.cpp between version 1.17 and 1.18

version 1.17, 2001/12/13 14:53:55 version 1.18, 2002/03/08 01:53:03
Line 34 
Line 34 
 #include "XmlWriter.h" #include "XmlWriter.h"
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
   PEGASUS_USING_STD;
  
 CIMQualifierList::CIMQualifierList() CIMQualifierList::CIMQualifierList()
 { {
Line 118 
Line 119 
     for (Uint32 i = 0, n = _qualifiers.size(); i < n; i++)     for (Uint32 i = 0, n = _qualifiers.size(); i < n; i++)
     {     {
         CIMQualifier q = _qualifiers[i];         CIMQualifier q = _qualifiers[i];
           //cout << "KSTEST  Qual resolve for loop Name = " << q.getName() << endl;
         //----------------------------------------------------------------------         //----------------------------------------------------------------------
         // 1. Check to see if it's declared.         // 1. Check to see if it's declared.
         //----------------------------------------------------------------------         //----------------------------------------------------------------------
Line 155 
Line 156 
         // abstract qualifier as non-overridable but then they override it.         // abstract qualifier as non-overridable but then they override it.
         // For now it is just disabled. This problem exists in both XML and         // For now it is just disabled. This problem exists in both XML and
         // CIM schema.         // CIM schema.
            //cout << "KSTEST QUal resolve Propagate 1 " << q.getName() << endl;
 #if 0  //#if 0
         Uint32 pos = inheritedQualifiers.find(q.getName());         Uint32 pos = inheritedQualifiers.find(q.getName());
  
         if (pos != PEG_NOT_FOUND)         if (pos != PEG_NOT_FOUND)
         {         {
             CIMConstQualifier iq = inheritedQualifiers.getQualifier(pos);              CIMConstQualifier iq = inheritedQualifiers.getQualifier(pos);{
  
             if (!(iq.getFlavor() & CIMFlavor::OVERRIDABLE))             if (!(iq.getFlavor() & CIMFlavor::OVERRIDABLE))
                 throw BadQualifierOverride(q.getName());                 throw BadQualifierOverride(q.getName());
         }         }
 #endif          }
   //#endif
     }     }
  
     //--------------------------------------------------------------------------     //--------------------------------------------------------------------------
     // Propagate qualifiers to subclass or to instance that do not have     // Propagate qualifiers to subclass or to instance that do not have
     // already have those qualifiers:     // already have those qualifiers:
     //--------------------------------------------------------------------------     //--------------------------------------------------------------------------
       //cout << "KSTEST Qual resolve Propagate loop begin" << " fal " << false << endl;
     for (Uint32 i = 0, n = inheritedQualifiers.getCount(); i < n; i++)     for (Uint32 i = 0, n = inheritedQualifiers.getCount(); i < n; i++)
     {     {
         CIMQualifier iq = inheritedQualifiers.getQualifier(i);         CIMQualifier iq = inheritedQualifiers.getQualifier(i);
           //cout << "KSTEST inherited  propagate loop 2 " <<  iq.getName()
           //<< " flavor " << iq.getFlavor << " count " << i << endl;
         if (isInstancePart)         if (isInstancePart)
         {         {
             if (!(iq.getFlavor() & CIMFlavor::TOINSTANCE))              if ((iq.getFlavor() && CIMFlavor::TOINSTANCE))
                 continue;                 continue;
         }         }
         else         else
         {         {
             if (!(iq.getFlavor() & CIMFlavor::TOSUBCLASS))              //cout << "TKSTEST before tosubclass Flavor "
               //     << (iq.getFlavor() && CIMFlavor::TOSUBCLASS) << endl;
               if ((iq.getFlavor() && CIMFlavor::TOSUBCLASS)){
                   //cout << "KSTEST after test " << endl;
                 continue;                 continue;
         }         }
           }
           //cout << "KSTEST resolve Propagate 3 " << iq.getName()
           //<< " TOSUBCLASS " << !(iq.getFlavor() && CIMFlavor::TOSUBCLASS) << endl;
  
         // If the qualifiers list does not already contain this qualifier,         // If the qualifiers list does not already contain this qualifier,
         // then propagate it (and set the propagated flag to true).         // then propagate it (and set the propagated flag to true).
Line 195 
Line 204 
         if (find(iq.getName()) != PEG_NOT_FOUND)         if (find(iq.getName()) != PEG_NOT_FOUND)
             continue;             continue;
  
           //cout << "KSTEST resolve Propagate 4 " << iq.getName() << endl;
   
         CIMQualifier q = iq.clone();         CIMQualifier q = iq.clone();
         q.setPropagated(true);         q.setPropagated(true);
         _qualifiers.prepend(q);         _qualifiers.prepend(q);


Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2