Merge pull request #682 from Systems-Modeling/ST6RI-874

ST6RI-874 Features subset each other in Transfers and Flows library models (KERML11-78, SYSML21-324)

Author: seidewitz

org.omg.kerml.xpect.tests/library/Transfers.kerml

@@ -177,7 +177,7 @@ standard library package Transfers {
         end feature target: Occurrence redefines Transfer::target, TransferBefore::target;         
     }
 
-    abstract flow transfers: Transfer[0..*] nonunique subsets performances, binaryLinks {
+    abstract step transfers: Transfer[0..*] nonunique subsets performances, binaryLinks {
         doc
         /*
          * transfers is a specialization of performances and binaryLinks restricted to type 
@@ -188,7 +188,7 @@ standard library package Transfers {
         end feature target: Occurrence redefines Transfer::target, binaryLinks::target;
     }
 
-    abstract flow messageTransfers: MessageTransfer[0..*] nonunique subsets transfers {
+    abstract step messageTransfers: MessageTransfer[0..*] nonunique subsets transfers {
         doc
         /*
          * messageTransfers is a specialization of transfers restricted to type MessageTransfers.

org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend

@@ -957,7 +957,7 @@ class KerMLValidator extends AbstractKerMLValidator {
 		}		
 
 		// validateConnectorBinarySpecialization
-		val connectorEnds = TypeUtil.getAllEndFeaturesOf(c)
+		val connectorEnds = c.connectorEnd
 		if (connectorEnds.size() > 2) {
 			val binaryLinkType = SysMLLibraryUtil.getLibraryElement(c, "Links::BinaryLink") as Type
 			if (c.conformsTo(binaryLinkType)) {

org.omg.sysml.xpect.tests/library.kernel/Transfers.kerml

@@ -177,7 +177,7 @@ standard library package Transfers {
         end feature target: Occurrence redefines Transfer::target, TransferBefore::target;         
     }
 
-    abstract flow transfers: Transfer[0..*] nonunique subsets performances, binaryLinks {
+    abstract step transfers: Transfer[0..*] nonunique subsets performances, binaryLinks {
         doc
         /*
          * transfers is a specialization of performances and binaryLinks restricted to type 
@@ -188,7 +188,7 @@ standard library package Transfers {
         end feature target: Occurrence redefines Transfer::target, binaryLinks::target;
     }
 
-    abstract flow messageTransfers: MessageTransfer[0..*] nonunique subsets transfers {
+    abstract step messageTransfers: MessageTransfer[0..*] nonunique subsets transfers {
         doc
         /*
          * messageTransfers is a specialization of transfers restricted to type MessageTransfers.

org.omg.sysml.xpect.tests/library.systems/Flows.sysml

@@ -42,9 +42,6 @@ standard library package Flows {
          * a transfer of objects or values between two occurrences. It is 
          * the base type of all FlowUsages.
          */
-    
-        end occurrence source: Occurrence :>> Transfer::source;
-        end occurrence target: Occurrence :>> Transfer::target;
 
         ref payload :>> MessageAction::payload, Transfer::payload;
 
@@ -104,12 +101,9 @@ standard library package Flows {
         /*
          * messages is the base feature of all FlowUsages.
          */
-    
-        end occurrence source: Occurrence :>> Message::source, transfers::source;
-        end occurrence target: Occurrence :>> Message::target, transfers::target;
     }
 
-    abstract message flows: Flow[0..*] nonunique :> messages, flowTransfers {
+    abstract flow flows: Flow[0..*] nonunique :> messages, flowTransfers {
         doc
         /*
          * flows is the base feature for FlowUsages that identify their source output
@@ -120,7 +114,7 @@ standard library package Flows {
         end occurrence target: Occurrence :>> Flow::target, messages::target, flowTransfers::target;
     }
 
-    abstract message successionFlows: SuccessionFlow[0..*] nonunique :> flows, flowTransfersBefore {
+    abstract flow successionFlows: SuccessionFlow[0..*] nonunique :> flows, flowTransfersBefore {
         doc
         /*
          * successionFlows is the base feature of all SuccessionFlowUsages.

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

@@ -354,6 +354,7 @@ public static void transformAll(Element root, boolean addImplicitElements) {
 			}
 		}
 		if (addImplicitElements && root instanceof Type) {
+			root.setIsImpliedIncluded(true);
 			TypeUtil.insertImplicitBindingConnectors((Type)root);
 			TypeUtil.insertImplicitSpecializations((Type)root);
 			if (root instanceof Feature) {