Merge pull request #292 from Systems-Modeling/ST6RI-467

ST6RI-467 Include Use Case names could not be resolved

Author: seidewitz

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

@@ -84,7 +84,7 @@ package UseCaseTest {
 	use case u : UseSystem;
 
 	part system : System {
-		include u;
+		include uc2;
 		perform u;
 	}
 

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/IncludeUseCaseUsageImpl.java

@@ -7,6 +7,7 @@
 
 import org.omg.sysml.lang.sysml.ActionUsage;
 import org.omg.sysml.lang.sysml.EventOccurrenceUsage;
+import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.IncludeUseCaseUsage;
 import org.omg.sysml.lang.sysml.OccurrenceUsage;
 import org.omg.sysml.lang.sysml.PerformActionUsage;
@@ -168,6 +169,11 @@ public boolean isSetEventOccurrence() {
 
 	// Additional overrides
 
+	@Override
+	public Feature namingFeature() {
+		return getUseCaseIncluded();
+	}
+	
 	@Override
 	public boolean isReference() {
 		return true;

sysml.library/Kernel Library/Occurrences.kerml

@@ -242,9 +242,9 @@ package Occurrences {
   		end feature redefines earlierOccurrence: Occurrence[0..*] subsets laterOccurrence.immediatePredecessors;
 		end feature redefines laterOccurrence: Occurrence[0..*] subsets earlierOccurrence.immediateSuccessors;
 
-  		private feature all betweenOccurrence: Occurrence[0..*];
-  		private succession earlierOccurrence[1] then betweenOccurrence[0];
-		private succession betweenOccurrence[0] then laterOccurrence[1];
+  		private feature all betweenOccurrence: Occurrence[0];
+  		private succession earlierOccurrence[1] then betweenOccurrence[0..*];
+		private succession betweenOccurrence[0..*] then laterOccurrence[1];
 	}
 
 	/**

sysml/src/examples/Simple Tests/UseCaseTest.sysml

@@ -29,7 +29,7 @@ package UseCaseTest {
 	use case u : UseSystem;
 
 	part system : System {
-		include u;
+		include uc2;
 		perform u;
 	}