Merge pull request #600 from Systems-Modeling/ST6RI-801

ST6RI-801 SuccessionAsUsage of TransitionUsage seems incorrect

Author: seidewitz

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

@@ -88,6 +88,16 @@ package StateTest {
 		exit act;
 	}
 
+	state s0 {
+  		state s1 {
+    		state s2;
+  		}
+  		state s3 {
+  			state s4;
+  		}
+  		transition t1 first s1.s2 then s3.s4;
+	}
+	
 	state s parallel {
 		state s1;
 		state s2;

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

@@ -27,7 +27,7 @@
 import org.omg.sysml.lang.sysml.ActionUsage;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.Membership;
-import org.omg.sysml.lang.sysml.OwningMembership;
+import org.omg.sysml.lang.sysml.ParameterMembership;
 import org.omg.sysml.lang.sysml.StateDefinition;
 import org.omg.sysml.lang.sysml.StateUsage;
 import org.omg.sysml.lang.sysml.Succession;
@@ -76,7 +76,7 @@ protected boolean isStateTransition() {
 	protected void computeSource() {
 		TransitionUsage target = getTarget();
 		List<Membership> ownedMemberships = target.getOwnedMembership();
-		if (ownedMemberships.isEmpty() || ownedMemberships.get(0) instanceof OwningMembership) {
+		if (ownedMemberships.isEmpty() || ownedMemberships.get(0) instanceof ParameterMembership) {
 			Feature source = UsageUtil.getPreviousFeature(target);
 			Membership membership = SysMLFactory.eINSTANCE.createMembership();
 			membership.setMemberElement(source);

sysml/src/examples/Simple Tests/StateTest.sysml

@@ -37,6 +37,22 @@ package StateTest {
 			then S1;
 
 		exit act;
+		
+		state S3 {
+			state S3a;
+		}
+		
+		transition first S3.S3a then S1; 
+	}
+	
+	state s0 {
+  		state s1 {
+    		state s2;
+  		}
+  		state s3 {
+  			state s4;
+  		}
+  		transition t1 first s1.s2 then s3.s4;
 	}
 
 	state s parallel {