SYSML2_-417 Change FlowConnection to Flow in validations check names.

Author: seidewitz

org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend

@@ -214,11 +214,11 @@ class SysMLValidator extends KerMLValidator {
 	public static val INVALID_CONNECTION_USAGE_TYPE = "validateConnectionUsageType_"
 	public static val INVALID_CONNECTION_USAGE_TYPE_MSG = "A connection must be typed by connection definitions."
 
-	public static val INVALID_FLOW_CONNECTION_DEFINITION_END = "validateFlowConnectionDefinitionConnectionEnds"
-	public static val INVALID_FLOW_CONNECTION_DEFINITION_END_MSG = "A flow connection definition can have at most two ends."
+	public static val INVALID_FLOW_DEFINITION_END = "validateFlowDefinitionConnectionEnds"
+	public static val INVALID_FLOW_DEFINITION_END_MSG = "A flow connection definition can have at most two ends."
 
-	public static val INVALID_FLOW_CONNECTION_USAGE_TYPE = "validateFlowConnectionUsageType_"
-	public static val INVALID_FLOW_CONNECTION_USAGE_TYPE_MSG = "A flow connection must be typed by flow connection definitions."
+	public static val INVALID_FLOW_USAGE_TYPE = "validateFlowUsageType_"
+	public static val INVALID_FLOW_USAGE_TYPE_MSG = "A flow connection must be typed by flow connection definitions."
 
 	public static val INVALID_INTERFACE_DEFINITION_END = "validateInterfaceDefinitionEnd_"
 	public static val INVALID_INTERFACE_DEFINITION_END_MSG = "An interface definition end must be a port."
@@ -644,25 +644,25 @@ class SysMLValidator extends KerMLValidator {
 	}
 
 	@Check
-	def checkFlowConnectionDefinition(FlowDefinition cdef) {
+	def checkFlowDefinition(FlowDefinition cdef) {
 		// validateConnectionDefinitionConnectionEnds
 		val ends = TypeUtil.getAllEndFeaturesOf(cdef)
 		if (ends.size > 2) {
 			val ownedEnds = cdef.ownedEndFeature
 			if (ownedEnds.size <= 2) {
-				error(INVALID_FLOW_CONNECTION_DEFINITION_END_MSG, cdef, null, INVALID_FLOW_CONNECTION_DEFINITION_END)
+				error(INVALID_FLOW_DEFINITION_END_MSG, cdef, null, INVALID_FLOW_DEFINITION_END)
 			} else {
 				for (var i = 2; i < ends.size; i++) {
-					error(INVALID_FLOW_CONNECTION_DEFINITION_END_MSG, ends.get(i), null, INVALID_FLOW_CONNECTION_DEFINITION_END)
+					error(INVALID_FLOW_DEFINITION_END_MSG, ends.get(i), null, INVALID_FLOW_DEFINITION_END)
 				}
 			}
 		}
 	}
 
 	@Check 
-	def checkFlowConnectionUsage(FlowUsage usg) {
+	def checkFlowUsage(FlowUsage usg) {
 		// All types must be Interactions
-		checkAllTypes(usg, Interaction, INVALID_FLOW_CONNECTION_USAGE_TYPE_MSG, SysMLPackage.eINSTANCE.flowUsage_FlowDefinition, INVALID_FLOW_CONNECTION_USAGE_TYPE)
+		checkAllTypes(usg, Interaction, INVALID_FLOW_USAGE_TYPE_MSG, SysMLPackage.eINSTANCE.flowUsage_FlowDefinition, INVALID_FLOW_USAGE_TYPE)
 	}
 
 	@Check