diff options
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.model/model')
3 files changed, 2 insertions, 78 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird index 6e583e0f..09539720 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird | |||
@@ -2,10 +2,9 @@ | |||
2 | <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style"> | 2 | <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style"> |
3 | <viewpoint:DAnalysis uid="_XxmRwGDAEeq8BovXV4ESzw" selectedViews="_YbwCAGDAEeq8BovXV4ESzw _YcJDkGDAEeq8BovXV4ESzw _YcK4wGDAEeq8BovXV4ESzw _YdwNIGDAEeq8BovXV4ESzw" version="14.3.0.201909031200"> | 3 | <viewpoint:DAnalysis uid="_XxmRwGDAEeq8BovXV4ESzw" selectedViews="_YbwCAGDAEeq8BovXV4ESzw _YcJDkGDAEeq8BovXV4ESzw _YcK4wGDAEeq8BovXV4ESzw _YdwNIGDAEeq8BovXV4ESzw" version="14.3.0.201909031200"> |
4 | <semanticResources>Taxation.ecore</semanticResources> | 4 | <semanticResources>Taxation.ecore</semanticResources> |
5 | <semanticResources>Taxation.genmodel</semanticResources> | ||
6 | <ownedViews xmi:type="viewpoint:DView" uid="_YbwCAGDAEeq8BovXV4ESzw"> | 5 | <ownedViews xmi:type="viewpoint:DView" uid="_YbwCAGDAEeq8BovXV4ESzw"> |
7 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> | 6 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> |
8 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZFSuQGDAEeq8BovXV4ESzw" name="Taxation class diagram" repPath="#_ZDuoAGDAEeq8BovXV4ESzw" changeId="02ad4336-9a13-4a8a-8fbe-8fb518194552"> | 7 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZFSuQGDAEeq8BovXV4ESzw" name="Taxation class diagram" repPath="#_ZDuoAGDAEeq8BovXV4ESzw" changeId="ff33d3ca-d0f2-4f53-b58f-288212de0dfe"> |
9 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 8 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
10 | <target xmi:type="ecore:EPackage" href="Taxation.ecore#/"/> | 9 | <target xmi:type="ecore:EPackage" href="Taxation.ecore#/"/> |
11 | </ownedRepresentationDescriptors> | 10 | </ownedRepresentationDescriptors> |
@@ -820,18 +819,6 @@ | |||
820 | <styles xmi:type="notation:FontStyle" xmi:id="_acACgWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | 819 | <styles xmi:type="notation:FontStyle" xmi:id="_acACgWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> |
821 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acACgmDAEeq8BovXV4ESzw"/> | 820 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acACgmDAEeq8BovXV4ESzw"/> |
822 | </children> | 821 | </children> |
823 | <children xmi:type="notation:Node" xmi:id="_acApkGDAEeq8BovXV4ESzw" type="3010" element="_aPURYWDAEeq8BovXV4ESzw"> | ||
824 | <styles xmi:type="notation:FontStyle" xmi:id="_acApkWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | ||
825 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acApkmDAEeq8BovXV4ESzw"/> | ||
826 | </children> | ||
827 | <children xmi:type="notation:Node" xmi:id="_acBQoGDAEeq8BovXV4ESzw" type="3010" element="_aPVfgGDAEeq8BovXV4ESzw"> | ||
828 | <styles xmi:type="notation:FontStyle" xmi:id="_acBQoWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | ||
829 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acBQomDAEeq8BovXV4ESzw"/> | ||
830 | </children> | ||
831 | <children xmi:type="notation:Node" xmi:id="_acBQo2DAEeq8BovXV4ESzw" type="3010" element="_aPVfgmDAEeq8BovXV4ESzw"> | ||
832 | <styles xmi:type="notation:FontStyle" xmi:id="_acBQpGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | ||
833 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acBQpWDAEeq8BovXV4ESzw"/> | ||
834 | </children> | ||
835 | <children xmi:type="notation:Node" xmi:id="_acB3sGDAEeq8BovXV4ESzw" type="3010" element="_aPWGkWDAEeq8BovXV4ESzw"> | 822 | <children xmi:type="notation:Node" xmi:id="_acB3sGDAEeq8BovXV4ESzw" type="3010" element="_aPWGkWDAEeq8BovXV4ESzw"> |
836 | <styles xmi:type="notation:FontStyle" xmi:id="_acB3sWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | 823 | <styles xmi:type="notation:FontStyle" xmi:id="_acB3sWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> |
837 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acB3smDAEeq8BovXV4ESzw"/> | 824 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acB3smDAEeq8BovXV4ESzw"/> |
@@ -878,14 +865,6 @@ | |||
878 | <styles xmi:type="notation:FontStyle" xmi:id="_acE7BGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | 865 | <styles xmi:type="notation:FontStyle" xmi:id="_acE7BGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> |
879 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acE7BWDAEeq8BovXV4ESzw"/> | 866 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acE7BWDAEeq8BovXV4ESzw"/> |
880 | </children> | 867 | </children> |
881 | <children xmi:type="notation:Node" xmi:id="_acFiEGDAEeq8BovXV4ESzw" type="3010" element="_aUAkIGDAEeq8BovXV4ESzw"> | ||
882 | <styles xmi:type="notation:FontStyle" xmi:id="_acFiEWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | ||
883 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acFiEmDAEeq8BovXV4ESzw"/> | ||
884 | </children> | ||
885 | <children xmi:type="notation:Node" xmi:id="_acFiE2DAEeq8BovXV4ESzw" type="3010" element="_aUBLMGDAEeq8BovXV4ESzw"> | ||
886 | <styles xmi:type="notation:FontStyle" xmi:id="_acFiFGDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | ||
887 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acFiFWDAEeq8BovXV4ESzw"/> | ||
888 | </children> | ||
889 | <children xmi:type="notation:Node" xmi:id="_acGJIGDAEeq8BovXV4ESzw" type="3010" element="_aUByQGDAEeq8BovXV4ESzw"> | 868 | <children xmi:type="notation:Node" xmi:id="_acGJIGDAEeq8BovXV4ESzw" type="3010" element="_aUByQGDAEeq8BovXV4ESzw"> |
890 | <styles xmi:type="notation:FontStyle" xmi:id="_acGJIWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> | 869 | <styles xmi:type="notation:FontStyle" xmi:id="_acGJIWDAEeq8BovXV4ESzw" fontName="Segoe UI" fontHeight="8" bold="true"/> |
891 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acGJImDAEeq8BovXV4ESzw"/> | 870 | <layoutConstraint xmi:type="notation:Location" xmi:id="_acGJImDAEeq8BovXV4ESzw"/> |
@@ -3891,30 +3870,6 @@ | |||
3891 | </ownedStyle> | 3870 | </ownedStyle> |
3892 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | 3871 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> |
3893 | </ownedElements> | 3872 | </ownedElements> |
3894 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPURYWDAEeq8BovXV4ESzw" name="start_date_within_taxation_year : EDate" tooltipText=""> | ||
3895 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_within_taxation_year"/> | ||
3896 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_within_taxation_year"/> | ||
3897 | <ownedStyle xmi:type="diagram:BundledImage" uid="_aPU4cGDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw"> | ||
3898 | <labelFormat>bold</labelFormat> | ||
3899 | </ownedStyle> | ||
3900 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
3901 | </ownedElements> | ||
3902 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPVfgGDAEeq8BovXV4ESzw" name="start_date_of_contract : EDate" tooltipText=""> | ||
3903 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_of_contract"/> | ||
3904 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/start_date_of_contract"/> | ||
3905 | <ownedStyle xmi:type="diagram:BundledImage" uid="_aPVfgWDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw"> | ||
3906 | <labelFormat>bold</labelFormat> | ||
3907 | </ownedStyle> | ||
3908 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
3909 | </ownedElements> | ||
3910 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPVfgmDAEeq8BovXV4ESzw" name="end_date_within_taxation_year : EDate" tooltipText=""> | ||
3911 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/end_date_within_taxation_year"/> | ||
3912 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/end_date_within_taxation_year"/> | ||
3913 | <ownedStyle xmi:type="diagram:BundledImage" uid="_aPWGkGDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw"> | ||
3914 | <labelFormat>bold</labelFormat> | ||
3915 | </ownedStyle> | ||
3916 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
3917 | </ownedElements> | ||
3918 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPWGkWDAEeq8BovXV4ESzw" name="tax_liability : EDouble = 0.0" tooltipText=""> | 3873 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aPWGkWDAEeq8BovXV4ESzw" name="tax_liability : EDouble = 0.0" tooltipText=""> |
3919 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/tax_liability"/> | 3874 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/tax_liability"/> |
3920 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/tax_liability"/> | 3875 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Income/tax_liability"/> |
@@ -3988,22 +3943,6 @@ | |||
3988 | </ownedStyle> | 3943 | </ownedStyle> |
3989 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | 3944 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> |
3990 | </ownedElements> | 3945 | </ownedElements> |
3991 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aUAkIGDAEeq8BovXV4ESzw" name="valid_from_date : EDate" tooltipText=""> | ||
3992 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_from_date"/> | ||
3993 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_from_date"/> | ||
3994 | <ownedStyle xmi:type="diagram:BundledImage" uid="_aUAkIWDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw"> | ||
3995 | <labelFormat>bold</labelFormat> | ||
3996 | </ownedStyle> | ||
3997 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
3998 | </ownedElements> | ||
3999 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aUBLMGDAEeq8BovXV4ESzw" name="valid_until_date : EDate" tooltipText=""> | ||
4000 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_until_date"/> | ||
4001 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/valid_until_date"/> | ||
4002 | <ownedStyle xmi:type="diagram:BundledImage" uid="_aUBLMWDAEeq8BovXV4ESzw" labelAlignment="LEFT" description="_aLikoGDAEeq8BovXV4ESzw"> | ||
4003 | <labelFormat>bold</labelFormat> | ||
4004 | </ownedStyle> | ||
4005 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
4006 | </ownedElements> | ||
4007 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aUByQGDAEeq8BovXV4ESzw" name="percentage_of_witholding : EDouble = 0.0" tooltipText=""> | 3946 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_aUByQGDAEeq8BovXV4ESzw" name="percentage_of_witholding : EDouble = 0.0" tooltipText=""> |
4008 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/percentage_of_witholding"/> | 3947 | <target xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/percentage_of_witholding"/> |
4009 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/percentage_of_witholding"/> | 3948 | <semanticElements xmi:type="ecore:EAttribute" href="Taxation.ecore#//Tax_Card/percentage_of_witholding"/> |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore index a1b9acd5..cfed4729 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore | |||
@@ -335,12 +335,6 @@ | |||
335 | </eStructuralFeatures> | 335 | </eStructuralFeatures> |
336 | <eStructuralFeatures xsi:type="ecore:EReference" name="income_type" lowerBound="1" | 336 | <eStructuralFeatures xsi:type="ecore:EReference" name="income_type" lowerBound="1" |
337 | eType="#//Income_Type" containment="true" eOpposite="#//Income_Type/income"/> | 337 | eType="#//Income_Type" containment="true" eOpposite="#//Income_Type/income"/> |
338 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="start_date_within_taxation_year" | ||
339 | ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/> | ||
340 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="start_date_of_contract" | ||
341 | ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/> | ||
342 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="end_date_within_taxation_year" | ||
343 | ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/> | ||
344 | <eStructuralFeatures xsi:type="ecore:EReference" name="tax_card" eType="#//Tax_Card" | 338 | <eStructuralFeatures xsi:type="ecore:EReference" name="tax_card" eType="#//Tax_Card" |
345 | containment="true" eOpposite="#//Tax_Card/income"/> | 339 | containment="true" eOpposite="#//Tax_Card/income"/> |
346 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_liability" lowerBound="1" | 340 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_liability" lowerBound="1" |
@@ -378,10 +372,6 @@ | |||
378 | </eStructuralFeatures> | 372 | </eStructuralFeatures> |
379 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_office" lowerBound="1" | 373 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_office" lowerBound="1" |
380 | eType="#//Tax_Office"/> | 374 | eType="#//Tax_Office"/> |
381 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_from_date" ordered="false" | ||
382 | unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/> | ||
383 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_until_date" ordered="false" | ||
384 | unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/> | ||
385 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage_of_witholding" | 375 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage_of_witholding" |
386 | lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> | 376 | lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> |
387 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_payers_name_surname" | 377 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="tax_payers_name_surname" |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel index 0b8ab072..1a18d8b6 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.genmodel | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" | 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:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/case.study.a.model/src" modelPluginID="case.study.a.model" | 3 | xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/case.study.pledge.model/src" modelPluginID="case.study.pledge.model" |
4 | modelName="Taxation" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" | 4 | modelName="Taxation" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" |
5 | importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" | 5 | importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" |
6 | operationReflection="true" importOrganizing="true"> | 6 | operationReflection="true" importOrganizing="true"> |
@@ -230,9 +230,6 @@ | |||
230 | <genClasses image="false" ecoreClass="Taxation.ecore#//Income"> | 230 | <genClasses image="false" ecoreClass="Taxation.ecore#//Income"> |
231 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/income_amount"/> | 231 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/income_amount"/> |
232 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/income_type"/> | 232 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/income_type"/> |
233 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/start_date_within_taxation_year"/> | ||
234 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/start_date_of_contract"/> | ||
235 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/end_date_within_taxation_year"/> | ||
236 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/tax_card"/> | 233 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Taxation.ecore#//Income/tax_card"/> |
237 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/tax_liability"/> | 234 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Income/tax_liability"/> |
238 | <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Taxation.ecore#//Income/taxPayer"/> | 235 | <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Taxation.ecore#//Income/taxPayer"/> |
@@ -249,8 +246,6 @@ | |||
249 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/card_identifier"/> | 246 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/card_identifier"/> |
250 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_card_type"/> | 247 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_card_type"/> |
251 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_office"/> | 248 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_office"/> |
252 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/valid_from_date"/> | ||
253 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/valid_until_date"/> | ||
254 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/percentage_of_witholding"/> | 249 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/percentage_of_witholding"/> |
255 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_name_surname"/> | 250 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_name_surname"/> |
256 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_partner_name_surname"/> | 251 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Taxation.ecore#//Tax_Card/tax_payers_partner_name_surname"/> |