ST6RI-864 Updated UsageUtil.getObjectiveRequirementOf for feature chains

Proactively resolves issue SYSML21-309, so that an objective redefines
a general type that is a feature chain whose featureTarget is a
CaseUsage.

Author: seidewitz

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/simpletests/UseCaseTest.sysml.xt

@@ -86,6 +86,12 @@ package UseCaseTest {
 	part system : System {
 		include uc2;
 		perform u;
+		use case uc1 : UC1;
+	}
+	
+	use case uc3 {
+	    include u;
+	    include system.uc1;
 	}
 
 }

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

@@ -151,6 +151,11 @@ public static void addSubjectParameterTo(Type type) {
 	// Objectives
 
 	public static RequirementUsage getObjectiveRequirementOf(Type type) {
+		// TODO: Update checkRequirementUsageObjectiveRedefinition
+		// See SYSML21-309
+		if (type instanceof Feature) {
+			type = ((Feature)type).getFeatureTarget();
+		}
 		NamespaceUtil.addAdditionalMembersTo(type);
 		return type instanceof CaseDefinition? ((CaseDefinition)type).getObjectiveRequirement():
 			   type instanceof CaseUsage? ((CaseUsage)type).getObjectiveRequirement():

sysml/src/examples/Simple Tests/UseCaseTest.sysml

@@ -31,6 +31,12 @@ package UseCaseTest {
 	part system : System {
 		include uc2;
 		perform u;
+		use case uc1 : UC1;
+	}
+	
+	use case uc3 {
+	    include u;
+	    include system.uc1;
 	}
 
 }