diff options
author | 2020-05-13 00:16:27 -0400 | |
---|---|---|
committer | 2020-05-13 00:16:27 -0400 | |
commit | 5fd28fe3201ad6e316fea3688bd89130bc29bc13 (patch) | |
tree | f8cc7181b1eadec0f2e1d69d4cdac9e4938e07df /Tests/MODELS2020-CaseStudies/case.study.familyTree.model | |
parent | memory cleaning message between tasks (diff) | |
download | VIATRA-Generator-5fd28fe3201ad6e316fea3688bd89130bc29bc13.tar.gz VIATRA-Generator-5fd28fe3201ad6e316fea3688bd89130bc29bc13.tar.zst VIATRA-Generator-5fd28fe3201ad6e316fea3688bd89130bc29bc13.zip |
Adjust FamilyTree MM. Add new Taxation MM with possible Multiple Roots
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.familyTree.model')
4 files changed, 20 insertions, 34 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.ecore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.ecore index f2e51f65..128e5c63 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.ecore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.ecore | |||
@@ -7,7 +7,7 @@ | |||
7 | </eClassifiers> | 7 | </eClassifiers> |
8 | <eClassifiers xsi:type="ecore:EClass" name="Member"> | 8 | <eClassifiers xsi:type="ecore:EClass" name="Member"> |
9 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 9 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
10 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" | 10 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" |
11 | defaultValueLiteral="0"/> | 11 | defaultValueLiteral="0"/> |
12 | <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1" | 12 | <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1" |
13 | eType="#//Member" eOpposite="#//Member/parents"/> | 13 | eType="#//Member" eOpposite="#//Member/parents"/> |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.genmodel b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.genmodel index 29f5fc02..2879bef6 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.genmodel +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/model/familytree.genmodel | |||
@@ -1,33 +1,19 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <genmodel:GenModel xmi:version="2.0" | 2 | <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" |
3 | xmlns:xmi="http://www.omg.org/XMI" | 3 | xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/case.study.familyTree.model/src" modelPluginID="case.study.familyTree.model" |
4 | xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" | 4 | modelName="Familytree" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" |
5 | xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" | 5 | importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" |
6 | modelDirectory="/case.study.familyTree.model/src" | 6 | operationReflection="true" importOrganizing="true"> |
7 | modelPluginID="case.study.familyTree.model" modelName="Familytree" | 7 | <foreignModel>familytree.ecore</foreignModel> |
8 | rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" | 8 | <genPackages prefix="Familytree" disposableProviderFactory="true" ecorePackage="familytree.ecore#/"> |
9 | importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" | 9 | <genClasses ecoreClass="familytree.ecore#//FamilyTree"> |
10 | copyrightFields="false" operationReflection="true" | 10 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference familytree.ecore#//FamilyTree/members"/> |
11 | importOrganizing="true"> | 11 | </genClasses> |
12 | <foreignModel>familytree.ecore</foreignModel> | 12 | <genClasses ecoreClass="familytree.ecore#//Member"> |
13 | <genPackages prefix="Familytree" | 13 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute familytree.ecore#//Member/name"/> |
14 | disposableProviderFactory="true" ecorePackage="familytree.ecore#/"> | 14 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute familytree.ecore#//Member/age"/> |
15 | <genClasses ecoreClass="familytree.ecore#//FamilyTree"> | 15 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference familytree.ecore#//Member/children"/> |
16 | <genFeatures property="None" children="true" | 16 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference familytree.ecore#//Member/parents"/> |
17 | createChild="true" | 17 | </genClasses> |
18 | ecoreFeature="ecore:EReference familytree.ecore#//FamilyTree/members" /> | 18 | </genPackages> |
19 | </genClasses> | ||
20 | <genClasses ecoreClass="familytree.ecore#//Member"> | ||
21 | <genFeatures createChild="false" | ||
22 | ecoreFeature="ecore:EAttribute familytree.ecore#//Member/name" /> | ||
23 | <genFeatures createChild="false" | ||
24 | ecoreFeature="ecore:EAttribute familytree.ecore#//Member/age" /> | ||
25 | <genFeatures notify="false" createChild="false" | ||
26 | propertySortChoices="true" | ||
27 | ecoreFeature="ecore:EReference familytree.ecore#//Member/children" /> | ||
28 | <genFeatures notify="false" createChild="false" | ||
29 | propertySortChoices="true" | ||
30 | ecoreFeature="ecore:EReference familytree.ecore#//Member/parents" /> | ||
31 | </genClasses> | ||
32 | </genPackages> | ||
33 | </genmodel:GenModel> | 19 | </genmodel:GenModel> |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/Member.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/Member.java index 55a6bd1e..9438b5e3 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/Member.java +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/Member.java | |||
@@ -56,7 +56,7 @@ public interface Member extends EObject { | |||
56 | * @return the value of the '<em>Age</em>' attribute. | 56 | * @return the value of the '<em>Age</em>' attribute. |
57 | * @see #setAge(int) | 57 | * @see #setAge(int) |
58 | * @see familytree.FamilytreePackage#getMember_Age() | 58 | * @see familytree.FamilytreePackage#getMember_Age() |
59 | * @model default="0" | 59 | * @model default="0" required="true" |
60 | * @generated | 60 | * @generated |
61 | */ | 61 | */ |
62 | int getAge(); | 62 | int getAge(); |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/impl/FamilytreePackageImpl.java b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/impl/FamilytreePackageImpl.java index 0980260e..7e5078ab 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/impl/FamilytreePackageImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/src/familytree/impl/FamilytreePackageImpl.java | |||
@@ -240,7 +240,7 @@ public class FamilytreePackageImpl extends EPackageImpl implements FamilytreePac | |||
240 | 240 | ||
241 | initEClass(memberEClass, Member.class, "Member", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 241 | initEClass(memberEClass, Member.class, "Member", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
242 | initEAttribute(getMember_Name(), ecorePackage.getEString(), "name", null, 0, 1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 242 | initEAttribute(getMember_Name(), ecorePackage.getEString(), "name", null, 0, 1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
243 | initEAttribute(getMember_Age(), ecorePackage.getEInt(), "age", "0", 0, 1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 243 | initEAttribute(getMember_Age(), ecorePackage.getEInt(), "age", "0", 1, 1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
244 | initEReference(getMember_Children(), this.getMember(), this.getMember_Parents(), "children", null, 0, -1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 244 | initEReference(getMember_Children(), this.getMember(), this.getMember_Parents(), "children", null, 0, -1, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
245 | initEReference(getMember_Parents(), this.getMember(), this.getMember_Children(), "parents", null, 0, 2, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 245 | initEReference(getMember_Parents(), this.getMember(), this.getMember_Children(), "parents", null, 0, 2, Member.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
246 | 246 | ||