SYSML2_-44 Updated Actions library model for terminate actions.

Also:
- Added implicit specializations and adapter.
- Added examples to SimpleTests/ActionTest model.
- Updated SysML Xpect SimpleTests/ActionTest.

Author: seidewitz

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

@@ -28,6 +28,7 @@ standard library package Actions {
 	private import TransitionPerformances::NonStateTransitionPerformance;
 	private import Transfers::MessageTransfer;
 	private import Connections::MessageConnection;
+	private import OccurrenceFunctions::destroy;
 
 	abstract action def Action :> Performance {
 		doc
@@ -81,7 +82,14 @@ standard library package Actions {
 			 * The subactions of this Action that are AcceptActions. 
 			 */
 		}
-	
+		
+		abstract action terminateSubactions : TerminateAction[0..*] :> subactions, terminateActions {
+			doc
+			/*
+			 * The subactions of this Action that are TerminateActions.
+			 */
+		}
+		
 		abstract action controls : ControlAction[0..*] :> subactions {
 			doc
 			/*
@@ -223,6 +231,36 @@ standard library package Actions {
 		 */
 	}
 
+	abstract action def TerminateAction :> Action {
+		doc
+		/*
+		 * A TerminateAction is an Action that terminates a given Occurrence, meaning 
+		 * that the Occurrence ends during the performance of this Action. TerminateAction
+		 * is the base type for all TerminateActionUsages.
+		 */
+		 
+		in occurrence terminatedOccurrence[1];
+		
+		action terminateOccurrence : destroy {
+			in occ = terminatedOccurrence;
+		}
+	}
+	
+	abstract action terminateActions : TerminateAction[0..*] nonunique :> actions {
+		doc
+		/*
+		 * terminateActions is the base feature for all TerminateActionUsages.
+		 */
+		 
+		in occurrence terminatedOccurrence default that as Occurrence {
+			doc
+			/*
+			 * The default terminatedOccurrence for a terminateAction is its
+			 * featuring occurrence (which will generally be a containing Action).
+			 */
+		}
+	}
+	
 	abstract action def ControlAction :> Action {
 		doc
 		/*

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/simpletests/ActionTest.sysml.xt

@@ -20,6 +20,7 @@ XPECT_SETUP org.omg.sysml.xpect.tests.simpletests.SysMLTests
 		File {from ="/library.systems/Parts.sysml"}
 		File {from ="/library.systems/Ports.sysml"}
 		File {from ="/library.systems/Actions.sysml"}
+		File {from ="/library.systems/Calculations.sysml"}
 		File {from ="/library.domain/Quantities and Units/Quantities.sysml"}
 		File {from ="/library.domain/Quantities and Units/MeasurementReferences.sysml"}
 		File {from ="/library.domain/Quantities and Units/ISQ.sysml"}
@@ -49,6 +50,7 @@ XPECT_SETUP org.omg.sysml.xpect.tests.simpletests.SysMLTests
 				File {from ="/library.systems/Parts.sysml"}
 				File {from ="/library.systems/Ports.sysml"}
 				File {from ="/library.systems/Actions.sysml"}
+				File {from ="/library.systems/Calculations.sysml"}
 				File {from ="/library.domain/Quantities and Units/Quantities.sysml"}
 				File {from ="/library.domain/Quantities and Units/MeasurementReferences.sysml"}
 				File {from ="/library.domain/Quantities and Units/ISQ.sysml"}
@@ -93,4 +95,11 @@ package ActionTest {
 		ref action a : A;
 	}
 
+	action def c {
+		first start;
+		then action c1 {
+			terminate c1;
+		}
+		then terminate;
+	}
 }

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

@@ -492,6 +492,11 @@ public ElementAdapter caseSuccession(Succession element) {
 			return new SuccessionAdapter(element);
 		}
 
+		@Override
+		public ElementAdapter caseTerminateActionUsage(TerminateActionUsage element) {
+			return new TerminateActionUsageAdapter(element);
+		}
+		
 		@Override
 		public ElementAdapter caseTransitionUsage(TransitionUsage element) {
 			return new TransitionUsageAdapter(element);

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

@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2024 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *  
+ * You should have received a copy of theGNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *  
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ *  
+ *******************************************************************************/
+
+package org.omg.sysml.adapter;
+
+import org.omg.sysml.lang.sysml.Element;
+import org.omg.sysml.lang.sysml.TerminateActionUsage;
+
+public class TerminateActionUsageAdapter extends ActionUsageAdapter {
+
+	public TerminateActionUsageAdapter(TerminateActionUsage element) {
+		super(element);
+	}
+	
+	@Override
+	public TerminateActionUsage getTarget() {
+		return (TerminateActionUsage)super.getTarget();
+	}
+
+	@Override
+	public void computeImplicitGeneralTypes() {
+		addComputedRedefinitions(null);
+	}
+	
+	@Override
+	public void addComputedRedefinitions(Element skip) {
+		addDefaultGeneralType();
+		super.addComputedRedefinitions(skip);
+	}
+
+}

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

@@ -307,6 +307,11 @@ protected ImplicitGeneralizationMap() {
 		put(SuccessionFlowConnectionUsageImpl.class, "base", "Connections::successionFlowConnections");
 		put(SuccessionFlowConnectionUsageImpl.class, "message", "Connections::successionFlowConnections");
 
+		put(TerminateActionUsageImpl.class, "base", "Actions::terminateActions");
+		put(TerminateActionUsageImpl.class, "subaction", "Actions::Action::terminateSubactions");
+		
+		put(TerminateActionUsageImpl.class, "subaction", "Actions::Action::terminateWithResultSubactions");
+
 		put(TransitionUsageImpl.class, "base", "Actions::transitionActions");
 		put(TransitionUsageImpl.class, "actionTransition", "Actions::Action::decisionTransitions");
 		put(TransitionUsageImpl.class, "stateTransition", "States::StateAction::stateTransitions");