Skip to content
Snippets Groups Projects
Commit cbf2c9aa authored by Stefano puri's avatar Stefano puri
Browse files

fixed empty property checking


Signed-off-by: default avatarStefano Puri <stefano.puri@intecs.it>
parent 0b4157b7
No related branches found
No related tags found
No related merge requests found
...@@ -327,8 +327,11 @@ mapping UML::InstanceSpecification::UMLInstance2Join(isRootJoin : Boolean, y : I ...@@ -327,8 +327,11 @@ mapping UML::InstanceSpecification::UMLInstance2Join(isRootJoin : Boolean, y : I
result.addDoubleGlobalVariable('Num'.concat(rep.name), result); result.addDoubleGlobalVariable('Num'.concat(rep.name), result);
}; };
log("**************************11111111111111111111111111111111");
//TODO: curently if a component has errorModel attached than it is considered terminal: we should also support internal components with error model //TODO: curently if a component has errorModel attached than it is considered terminal: we should also support internal components with error model
if (subInstance.isComposite() and subInstance.getErrorModel()->oclIsUndefined()){ if (subInstance.isComposite() and (subInstance.getErrorModel()->oclIsUndefined() or subInstance.getErrorModel() = null)){
log("**************************DDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
var childJoin : SAN::Join := subInstance.map UMLInstance2Join(false, y1+deltay); var childJoin : SAN::Join := subInstance.map UMLInstance2Join(false, y1+deltay);
if (not rep.oclIsUndefined()){ if (not rep.oclIsUndefined()){
rep.child := childJoin; rep.child := childJoin;
...@@ -1625,7 +1628,7 @@ query UML::InstanceSpecification::getSubInstances() : Set(UML::InstanceSpecifica ...@@ -1625,7 +1628,7 @@ query UML::InstanceSpecification::getSubInstances() : Set(UML::InstanceSpecifica
slots -> forEach(slot){ slots -> forEach(slot){
instances += slot.value.oclAsType(UML::InstanceValue).instance; instances += slot.value.oclAsType(UML::InstanceValue).instance;
}; };
--log("subinstances = "+instances->size().toString()); log("subinstances of "+self.name+" = "+instances->size().toString());
return instances; return instances;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment