Merge pull request #693 from Systems-Modeling/ST6RI-883

ST6RI-883 Implicit specializations missing for individual definitions

Author: seidewitz

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

@@ -0,0 +1,68 @@
+//* 
+XPECT_SETUP org.omg.sysml.xpect.tests.simpletests.SysMLTests
+	ResourceSet {
+		ThisFile {}
+		File {from ="/library.kernel/Base.kerml"}
+       	File {from ="/library.kernel/Occurrences.kerml"}
+       	File {from ="/library.kernel/Objects.kerml"}
+       	File {from ="/library.kernel/Performances.kerml"}
+ 		File {from ="/library.systems/Items.sysml"}
+ 		File {from ="/library.systems/Parts.sysml"}
+ 		File {from ="/library.systems/Actions.sysml"}
+	}
+	Workspace {
+		JavaProject {
+			SrcFolder {
+				ThisFile {}
+				File {from ="/library.kernel/Base.kerml"}
+		       	File {from ="/library.kernel/Occurrences.kerml"}
+		       	File {from ="/library.kernel/Objects.kerml"}
+		       	File {from ="/library.kernel/Performances.kerml"}
+				File {from ="/library.systems/Items.sysml"}
+				File {from ="/library.systems/Parts.sysml"}
+ 				File {from ="/library.systems/Actions.sysml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+// XPECT noErrors ---> ""
+package IndividualTest {
+	individual def IO1;
+	individual occurrence def IO2 {
+		individual io : IO1;
+	}
+	
+	individual item def II1 {
+		individual item ii : II1;
+	}
+	
+	item def I {
+		part i : I;
+	}
+	individual item def II2 :> I {
+		individual item :>> i : II2;
+	}
+	
+	individual part def IP1 {
+		individual part p : IP1;
+	}
+	
+	part def P {
+		part p : P;
+	}
+	individual part def IP2 :> P {
+		individual part :>> p : IP2;
+	}
+	
+	individual action def AP1 {
+		individual action a : AP1;
+	}
+	
+	action def A {
+		action a : A;
+	}
+	individual action def IA2 :> A {
+		individual action :>> a : IA2;
+	}
+}

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

@@ -36,12 +36,13 @@ public OccurrenceDefinition getTarget() {
 
 	/**
 	 * @satisfies checkOccurrenceDefinitionIndividualSpecialization
-	 * @satisfies checkClassSpecialization
-	 * @satisfies checkCalculationDefinitionSpecialization
 	 */
-	protected String getDefaultSupertype() {
-		return getTarget().isIndividual()? getDefaultSupertype("life"):
-			getDefaultSupertype("base");
+	@Override
+	public void addDefaultGeneralType() {
+		super.addDefaultGeneralType();
+		
+		if (getTarget().isIndividual()) {
+			addDefaultGeneralType("life");
+		}
 	}
-
 }

sysml/src/examples/Simple Tests/IndividualTest.sysml

@@ -0,0 +1,39 @@
+package IndividualTest {
+	individual def IO1;
+	individual occurrence def IO2 {
+		individual io : IO1;
+	}
+	
+	individual item def II1 {
+		individual item ii : II1;
+	}
+	
+	item def I {
+		part i : I;
+	}
+	individual item def II2 :> I {
+		individual item :>> i : II2;
+	}
+	
+	individual part def IP1 {
+		individual part p : IP1;
+	}
+	
+	part def P {
+		part p : P;
+	}
+	individual part def IP2 :> P {
+		individual part :>> p : IP2;
+	}
+	
+	individual action def AP1 {
+		individual action a : AP1;
+	}
+	
+	action def A {
+		action a : A;
+	}
+	individual action def IA2 :> A {
+		individual action :>> a : IA2;
+	}
+}