ST6RI-864 Satisfied checkFlowSpecialization for flows with no ends.

Author: seidewitz

kerml/src/examples/Simple Tests/Behaviors.kerml

@@ -13,6 +13,9 @@ package Behaviors {
     class C {
         var z = A().y;
         step a : A;
+        step b : B;
         binding z = a.y;
+        flow a.y to b.x1;
     }
+    abstract flow msg of C;
 }

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Behaviors.kerml.xt

@@ -5,7 +5,9 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 		File {from ="/library/Base.kerml"}
 		File {from ="/library/Links.kerml"}
 		File {from ="/library/Occurrences.kerml"}
+		File {from ="/library/Objects.kerml"}
 		File {from ="/library/Performances.kerml"}
+		File {from ="/library/Transfers.kerml"}
 		File {from ="/library/ControlFunctions.kerml"}
 	}
 	Workspace {
@@ -15,7 +17,9 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 				File {from ="/library/Base.kerml"}
 				File {from ="/library/Links.kerml"}
 				File {from ="/library/Occurrences.kerml"}
+				File {from ="/library/Objects.kerml"}
 				File {from ="/library/Performances.kerml"}
+				File {from ="/library/Transfers.kerml"}
 				File {from ="/library/ControlFunctions.kerml"}
 			}
 		}
@@ -34,6 +38,14 @@ package Behaviors {
     }
     behavior B specializes A {
         in x1;
-        out y1;
+        out var y1;
     }
+    class C {
+        var z = A().y;
+        step a : A;
+        step b : B;
+        binding z = a.y;
+        flow a.y to b.x1;
+    }
+    abstract flow msg of C;
 }

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

@@ -54,9 +54,18 @@ public void addDefaultGeneralType() {
 		}
 	}
 
+	/**
+	 * @satisfies checkFlowSpecialization
+	 * @satisfies checkFlowWithEndsSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
-		return getDefaultSupertype("base");
+		return isFlowTransfer()? getDefaultSupertype("flow"):
+			   getDefaultSupertype("base");
+	}
+	
+	protected boolean isFlowTransfer() {
+		return !getTarget().getOwnedEndFeature().isEmpty();
 	}
 
 	@Override

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

@@ -124,12 +124,10 @@ protected ImplicitGeneralizationMap() {
 		//checkPayloadFeatureRedefinition
 		put(PayloadFeatureImpl.class, "payload", "Transfers::Transfer::payload");
 
-		/*
-		 * TODO: checkFlowSpecialization
-		 * specializesFromLibrary('Transfers::transfers')
-		 */		
+		//checkFlowSpecialization
+		put(FlowImpl.class, "base", "Transfers::transfers");
 		//checkFlowWithEndsSpecialization
-		put(FlowImpl.class, "base", "Transfers::flowTransfers");
+		put(FlowImpl.class, "flow", "Transfers::flowTransfers");
 		//checkStepEnclosedPerformanceSpecialization
 		put(FlowImpl.class, "enclosedPerformance", "Performances::Performance::enclosedPerformances");
 		//checkStepSubperformanceSpecialization