Adjust FamilyTree MM. Add new Taxation MM with possible Multiple Roots

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 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Member">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"

         defaultValueLiteral="0"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

         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 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0"

-        xmlns:xmi="http://www.omg.org/XMI"

-        xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-        xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"

-        modelDirectory="/case.study.familyTree.model/src"

-        modelPluginID="case.study.familyTree.model" modelName="Familytree"

-        rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-        importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"

-        copyrightFields="false" operationReflection="true"

-        importOrganizing="true">

-        <foreignModel>familytree.ecore</foreignModel>

-        <genPackages prefix="Familytree"

-                disposableProviderFactory="true" ecorePackage="familytree.ecore#/">

-                <genClasses ecoreClass="familytree.ecore#//FamilyTree">

-                        <genFeatures property="None" children="true"

-                                createChild="true"

-                                ecoreFeature="ecore:EReference familytree.ecore#//FamilyTree/members" />

-                </genClasses>

-                <genClasses ecoreClass="familytree.ecore#//Member">

-                        <genFeatures createChild="false"

-                                ecoreFeature="ecore:EAttribute familytree.ecore#//Member/name" />

-                        <genFeatures createChild="false"

-                                ecoreFeature="ecore:EAttribute familytree.ecore#//Member/age" />

-                        <genFeatures notify="false" createChild="false"

-                                propertySortChoices="true"

-                                ecoreFeature="ecore:EReference familytree.ecore#//Member/children" />

-                        <genFeatures notify="false" createChild="false"

-                                propertySortChoices="true"

-                                ecoreFeature="ecore:EReference familytree.ecore#//Member/parents" />

-                </genClasses>

-        </genPackages>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/case.study.familyTree.model/src" modelPluginID="case.study.familyTree.model"

+    modelName="Familytree" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>familytree.ecore</foreignModel>

+  <genPackages prefix="Familytree" disposableProviderFactory="true" ecorePackage="familytree.ecore#/">

+    <genClasses ecoreClass="familytree.ecore#//FamilyTree">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference familytree.ecore#//FamilyTree/members"/>

+    </genClasses>

+    <genClasses ecoreClass="familytree.ecore#//Member">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute familytree.ecore#//Member/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute familytree.ecore#//Member/age"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference familytree.ecore#//Member/children"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference familytree.ecore#//Member/parents"/>

+    </genClasses>

+  </genPackages>

 </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 {
          * @return the value of the '<em>Age</em>' attribute.

          * @see #setAge(int)

          * @see familytree.FamilytreePackage#getMember_Age()

-         * @model default="0"

+         * @model default="0" required="true"

          * @generated

          */

         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
 

                 initEClass(memberEClass, Member.class, "Member", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 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);

-                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);

+                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);

                 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);

                 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);