SYSML2_-89 Updated implied specialization conditions for TransitionUsage

- Also implemented check for validateTransitionUsageTriggerActions.

Author: seidewitz

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/TransitionUsage_invalid.sysml.xt

@@ -46,8 +46,14 @@ package TransitionUsage_invalid {
 		then S1_2;
 		state S1_2;
 	}
+	
+	item def A;
 
 	state def S2 {
+		entry action init;
+		// XPECT errors ---> "A transition with an accepter must have a state as its source." at "accept A"
+		transition init accept A then S2_1;
+		
 		state S2_1;
 		transition
 			first S2_1

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

@@ -334,6 +334,8 @@ class SysMLValidator extends KerMLValidator {
 	public static val INVALID_TRANSITION_USAGE_PARAMETERS_MSG_2 = "Must have two input parameters."
 	public static val INVALID_TRANSITION_USAGE_SUCCESSION = "validateTransitionUsageSuccession"
 	public static val INVALID_TRANSITION_USAGE_SUCCESSION_MSG = "A transition must own a succession to its target."
+	public static val INVALID_TRANSITION_USAGE_TRIGGER_ACTIONS = "validateTransitionUsageTriggerActions"
+	public static val INVALID_TRANSITION_USAGE_TRIGGER_ACTIONS_MSG = "A transition with an accepter must have a state as its source."
 
 	public static val INVALID_CALCULATION_USAGE_TYPE = "validateCalculationUsageType_"
 	public static val INVALID_CALCULATION_USAGE_TYPE_MSG = "A calculation must be typed by one calculation definition."
@@ -954,6 +956,14 @@ class SysMLValidator extends KerMLValidator {
 			if (!(mem.transitionFeature instanceof AcceptActionUsage)) {
 				error(INVALID_TRANSITION_FEATURE_MEMBERSHIP_TRIGGER_ACTION_MSG, mem, null, INVALID_TRANSITION_FEATURE_MEMBERSHIP_TRIGGER_ACTION)
 			}
+//			// validateTransitionUsageTriggerActions
+//			val owningType = mem.owningType
+//			if (owningType instanceof TransitionUsage) {
+//				val source = owningType.source
+//				if (source !== null && !(source instanceof StateUsage) && !owningType.triggerAction.empty) {
+//					error(INVALID_TRANSITION_USAGE_TRIGGER_ACTIONS_MSG, mem, null, INVALID_TRANSITION_USAGE_TRIGGER_ACTIONS)
+//				}
+//			}
 		}
 
 		// validateTransitionFeatureMembershipOwningType
@@ -976,7 +986,8 @@ class SysMLValidator extends KerMLValidator {
 
 		// validateTransitionUsageParameters
 		val n = usg.inputParameters.size
-		if (usg.triggerAction.isEmpty) {
+		val triggerAction = usg.triggerAction
+		if (triggerAction.isEmpty) {
 			if (n < 1) {
 				error(INVALID_TRANSITION_USAGE_PARAMETERS_MSG_1, usg, null, INVALID_TRANSITION_USAGE_PARAMETERS)
 			}
@@ -991,6 +1002,13 @@ class SysMLValidator extends KerMLValidator {
 		if (successions.empty || !(successions.get(0) as Succession).targetFeature.forall[f | FeatureUtil.getBasicFeatureOf(f) instanceof ActionUsage]) {
 			error(INVALID_TRANSITION_USAGE_SUCCESSION_MSG, usg, null, INVALID_TRANSITION_USAGE_SUCCESSION)
 		}
+		
+		// validateTransitionUsageTriggerActions
+		val source = usg.source
+		val mem = usg.ownedMembership.filter(TransitionFeatureMembership).filter[kind == TransitionFeatureKind.TRIGGER].head
+		if (source !== null && !(source instanceof StateUsage) && mem !== null) {
+			error(INVALID_TRANSITION_USAGE_TRIGGER_ACTIONS_MSG, mem, null, INVALID_TRANSITION_USAGE_TRIGGER_ACTIONS)
+		}
 	}
 
 	@Check

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023, 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2023-2025 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -57,18 +57,23 @@ protected String getDefaultSupertype() {
 			   getDefaultSupertype("base");
 	}
 
+	
+	// checkTransitionUsageActionSpecialization
 	protected boolean isActionTransition() {
 		TransitionUsage target = getTarget();
 		Type owningType = target.getOwningType();
 		return target.isComposite() && 
-			   (owningType instanceof ActionDefinition || owningType instanceof ActionUsage);
+			   (owningType instanceof ActionDefinition || owningType instanceof ActionUsage) &&
+			   !(target.getSource() instanceof StateUsage);
 	}	
 
+	// checkTransitionUsageStateSpecialization
 	protected boolean isStateTransition() {
 		TransitionUsage target = getTarget();
 		Type owningType = target.getOwningType();
 		return target.isComposite() &&
-			   (owningType instanceof StateDefinition || owningType instanceof StateUsage);
+			   (owningType instanceof StateDefinition || owningType instanceof StateUsage) &&
+			   target.getSource() instanceof StateUsage;
 	}
 
 	// Transformation
@@ -88,10 +93,13 @@ protected Feature computeTransitionLinkConnectors() {
 		TransitionUsage transition = getTarget();
 		Feature transitionLinkFeature = UsageUtil.getTransitionLinkFeatureOf(transition);
 		if (transitionLinkFeature == null) {
+			// checkTransitionUsageSuccessionBindingConnector
 			transitionLinkFeature = SysMLFactory.eINSTANCE.createReferenceUsage();
 			TypeUtil.addOwnedFeatureTo(transition, transitionLinkFeature);			
 			Succession succession = transition.getSuccession();
-			addBindingConnector(succession, transitionLinkFeature);			
+			addBindingConnector(succession, transitionLinkFeature);		
+			
+			// checkTransitionUsageSourceBindingConnector
 			List<Feature> parameters = TypeUtil.getOwnedParametersOf(transition);
 			if (!parameters.isEmpty()) {
 				Feature source = transition.getSource();