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

Diff for /pegasus/src/Pegasus/Common/CIMParameterRep.cpp between version 1.17 and 1.21

version 1.17, 2002/05/15 04:03:21 version 1.21, 2002/07/30 16:14:53
Line 1 
Line 1 
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001 The Open group, BMC Software, Tivoli Systems, IBM  // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,
   // The Open Group, Tivoli Systems
 // //
 // 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 copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 22 
Line 23 
 // //
 // Author: Mike Brasher (mbrasher@bmc.com) // Author: Mike Brasher (mbrasher@bmc.com)
 // //
 // Modified By:  // Modified By: Carol Ann Krug Graves, Hewlett-Packard Company
   //                (carolann_graves@hp.com)
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 38 
Line 40 
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 CIMParameterRep::CIMParameterRep( CIMParameterRep::CIMParameterRep(
     const String& name,      const CIMName& name,
     CIMType type,     CIMType type,
     Boolean isArray,     Boolean isArray,
     Uint32 arraySize,     Uint32 arraySize,
     const String& referenceClassName)      const CIMName& referenceClassName)
     : _name(name), _type(type),     : _name(name), _type(type),
     _isArray(isArray), _arraySize(arraySize),     _isArray(isArray), _arraySize(arraySize),
     _referenceClassName(referenceClassName)     _referenceClassName(referenceClassName)
Line 50 
Line 52 
     if (!CIMName::legal(name))     if (!CIMName::legal(name))
         throw IllegalName();         throw IllegalName();
  
     if (_type == CIMType::NONE)      if (_type == CIMTYPE_NONE)
         throw NullType();         throw NullType();
  
     if (_arraySize && !_isArray)     if (_arraySize && !_isArray)
         throw IncompatibleTypes();         throw IncompatibleTypes();
  
     if (referenceClassName.size())      if (!referenceClassName.isNull())
     {     {
         if (!CIMName::legal(referenceClassName))          if (_type != CIMTYPE_REFERENCE)
             throw IllegalName();  
   
         if (_type != CIMType::REFERENCE)  
         {         {
             throw ExpectedReferenceValue();             throw ExpectedReferenceValue();
         }         }
     }     }
     else     else
     {     {
   
     // ATTN: revisit this later!     // ATTN: revisit this later!
 #if 0 #if 0
         if (_type == CIMType::REFERENCE)          if (_type == CIMTYPE_REFERENCE)
             throw MissingReferenceClassName();             throw MissingReferenceClassName();
 #endif #endif
     }     }
Line 82 
Line 80 
  
 } }
  
 void CIMParameterRep::setName(const String& name)  void CIMParameterRep::setName(const CIMName& name)
 { {
     if (!CIMName::legal(name))     if (!CIMName::legal(name))
         throw IllegalName();         throw IllegalName();
Line 92 
Line 90 
  
 void CIMParameterRep::resolve( void CIMParameterRep::resolve(
     DeclContext* declContext,     DeclContext* declContext,
     const String& nameSpace)      const CIMNamespaceName& nameSpace)
 { {
     // Validate the qualifiers of the method (according to     // Validate the qualifiers of the method (according to
     // superClass's method with the same name). This method     // superClass's method with the same name). This method
Line 117 
Line 115 
  
         out << " NAME=\"" << _name << "\" ";         out << " NAME=\"" << _name << "\" ";
  
         out << " TYPE=\"" << _type.toString() << "\"";          out << " TYPE=\"" << cimTypeToString (_type) << "\"";
  
         if (_arraySize)         if (_arraySize)
         {         {
Line 132 
Line 130 
  
         out << "</PARAMETER.ARRAY>\n";         out << "</PARAMETER.ARRAY>\n";
     }     }
     else if (_type == CIMType::REFERENCE)      else if (_type == CIMTYPE_REFERENCE)
     {     {
         out << "<PARAMETER.REFERENCE";         out << "<PARAMETER.REFERENCE";
         out << " NAME=\"" << _name << "\" ";         out << " NAME=\"" << _name << "\" ";
Line 147 
Line 145 
     {     {
         out << "<PARAMETER";         out << "<PARAMETER";
         out << " NAME=\"" << _name << "\" ";         out << " NAME=\"" << _name << "\" ";
         out << " TYPE=\"" << _type.toString() << "\"";          out << " TYPE=\"" << cimTypeToString (_type) << "\"";
         out << ">\n";         out << ">\n";
  
         _qualifiers.toXml(out);         _qualifiers.toXml(out);
Line 179 
Line 177 
         out << " ";         out << " ";
  
     // Output the data type and name     // Output the data type and name
     out << _type.toString() << " " <<  _name;      out << cimTypeToString (_type) << " " <<  _name;
  
     if (_isArray)     if (_isArray)
     {     {
Line 196 
Line 194 
 } }
  
  
 void CIMParameterRep::print(PEGASUS_STD(ostream) &os) const  
 {  
     Array<Sint8> tmp;  
     toXml(tmp);  
     tmp.append('\0');  
     os << tmp.getData() << PEGASUS_STD(endl);  
 }  
   
 Boolean CIMParameterRep::identical(const CIMParameterRep* x) const Boolean CIMParameterRep::identical(const CIMParameterRep* x) const
 { {
     if (_name != x->_name)     if (_name != x->_name)
Line 241 
Line 231 
 { {
     _type = type;     _type = type;
  
     if (_referenceClassName.size() == 0 && _type == CIMType::REFERENCE)      if (_referenceClassName.isNull() && _type == CIMTYPE_REFERENCE)
     {     {
         throw MissingReferenceClassName();         throw MissingReferenceClassName();
     }     }

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