@@ -133,6 +133,7 @@ import org.omg.sysml.util.FeatureUtil
133133import org.omg.sysml.util.UsageUtil
134134import org.omg.sysml.lang.sysml.MetadataFeature
135135import org.omg.sysml.util.TypeUtil
136+ import org.omg.sysml.lang.sysml.ConnectionDefinition
136137
137138/**
138139 * This class contains custom validation rules.
@@ -234,14 +235,19 @@ class SysMLValidator extends KerMLValidator {
234235 public static val INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE = " validatePortUsageNestedUsagesNotComposite"
235236 public static val INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE_MSG = " Nested usages in a port usage (other than ports) must be referential."
236237
238+ public static val INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES = " validateConnectionDefinitionEndsAreUsages_"
239+ public static val INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES_MSG = " A connection definition end must be a usage."
240+
237241 public static val INVALID_CONNECTION_USAGE_TYPE = " validateConnectionUsageType_"
238242 public static val INVALID_CONNECTION_USAGE_TYPE_MSG = " A connection must be typed by connection definitions."
239243
244+ public static val INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES = " validateFlowDefinitionEndsAreUsages_"
245+ public static val INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES_MSG = " A flow definition end must be a usage."
240246 public static val INVALID_FLOW_DEFINITION_END = " validateFlowDefinitionConnectionEnds"
241- public static val INVALID_FLOW_DEFINITION_END_MSG = " A flow connection definition can have at most two ends."
247+ public static val INVALID_FLOW_DEFINITION_END_MSG = " A flow definition can have at most two ends."
242248
243249 public static val INVALID_FLOW_USAGE_TYPE = " validateFlowUsageType_"
244- public static val INVALID_FLOW_USAGE_TYPE_MSG = " A flow connection must be typed by flow connection definitions."
250+ public static val INVALID_FLOW_USAGE_TYPE_MSG = " A flow usage must be typed by flow definitions."
245251
246252 public static val INVALID_INTERFACE_DEFINITION_END = " validateInterfaceDefinitionEnd_"
247253 public static val INVALID_INTERFACE_DEFINITION_END_MSG = " An interface definition end must be a port."
@@ -700,6 +706,12 @@ class SysMLValidator extends KerMLValidator {
700706 val usages = usg. nestedUsage. filter[u | ! (u instanceof PortUsage )]
701707 checkAllNotComposite(usages, INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE_MSG , INVALID_PORT_USAGE_NESTED_USAGES_NOT_COMPOSITE )
702708 }
709+
710+ @Check
711+ def checkConnectionDefinition (ConnectionDefinition cdef ) {
712+ // validateConnectionDefinitionEndsAreUsages_
713+ checkEndsAreUsages(cdef, INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES_MSG , INVALID_CONNECTION_DEFINITION_ENDS_ARE_USAGES )
714+ }
703715
704716 @Check
705717 def checkConnectionUsage (ConnectionUsage usg ) {
@@ -710,8 +722,10 @@ class SysMLValidator extends KerMLValidator {
710722
711723 @Check
712724 def checkFlowDefinition (FlowDefinition cdef ) {
713- // validateConnectionDefinitionConnectionEnds
714- val ends = cdef. endFeature
725+ // validateFlowDefinitionEndsAreUsages_
726+ val ends = checkEndsAreUsages(cdef, INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES_MSG , INVALID_FLOW_DEFINITION_ENDS_ARE_USAGES )
727+
728+ // validateFlowDefinitionEnds
715729 if (ends. size > 2 ) {
716730 val ownedEnds = cdef. ownedEndFeature
717731 if (ownedEnds. size <= 2 ) {
@@ -957,7 +971,7 @@ class SysMLValidator extends KerMLValidator {
957971 // validateStateDefinitionParallelSubactions is checked by checkTransitionUsage and checkSuccession
958972
959973 // validateStateDefinitionStateSubactionKind
960- checkStateSubactions(defn);
974+ checkStateSubactions(defn, INVALID_STATE_DEFINITION_SUBACTION_KIND )
961975 }
962976
963977 @Check
@@ -977,14 +991,7 @@ class SysMLValidator extends KerMLValidator {
977991 // validateStateUsageParallelSubactions is checked by checkTransitionUsage and checkSuccession
978992
979993 // validateStateUsageStateSubactionKind
980- checkStateSubactions(usg)
981- }
982-
983- protected def checkStateSubactions (Type type ) {
984- val errorId = type instanceof Definition ? INVALID_STATE_DEFINITION_SUBACTION_KIND : INVALID_STATE_USAGE_SUBACTION_KIND
985- checkAtMostOneRelationship(type, UsageUtil . getStateSubactionMembershipsOf(type, StateSubactionKind . ENTRY ), INVALID_STATE_SUBACTION_KIND_ENTRY_MSG , errorId);
986- checkAtMostOneRelationship(type, UsageUtil . getStateSubactionMembershipsOf(type, StateSubactionKind . DO ), INVALID_STATE_SUBACTION_KIND_DO_MSG , errorId);
987- checkAtMostOneRelationship(type, UsageUtil . getStateSubactionMembershipsOf(type, StateSubactionKind . EXIT ), INVALID_STATE_SUBACTION_KIND_EXIT_MSG , errorId);
994+ checkStateSubactions(usg, INVALID_STATE_USAGE_SUBACTION_KIND )
988995 }
989996
990997 @Check
@@ -1365,6 +1372,28 @@ class SysMLValidator extends KerMLValidator {
13651372
13661373 /* Utility Methods */
13671374
1375+ protected def checkStateSubactions (Type type , String errorId ) {
1376+ checkAtMostOneRelationship(type, UsageUtil . getStateSubactionMembershipsOf(type, StateSubactionKind . ENTRY ), INVALID_STATE_SUBACTION_KIND_ENTRY_MSG , errorId);
1377+ checkAtMostOneRelationship(type, UsageUtil . getStateSubactionMembershipsOf(type, StateSubactionKind . DO ), INVALID_STATE_SUBACTION_KIND_DO_MSG , errorId);
1378+ checkAtMostOneRelationship(type, UsageUtil . getStateSubactionMembershipsOf(type, StateSubactionKind . EXIT ), INVALID_STATE_SUBACTION_KIND_EXIT_MSG , errorId);
1379+ }
1380+
1381+ protected def checkEndsAreUsages (Type type , String msg , String errorId ) {
1382+ val ends = TypeUtil . getAllEndFeaturesOf(type)
1383+ val nonUsageEnds = ends. filter[end | ! (end instanceof Usage )]
1384+ val ownedNonUsageEnds = nonUsageEnds. filter[end | end. owner == = type]
1385+ if (! nonUsageEnds. isEmpty) {
1386+ if (ownedNonUsageEnds. isEmpty()) {
1387+ error(msg, type, null , errorId)
1388+ } else {
1389+ for (end: ownedNonUsageEnds) {
1390+ error(msg, end, null , errorId)
1391+ }
1392+ }
1393+ }
1394+ return ends;
1395+ }
1396+
13681397 protected def boolean checkNotAny (Iterable<? extends EObject > list , String msg , EStructuralFeature eFeature , String eId ) {
13691398 var check = true
13701399 for (obj: list) {
0 commit comments