- std::list<AttributePtr> aLtAttributes = aData->attributes(kAllTypes);
- std::list<AttributePtr>::iterator it = aLtAttributes.begin();
- for( ; it != aLtAttributes.end(); it++) {
- if(!(*it)->isInitialized()) return false;
+ std::list<std::string> aLtAttributes = aData->attributesIDs(kAllTypes);
+ std::list<std::string>::iterator it = aLtAttributes.begin();
+ for (; it != aLtAttributes.end(); it++) {
+ AttributePtr anAttr = aData->attribute(*it);
+ if (!aValidators->isCase(theFeature, anAttr->id()))
+ continue; // this attribute is not participated in the current case
+ if (!anAttr->isInitialized()) { // attribute is not initialized
+ std::map<std::string, std::set<std::string> >::const_iterator aFeatureFind =
+ myNotObligatory.find(theFeature->getKind());
+ if (aFeatureFind == myNotObligatory.end() || // and it is obligatory for filling
+ aFeatureFind->second.find(*it) == aFeatureFind->second.end()) {
+ theError = "Attribute \"%1\" is not initialized.";
+ theError.addParameter(anAttr->id());
+ // workaround for the filters selection feature: do not append the attribute id
+ if (std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(theFeature))
+ theError.setContext(theFeature->getKind());
+ else
+ theError.setContext(theFeature->getKind() + ":" + anAttr->id());
+ return false;
+ }
+ }