ST6RI-405 Added exclusiveStates feature to States library model.

- Removed validation check that substates of non-parallel states must
have an incoming transition.

Author: seidewitz

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

@@ -48,11 +48,9 @@ package TransitionUsage_invalid {
 		then S2_2;
 		state S2_2;
 	}
-	
+
 	state def S3 {
-		entry; then S3_1;
 		state S3_1;
-		// XPECT warnings ---> "Should have an incoming transition." at "state S3_2;"
 		state S3_2;
 	}
 
@@ -64,17 +62,13 @@ package TransitionUsage_invalid {
 		then s2_2;
 		state s2_2;
 	}
-	
+
 	state s3 {
-		entry; then s3_1;
 		state s3_1;
-		// XPECT warnings ---> "Should have an incoming transition." at "state s3_2 {			state s3_2_1;			state s3_2_2;		}"
 		state s3_2 {
 			state s3_2_1;
 			state s3_2_2;
 		}
-		transition first s3_1 then s3_2.s3_2_1;
-		succession first s3_2 then s3_2.s3_2_2;
 	}
 
 }

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

@@ -366,12 +366,12 @@ class SysMLValidator extends KerMLValidator {
 
 	@Check
 	def checkStateUsage(StateUsage usg) {
-		val owningType = usg.owningType
-		if (owningType !== null && !owningType.isAbstract && usg.isComposite && 
-			UsageUtil.isNonParallelState(owningType) && !UsageUtil.hasIncomingTransitions(usg)
-		) {
-			warning(INVALID_STATEUSAGE_TRANSITIONS_MSG, usg, null, INVALID_STATEUSAGE_TRANSITIONS)
-		}
+//		val owningType = usg.owningType
+//		if (owningType !== null && !owningType.isAbstract && usg.isComposite && 
+//			UsageUtil.isNonParallelState(owningType) && !UsageUtil.hasIncomingTransitions(usg)
+//		) {
+//			warning(INVALID_STATEUSAGE_TRANSITIONS_MSG, usg, null, INVALID_STATEUSAGE_TRANSITIONS)
+//		}
 		checkStateSubactions(usg)
 	}
 

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

@@ -24,6 +24,7 @@
 import org.omg.sysml.lang.sysml.StateDefinition;
 import org.omg.sysml.lang.sysml.StateUsage;
 import org.omg.sysml.lang.sysml.Type;
+import org.omg.sysml.util.UsageUtil;
 
 public class StateUsageAdapter extends ActionUsageAdapter {
 
@@ -38,7 +39,14 @@ public StateUsage getTarget() {
 
 	@Override
 	protected String getSubactionType() {
-		return isSubstate()? "substate": super.getSubactionType();	
+		return isExclusiveState()? "exclusiveState":
+			   isSubstate()? "substate": 
+			   super.getSubactionType();	
+	}
+	
+	public boolean isExclusiveState() {
+		Type owningType = getTarget().getOwningType();
+		return !UsageUtil.isParallelState(owningType);
 	}
 
 	public boolean isSubstate() {

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

@@ -231,6 +231,7 @@ protected ImplicitGeneralizationMap() {
 		put(StateDefinitionImpl.class, "base", "States::StateAction");
 		put(StateUsageImpl.class, "base", "States::stateActions");
 		put(StateUsageImpl.class, "substate", "States::StateAction::substates");
+		put(StateUsageImpl.class, "exclusiveState", "States::StateAction::exclusiveStates");
 
 		put(SuccessionAsUsageImpl.class, "base", "Links::links");
 		put(SuccessionAsUsageImpl.class, "binary", "Occurrences::happensBeforeLinks");

sysml.library/Systems Library/States.sysml

@@ -11,6 +11,8 @@ package States {
 	private import Actions::transitionActions;
 	private import Actions::AcceptAction;
 	private import Actions::actions;
+	private import SequenceFunctions::notEmpty;
+	private import SequenceFunctions::size;
 
 	/**
 	 * A StateAction is a kind of Action that is also a StatePerformance. It is the base type for all
@@ -38,10 +40,22 @@ package States {
 		 */
 		abstract state substates: StateAction[0..*] :> stateActions, subactions;
 
+		/**
+		 * The substates of this state that are mutually exclusive, that is, whose performances do not
+		 * overlap in time.
+		 */
+		 abstract state exclusiveStates: StateAction[0..*] :> substates;
+		
 		/**
 		 * The transitions of this state that are state transitions.
 		 */
 		abstract action stateTransitions: StateTransitionAction[0..*] :> transitions;
+		
+		/**
+		 * Exclusive states cannot overlap, so it must be possible to strictly sequence them in time.
+		 */
+		succession stateSequencing first exclusiveStates[0..1] then exclusiveStates[0..1];
+		assert constraint {notEmpty(exclusiveStates) implies size(stateSequencing) == size(exclusiveStates) - 1}
 	}
 
 	/**