Merge pull request #447 from Systems-Modeling/ST6RI-635

ST6RI-635 Conditional successions need to be typed by DecisionTransitionAction

Author: seidewitz

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

@@ -60,7 +60,7 @@ protected boolean isActionTransition() {
 		TransitionUsage target = getTarget();
 		Type owningType = target.getOwningType();
 		return target.isComposite() && 
-			   (target instanceof ActionDefinition || owningType instanceof ActionUsage);
+			   (owningType instanceof ActionDefinition || owningType instanceof ActionUsage);
 	}	
 
 	protected boolean isStateTransition() {

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

@@ -294,7 +294,7 @@ protected ImplicitGeneralizationMap() {
 		put(SuccessionFlowConnectionUsageImpl.class, "subperformance", "Performances::Performance::subtransfersBefore");
 
 		put(TransitionUsageImpl.class, "base", "Actions::transitionActions");
-		put(TransitionUsageImpl.class, "actionTransition", "Actions::Action::transitions");
+		put(TransitionUsageImpl.class, "actionTransition", "Actions::Action::decisionTransitions");
 		put(TransitionUsageImpl.class, "stateTransition", "States::StateAction::stateTransitions");
 
 		put(TriggerInvocationExpressionImpl.class, "when", "Triggers::TriggerWhen");

sysml.library/Systems Library/Actions.sysml

@@ -124,6 +124,13 @@ standard library package Actions {
 			 */
 		}
 
+		abstract action decisionTransitions : DecisionTransitionAction[0..*] :> transitionActions {
+			doc
+			/*
+			 * The subactions of this Action that are DecisionTransitionActions. 
+			 */
+		}
+		
 		abstract action assignments : AssignmentAction[0..*] :> subactions, assignmentActions {
 			doc
 			/*