Merge pull request #708 from Systems-Modeling/ST6RI-890

ST6RI-890 Multiple default multiplicities are added if there is a nested alias

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java

@@ -477,10 +477,7 @@ public static void addTargetTypes(Association association, EList<Type> targetTyp
 	// Multiplicity
 
 	public static void addMultiplicityTo(Type type) {
-		EList<Membership> ownedMemberships = type.getOwnedMembership();
-		if (!ownedMemberships.stream().
-				map(Membership::getMemberElement).
-				anyMatch(Multiplicity.class::isInstance)) {
+		if (NamespaceUtil.getOwnedMembersOf(type).noneMatch(Multiplicity.class::isInstance)) {
 			Multiplicity multiplicity = SysMLFactory.eINSTANCE.createMultiplicity();
 			OwningMembership membership = SysMLFactory.eINSTANCE.createOwningMembership();
 			membership.setOwnedMemberElement(multiplicity);