SYSML2_-416 Added default multiplicity 1..1 to end usages.

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/adapter/AttributeUsageAdapter.java

@@ -34,9 +34,8 @@ public AttributeUsage getTarget() {
 	}
 
 	@Override
-	public void doTransform() {
-		super.doTransform();
-		addDefaultMultiplicity();
+	protected boolean isAddMultiplicity() {
+		return isAddDefaultMultiplicity();
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/ConnectionUsageAdapter.java

@@ -45,8 +45,8 @@ protected String getDefaultSupertype() {
 	}
 
 	@Override
-	protected void addDefaultMultiplicity() {
-		
+	protected boolean isAddMultiplicity() {
+		return getTarget().isEnd();
 	}
 
 	@Override

org.omg.sysml/src/org/omg/sysml/adapter/ItemUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2024 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -56,10 +56,11 @@ public boolean isSubitem() {
 			   (owningType instanceof ItemDefinition || owningType instanceof ItemUsage);
 	}
 
+	// Transformation
+	
 	@Override
-	public void doTransform() {
-		super.doTransform();
-		addDefaultMultiplicity();
+	protected boolean isAddMultiplicity() {
+		return isAddDefaultMultiplicity();
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/PortUsageAdapter.java

@@ -36,6 +36,8 @@ public PortUsageAdapter(PortUsage element) {
 	public PortUsage getTarget() {
 		return (PortUsage)super.getTarget();
 	}
+	
+	// Implicit Generalization
 
 	@Override
 	protected String getDefaultSupertype() {
@@ -58,10 +60,11 @@ public boolean isSubport() {
 		return target.isComposite() && (owningType instanceof PortDefinition || owningType instanceof PortUsage);
 	}
 
+	// Transformation
+	
 	@Override
-	public void doTransform() {
-		super.doTransform();
-		addDefaultMultiplicity();
+	protected boolean isAddMultiplicity() {
+		return isAddDefaultMultiplicity();
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java

@@ -115,15 +115,27 @@ public void addDefaultGeneralType() {
 
 	// Transformation
 
-	protected void addDefaultMultiplicity() {
+	// Used to check for default multiplicity for AttributeUsages, ItemUsages and PortUsages.
+	protected boolean isAddDefaultMultiplicity() {
 		Usage target = getTarget();
-		if (target.getOwningType() != null &&
-			target.getOwnedSubsetting().stream().
-				map(Subsetting::getSubsettedFeature).
-				filter(f->f != null).
-				map(FeatureUtil::getBasicFeatureOf).
-				noneMatch(f->f != null && f.getOwningType() != null)) {
-			TypeUtil.addMultiplicityTo(target);
+		return target.isEnd() ||
+			   target.getOwningType() != null &&
+			   target.getOwnedSubsetting().stream().
+					map(Subsetting::getSubsettedFeature).
+					filter(f->f != null).
+					map(FeatureUtil::getBasicFeatureOf).
+					noneMatch(f->f != null && f.getOwningType() != null);
+	}
+	
+	// Multiplicity of 1..1 is always the default for an end usage.
+	protected boolean isAddMultiplicity() {
+		return getTarget().isEnd();
+	}
+	
+	@Override
+	public void addAdditionalMembers() {
+		if (isAddMultiplicity()) {
+			TypeUtil.addMultiplicityTo(getTarget());
 		}
 	}