Merge pull request #494 from Systems-Modeling/ST6RI-703

ST6RI-699 End features inherited via feature chains are not redefined

Author: seidewitz

kerml/src/examples/Simple Tests/Connectors.kerml

@@ -4,8 +4,8 @@ package Connectors {
 		feature a : A;
 		feature b : A;
 
-		connector from a to b;
-		connector {
+		connector c1 from a to b;
+		connector c2 {
 			end feature references a;
 			end feature references b;
 		}
@@ -24,4 +24,9 @@ package Connectors {
 			end feature references b;
 		}
 	}
+	
+	class B {
+	    feature a : A;	    
+	    connector :> a.c1 from a.a to a.b;
+	}
 }

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/validation/ConnectorTest_NestedConnectorConnectingEndsGoodCase.kerml.xt

@@ -28,8 +28,11 @@ package test{
 			feature z;
 		}
 
-		connector from end1 to f.z;
+		connector c from end1 to f.z;
 	}
 
-	connector c:A from x to y;
+	connector a:A from x to y;
+	
+	// Checks that ends from connector c are redefined.
+	connector :> a.c from a.end1 to a.f.z;
 }

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

@@ -157,7 +157,7 @@ private static List<Feature> getAllEndFeaturesOf(Type type, Set<Type> visited) {
 		visited.add(type);
 		List<Feature> ends = getOwnedEndFeaturesOf(type);
 		int n = ends.size();
-		for (Type general: getSupertypesOf(type)) {
+		for (Type general: getGeneralTypesOf(type)) {
 			if (general != null && !visited.contains(general)) {
 				List<Feature> inheritedEnds = getAllEndFeaturesOf(general, visited);
 				if (inheritedEnds.size() > n) {

sysml/src/examples/Flashlight Example/Flashlight Example.sysml

@@ -20,8 +20,8 @@ package 'Flashlight Example' {
 		}
 
 		interface userToFlashlight connect user.onOffCmdPort to flashlight.onOffCmdPort {
-			ref flow :> illuminateRegion.onOffCmdFlow
-				from source.onOffCmd to target.onOffCmd;
+			ref flow references illuminateRegion.onOffCmdFlow
+				from source.onOffCmd to target.onOffCmd; 
 		}
 
 		part flashlight {