Merge pull request #820 from Systems-Modeling/ST6RI-975

ST6RI-975 (supplemental) The derivation of Feature::multiplicity is incorrect

Author: seidewitz

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;
+	}
 }

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)
 	}