diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/validation/MultiplicityAlias_valid.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/validation/MultiplicityAlias_valid.kerml.xt index 0ba70c0f7..ce6a0cc92 100644 --- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/validation/MultiplicityAlias_valid.kerml.xt +++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/validation/MultiplicityAlias_valid.kerml.xt @@ -37,4 +37,8 @@ package MultiplicityAlias_valid { feature k : Integer { alias a for em; } feature v : Natural = em; } + + class M [0..1] { + alias for Base::exactlyOne; + } } diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend index 20f3da789..e3fbc663e 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend @@ -559,8 +559,8 @@ class KerMLValidator extends AbstractKerMLValidator { checkTargetNotObject(t, t.ownedUnioning, INVALID_TYPE_UNIONING_TYPES_NOT_SELF_MSG, INVALID_TYPE_UNIONING_TYPES_NOT_SELF) // validateTypeOwnedMultiplicity - var multiplicityMemberships = t.ownedMembership.filter[memberElement instanceof Multiplicity]; - checkAtMostOne(multiplicityMemberships, INVALID_TYPE_OWNED_MULTIPLICITY_MSG, SysMLPackage.eINSTANCE.membership_MemberElement, INVALID_TYPE_OWNED_MULTIPLICITY) + var multiplicities = t.ownedMember.filter(Multiplicity); + checkAtMostOne(multiplicities, INVALID_TYPE_OWNED_MULTIPLICITY_MSG, null, INVALID_TYPE_OWNED_MULTIPLICITY) } diff --git a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar index ca5d24132..368ee9644 100644 Binary files a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar and b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar differ diff --git a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar index 00fc84f78..4df2845cf 100644 Binary files a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar and b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar differ