ST6RI-899 Updated derivation of directedUsage for Definition and Usage.

Made the implementation consistent with each other and implementation of
EnumerationDefinition::enumeratedValue.

Author: seidewitz

org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/DerivedPropertyAndOperationTest.java

@@ -175,7 +175,7 @@ public void testPathOperation() throws Exception {
 		assertEquals("TopLevel/3/1/1/1", TopLevel_3_1_1.getOwnedRelatedElement().get(0).path());
 	}
 
-	public final String directedUsageTest =
+	public final String directedUsageTest1 =
 			  "package Test {\n"
 			+ "    item def I {\n"
 			+ "        in x;\n"
@@ -192,9 +192,9 @@ public void testPathOperation() throws Exception {
 			+ "}";
 
 	@Test
-	public void testDirectedUsage() throws Exception {
+	public void testDirectedUsage1() throws Exception {
 		SysMLInteractive instance = getSysMLInteractiveInstance();
-		SysMLInteractiveResult result = instance.process(directedUsageTest);
+		SysMLInteractiveResult result = instance.process(directedUsageTest1);
 		Element root = result.getRootElement();
 		List<Element> elements = ((Namespace)root).getOwnedMember();
 		List<Element> ownedMembers = ((Namespace)elements.get(0)).getOwnedMember();
@@ -222,6 +222,53 @@ public void testDirectedUsage() throws Exception {
 		assertEquals("constraint def (directedUsages.size)", 2, directedUsages.size());
 		assertEquals("constraint def (directedUsages)", directedFeatures.subList(0, 2), directedUsages);
 	}
+	public final String directedUsageTest2 =
+			  "package Test {\n"
+			+ "    item I {\n"
+			+ "        in x;\n"
+			+ "        in y;\n"
+			+ "    }"
+			+ "    action A {\n"
+			+ "        in x;\n"
+			+ "        in y;\n"
+			+ "    }"
+			+ "    constraint C {\n"
+			+ "        in x;\n"
+			+ "        in y;\n"
+			+ "    }"
+			+ "}";
+	
+	@Test
+	public void testDirectedUsage2() throws Exception {
+		SysMLInteractive instance = getSysMLInteractiveInstance();
+		SysMLInteractiveResult result = instance.process(directedUsageTest2);
+		Element root = result.getRootElement();
+		List<Element> elements = ((Namespace)root).getOwnedMember();
+		List<Element> ownedMembers = ((Namespace)elements.get(0)).getOwnedMember();
+		List<Feature> directedFeatures = ((Usage)ownedMembers.get(0)).getDirectedFeature();
+		List<Usage> directedUsages = ((Usage)ownedMembers.get(0)).getDirectedUsage();
+		assertEquals("item (directedFeatures.size)", 2, directedFeatures.size());
+		assertEquals("item (directedUsages.size)", 2, directedUsages.size());
+		assertEquals("item (directedUsages)", directedFeatures, directedUsages);
+		
+		// Check that getting directedFeatures and directedUsages work for ActionUsages and
+		// ConstraintUsages, even though they are kinds of Steps, and Step redefines
+		// directedFeature as parameter.
+		
+		directedFeatures = ((Usage)ownedMembers.get(1)).getDirectedFeature();
+		directedUsages = ((Usage)ownedMembers.get(1)).getDirectedUsage();
+		assertEquals("action (directedFeatures.size)", 2, directedFeatures.size());
+		assertEquals("action (directedUsages.size)", 2, directedUsages.size());
+		assertEquals("action (directedUsages)", directedFeatures, directedUsages);
+		
+		// The ConstraintUsage "C" has three directedFeatures, including its return parameter,
+		// but only the first two are Usages.
+		directedFeatures = ((Usage)ownedMembers.get(2)).getDirectedFeature();
+		directedUsages = ((Usage)ownedMembers.get(2)).getDirectedUsage();
+		assertEquals("constraint (directedFeatures.size)", 3, directedFeatures.size());
+		assertEquals("constraint (directedUsages.size)", 2, directedUsages.size());
+		assertEquals("constraint (directedUsages)", directedFeatures.subList(0, 2), directedUsages);
+	}
 
 	public final String enumeratedValueTest =
 			  "package Test {\n"

org.omg.sysml/src/org/omg/sysml/delegate/setting/Definition_directedUsage_SettingDelegate.java

@@ -24,24 +24,22 @@
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.uml2.common.util.DerivedEObjectEList;
-import org.omg.sysml.lang.sysml.ActionDefinition;
-import org.omg.sysml.lang.sysml.ConstraintDefinition;
-import org.omg.sysml.lang.sysml.SysMLPackage;
 import org.omg.sysml.lang.sysml.Usage;
+import org.omg.sysml.util.NonNotifyingEObjectEList;
 
-public class Definition_directedUsage_SettingDelegate extends DefaultDerivedPropertySettingDelegate {
+public class Definition_directedUsage_SettingDelegate extends Type_directedFeature_SettingDelegate {
 
 	public Definition_directedUsage_SettingDelegate(EStructuralFeature eStructuralFeature) {
 		super(eStructuralFeature);		
 	}
 
 	@Override
 	protected EList<?> basicGet(InternalEObject owner) {
-		return owner instanceof ActionDefinition?
-				new DerivedEObjectEList<>(Usage.class, owner, eStructuralFeature.getFeatureID(), new int[] {SysMLPackage.ACTION_DEFINITION__PARAMETER}):
-			   owner instanceof ConstraintDefinition?
-				new DerivedEObjectEList<>(Usage.class, owner, eStructuralFeature.getFeatureID(), new int[] {SysMLPackage.CONSTRAINT_DEFINITION__PARAMETER}):
-				super.basicGet(owner);
+		EList<Usage> directedUsages = new NonNotifyingEObjectEList<>(Usage.class, owner, eStructuralFeature.getFeatureID());
+		super.basicGet(owner).stream().
+			filter(Usage.class::isInstance).
+			map(Usage.class::cast).
+			forEachOrdered(directedUsages::add);
+		return directedUsages;
 	}
 }

org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_directedUsage_SettingDelegate.java

@@ -28,7 +28,7 @@
 import org.omg.sysml.lang.sysml.Usage;
 import org.omg.sysml.util.NonNotifyingEObjectEList;
 
-public class Usage_directedUsage_SettingDelegate extends BasicDerivedListSettingDelegate {
+public class Usage_directedUsage_SettingDelegate extends Type_directedFeature_SettingDelegate {
 
 	public Usage_directedUsage_SettingDelegate(EStructuralFeature eStructuralFeature) {
 		super(eStructuralFeature);
@@ -37,8 +37,9 @@ public Usage_directedUsage_SettingDelegate(EStructuralFeature eStructuralFeature
 	@Override
 	protected EList<?> basicGet(InternalEObject owner) {
 		EList<Usage> directedUsages = new NonNotifyingEObjectEList<>(Usage.class, owner, eStructuralFeature.getFeatureID());
-		((Usage)owner).getUsage().stream().
-			filter(usage->usage.getDirection() != null).
+		super.basicGet(owner).stream().
+			filter(Usage.class::isInstance).
+			map(Usage.class::cast).
 			forEachOrdered(directedUsages::add);
 		return directedUsages;
 	}