version 1.27, 2002/03/22 00:48:56
|
version 1.28, 2002/03/24 13:33:07
|
|
|
// the class-origin and propagated flag accordingly. | // the class-origin and propagated flag accordingly. |
| |
Uint32 pos = PEG_NOT_FOUND; | Uint32 pos = PEG_NOT_FOUND; |
|
/* ATTN: KS move to simpler |
for (Uint32 j = m, n = _properties.size(); j < n; j++) | for (Uint32 j = m, n = _properties.size(); j < n; j++) |
{ | { |
if (CIMName::equal( |
if (CIMName::equal(_properties[j].getName(), |
_properties[j].getName(), |
|
superClassProperty.getName())) | superClassProperty.getName())) |
{ | { |
pos = j; | pos = j; |
break; | break; |
} | } |
} | } |
|
*/ |
|
pos = 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 |
|
|
| |
if (pos == PEG_NOT_FOUND) | if (pos == PEG_NOT_FOUND) |
{ | { |
|
superproperty.setPropagated(true); |
_properties.insert(m++, superproperty); | _properties.insert(m++, superproperty); |
} | } |
else | else |
|
|
// property's qualifier list. | // property's qualifier list. |
CIMProperty subproperty = _properties[pos]; | CIMProperty subproperty = _properties[pos]; |
for (Uint32 i = 0, n = superproperty.getQualifierCount(); | for (Uint32 i = 0, n = superproperty.getQualifierCount(); |
i < n; |
i < n; i++) |
i++) { |
{ |
Uint32 pos = PEG_NOT_FOUND; | Uint32 pos = PEG_NOT_FOUND; |
CIMQualifier superClassQualifier = | CIMQualifier superClassQualifier = |
superproperty.getQualifier(i); | superproperty.getQualifier(i); |
const String name = superClassQualifier.getName(); | const String name = superClassQualifier.getName(); |
for (Uint32 j = 0, m = subproperty.getQualifierCount(); | for (Uint32 j = 0, m = subproperty.getQualifierCount(); |
j < m; | j < m; |
j++) { |
j++) |
|
{ |
CIMConstQualifier q = subproperty.getQualifier(j); | CIMConstQualifier q = subproperty.getQualifier(j); |
if (CIMName::equal(name, | if (CIMName::equal(name, |
q.getName())) { |
q.getName())) |
|
{ |
pos = j; | pos = j; |
break; | break; |
} | } |
} // end comparison of subclass property's qualifiers | } // end comparison of subclass property's qualifiers |
if (pos == PEG_NOT_FOUND) { |
if (pos == PEG_NOT_FOUND) |
|
{ |
|
subproperty.addQualifier(superClassQualifier); |
|
} |
|
/* |
|
if ((pos = subproperty.findQualifier(name)) == PEG_NOT_FOUND) |
|
{ |
subproperty.addQualifier(superClassQualifier); | subproperty.addQualifier(superClassQualifier); |
} | } |
|
*/ |
} // end iteration over superclass property's qualifiers | } // end iteration over superclass property's qualifiers |
} | } |
} | } |
|
|
// the class-origin and propagated flag accordingly. | // the class-origin and propagated flag accordingly. |
| |
Uint32 pos = PEG_NOT_FOUND; | Uint32 pos = PEG_NOT_FOUND; |
|
/********************** |
for (Uint32 j = m, n = _methods.size(); j < n; j++) | for (Uint32 j = m, n = _methods.size(); j < n; j++) |
{ | { |
if (CIMName::equal( |
if (CIMName::equal(_methods[j].getName(), |
_methods[j].getName(), |
|
superClassMethod.getName())) | superClassMethod.getName())) |
{ | { |
pos = j; | pos = j; |
|
|
method.setPropagated(true); | method.setPropagated(true); |
_methods.insert(m++, method); | _methods.insert(m++, method); |
} | } |
|
*/ |
|
if((pos = findMethod(superClassMethod.getName())) == PEG_NOT_FOUND) |
|
{ |
|
CIMMethod method = superClassMethod.clone(); |
|
method.setPropagated(true); |
|
_methods.insert(m++, method); |
|
} |
|
|
} | } |
| |
//---------------------------------------------------------------------- | //---------------------------------------------------------------------- |