From 68a0667e862f0714410aafbb499a95a03f5bee23 Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Tue, 28 Apr 2020 00:29:00 -0400 Subject: Able to run Pledge Case Study --- .../src/Taxation/Income.java | 71 -- .../src/Taxation/Physical_Person.java | 13 - .../src/Taxation/Private_Insurance_and_Plan.java | 1 + .../src/Taxation/Resident_Tax_Payer.java | 1 - .../src/Taxation/Tax_Card.java | 48 - .../src/Taxation/TaxationPackage.java | 340 +----- .../src/Taxation/impl/DependentImpl.java | 1 + .../src/Taxation/impl/ExpenseImpl.java | 1 + .../src/Taxation/impl/External_AllowanceImpl.java | 1 + .../src/Taxation/impl/FromAgentImpl.java | 1 + .../src/Taxation/impl/IncomeImpl.java | 170 +-- .../src/Taxation/impl/Income_DetailImpl.java | 1 + .../src/Taxation/impl/Income_TaxImpl.java | 1 + .../src/Taxation/impl/Income_Tax_CreditImpl.java | 1 + .../src/Taxation/impl/Legal_Union_RecordImpl.java | 1 + .../src/Taxation/impl/Physical_PersonImpl.java | 39 +- .../impl/Private_Insurance_and_PlanImpl.java | 1 + .../src/Taxation/impl/Resident_Tax_PayerImpl.java | 1 + .../src/Taxation/impl/Tax_CardImpl.java | 113 -- .../src/Taxation/impl/Tax_PropertyImpl.java | 1 + .../src/Taxation/impl/Taxation.ecore | 1257 -------------------- .../src/Taxation/impl/TaxationPackageImpl.java | 149 +-- 22 files changed, 94 insertions(+), 2119 deletions(-) delete mode 100644 Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Taxation.ecore (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.model/src') diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income.java index 3e68e1ac..2f3dcfd4 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income.java @@ -2,8 +2,6 @@ */ package Taxation; -import java.util.Date; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -19,9 +17,6 @@ import org.eclipse.emf.ecore.EObject; * * * @see Taxation.TaxationPackage#getPhysical_Person() @@ -263,16 +262,4 @@ public interface Physical_Person extends EObject { */ void setIs_widower(boolean value); - /** - * Returns the value of the 'Owns Address' containment reference list. - * The list contents are of type {@link Taxation.Address}. - * - * - * @return the value of the 'Owns Address' containment reference list. - * @see Taxation.TaxationPackage#getPhysical_Person_Owns_Address() - * @model containment="true" - * @generated - */ - EList
getOwns_Address(); - } // Physical_Person diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java index 789099c5..5cd6e8f0 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Private_Insurance_and_Plan.java @@ -2,6 +2,7 @@ */ package Taxation; + /** * * A representation of the model object 'Private Insurance and Plan'. diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Resident_Tax_Payer.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Resident_Tax_Payer.java index 6f529c32..1dedc64a 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Resident_Tax_Payer.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Resident_Tax_Payer.java @@ -14,5 +14,4 @@ package Taxation; * @generated */ public interface Resident_Tax_Payer extends Tax_Payer { - } // Resident_Tax_Payer diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java index 8bb5f622..bcfc0c75 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Card.java @@ -2,8 +2,6 @@ */ package Taxation; -import java.util.Date; - import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -20,8 +18,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link Taxation.Tax_Card#getCard_identifier Card identifier}
    • *
  • {@link Taxation.Tax_Card#getTax_card_type Tax card type}
    • *
  • {@link Taxation.Tax_Card#getTax_office Tax office}
    • - *
  • {@link Taxation.Tax_Card#getValid_from_date Valid from date}
    • - *
  • {@link Taxation.Tax_Card#getValid_until_date Valid until date}
    • *
  • {@link Taxation.Tax_Card#getPercentage_of_witholding Percentage of witholding}
    • *
  • {@link Taxation.Tax_Card#getTax_payers_name_surname Tax payers name surname}
    • *
  • {@link Taxation.Tax_Card#getTax_payers_partner_name_surname Tax payers partner name surname}
    • @@ -134,50 +130,6 @@ public interface Tax_Card extends EObject { */ void setTax_office(Tax_Office value); - /** - * Returns the value of the 'Valid from date' attribute. - * - * - * @return the value of the 'Valid from date' attribute. - * @see #setValid_from_date(Date) - * @see Taxation.TaxationPackage#getTax_Card_Valid_from_date() - * @model unique="false" required="true" ordered="false" - * @generated - */ - Date getValid_from_date(); - - /** - * Sets the value of the '{@link Taxation.Tax_Card#getValid_from_date Valid from date}' attribute. - * - * - * @param value the new value of the 'Valid from date' attribute. - * @see #getValid_from_date() - * @generated - */ - void setValid_from_date(Date value); - - /** - * Returns the value of the 'Valid until date' attribute. - * - * - * @return the value of the 'Valid until date' attribute. - * @see #setValid_until_date(Date) - * @see Taxation.TaxationPackage#getTax_Card_Valid_until_date() - * @model unique="false" required="true" ordered="false" - * @generated - */ - Date getValid_until_date(); - - /** - * Sets the value of the '{@link Taxation.Tax_Card#getValid_until_date Valid until date}' attribute. - * - * - * @param value the new value of the 'Valid until date' attribute. - * @see #getValid_until_date() - * @generated - */ - void setValid_until_date(Date value); - /** * Returns the value of the 'Percentage of witholding' attribute. * diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java index 260e296f..8706121f 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/TaxationPackage.java @@ -484,15 +484,6 @@ public interface TaxationPackage extends EPackage { */ int PHYSICAL_PERSON__IS_WIDOWER = 10; - /** - * The feature id for the 'Owns Address' containment reference list. - * - * - * @generated - * @ordered - */ - int PHYSICAL_PERSON__OWNS_ADDRESS = 11; - /** * The number of structural features of the 'Physical Person' class. * @@ -500,7 +491,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON_FEATURE_COUNT = 12; + int PHYSICAL_PERSON_FEATURE_COUNT = 11; /** * The number of operations of the 'Physical Person' class. @@ -620,15 +611,6 @@ public interface TaxationPackage extends EPackage { */ int TAX_PAYER__IS_WIDOWER = PHYSICAL_PERSON__IS_WIDOWER; - /** - * The feature id for the 'Owns Address' containment reference list. - * - * - * @generated - * @ordered - */ - int TAX_PAYER__OWNS_ADDRESS = PHYSICAL_PERSON__OWNS_ADDRESS; - /** * The feature id for the 'Dependents' containment reference list. * @@ -974,15 +956,6 @@ public interface TaxationPackage extends EPackage { */ int DEPENDENT__IS_WIDOWER = PHYSICAL_PERSON__IS_WIDOWER; - /** - * The feature id for the 'Owns Address' containment reference list. - * - * - * @generated - * @ordered - */ - int DEPENDENT__OWNS_ADDRESS = PHYSICAL_PERSON__OWNS_ADDRESS; - /** * The feature id for the 'Dependent type' attribute. * @@ -1503,33 +1476,6 @@ public interface TaxationPackage extends EPackage { */ int INCOME__INCOME_TYPE = 1; - /** - * The feature id for the 'Start date within taxation year' attribute. - * - * - * @generated - * @ordered - */ - int INCOME__START_DATE_WITHIN_TAXATION_YEAR = 2; - - /** - * The feature id for the 'Start date of contract' attribute. - * - * - * @generated - * @ordered - */ - int INCOME__START_DATE_OF_CONTRACT = 3; - - /** - * The feature id for the 'End date within taxation year' attribute. - * - * - * @generated - * @ordered - */ - int INCOME__END_DATE_WITHIN_TAXATION_YEAR = 4; - /** * The feature id for the 'Tax card' containment reference. * @@ -1537,7 +1483,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME__TAX_CARD = 5; + int INCOME__TAX_CARD = 2; /** * The feature id for the 'Tax liability' attribute. @@ -1546,7 +1492,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME__TAX_LIABILITY = 6; + int INCOME__TAX_LIABILITY = 3; /** * The feature id for the 'Tax Payer' container reference. @@ -1555,7 +1501,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME__TAX_PAYER = 7; + int INCOME__TAX_PAYER = 4; /** * The feature id for the 'Details' containment reference list. @@ -1564,7 +1510,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME__DETAILS = 8; + int INCOME__DETAILS = 5; /** * The feature id for the 'Num' attribute. @@ -1573,7 +1519,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME__NUM = 9; + int INCOME__NUM = 6; /** * The feature id for the 'Expenses' containment reference list. @@ -1582,7 +1528,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME__EXPENSES = 10; + int INCOME__EXPENSES = 7; /** * The number of structural features of the 'Income' class. @@ -1591,7 +1537,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME_FEATURE_COUNT = 11; + int INCOME_FEATURE_COUNT = 8; /** * The number of operations of the 'Income' class. @@ -1694,24 +1640,6 @@ public interface TaxationPackage extends EPackage { */ int TAX_CARD__TAX_OFFICE = 2; - /** - * The feature id for the 'Valid from date' attribute. - * - * - * @generated - * @ordered - */ - int TAX_CARD__VALID_FROM_DATE = 3; - - /** - * The feature id for the 'Valid until date' attribute. - * - * - * @generated - * @ordered - */ - int TAX_CARD__VALID_UNTIL_DATE = 4; - /** * The feature id for the 'Percentage of witholding' attribute. * @@ -1719,7 +1647,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__PERCENTAGE_OF_WITHOLDING = 5; + int TAX_CARD__PERCENTAGE_OF_WITHOLDING = 3; /** * The feature id for the 'Tax payers name surname' attribute list. @@ -1728,7 +1656,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__TAX_PAYERS_NAME_SURNAME = 6; + int TAX_CARD__TAX_PAYERS_NAME_SURNAME = 4; /** * The feature id for the 'Tax payers partner name surname' attribute list. @@ -1737,7 +1665,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = 7; + int TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = 5; /** * The feature id for the 'Tax payers address' reference. @@ -1746,7 +1674,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__TAX_PAYERS_ADDRESS = 8; + int TAX_CARD__TAX_PAYERS_ADDRESS = 6; /** * The feature id for the 'Jobs Employer SS No' attribute. @@ -1755,7 +1683,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_EMPLOYER_SS_NO = 9; + int TAX_CARD__JOBS_EMPLOYER_SS_NO = 7; /** * The feature id for the 'Jobs employers name' attribute. @@ -1764,7 +1692,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_EMPLOYERS_NAME = 10; + int TAX_CARD__JOBS_EMPLOYERS_NAME = 8; /** * The feature id for the 'Jobs activity type' attribute. @@ -1773,7 +1701,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_ACTIVITY_TYPE = 11; + int TAX_CARD__JOBS_ACTIVITY_TYPE = 9; /** * The feature id for the 'Jobs place of work' attribute. @@ -1782,7 +1710,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_PLACE_OF_WORK = 12; + int TAX_CARD__JOBS_PLACE_OF_WORK = 10; /** * The feature id for the 'Deduction FD daily' attribute. @@ -1791,7 +1719,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FD_DAILY = 13; + int TAX_CARD__DEDUCTION_FD_DAILY = 11; /** * The feature id for the 'Deduction FD monthly' attribute. @@ -1800,7 +1728,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FD_MONTHLY = 14; + int TAX_CARD__DEDUCTION_FD_MONTHLY = 12; /** * The feature id for the 'Deduction AC daily' attribute. @@ -1809,7 +1737,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_AC_DAILY = 15; + int TAX_CARD__DEDUCTION_AC_DAILY = 13; /** * The feature id for the 'Deduction AC monthly' attribute. @@ -1818,7 +1746,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_AC_MONTHLY = 16; + int TAX_CARD__DEDUCTION_AC_MONTHLY = 14; /** * The feature id for the 'Deduction AC yearly' attribute. @@ -1827,7 +1755,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_AC_YEARLY = 17; + int TAX_CARD__DEDUCTION_AC_YEARLY = 15; /** * The feature id for the 'Deduction CE daily' attribute. @@ -1836,7 +1764,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_CE_DAILY = 18; + int TAX_CARD__DEDUCTION_CE_DAILY = 16; /** * The feature id for the 'Deduction CE monthly' attribute. @@ -1845,7 +1773,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_CE_MONTHLY = 19; + int TAX_CARD__DEDUCTION_CE_MONTHLY = 17; /** * The feature id for the 'Deduction CE yearly' attribute. @@ -1854,7 +1782,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_CE_YEARLY = 20; + int TAX_CARD__DEDUCTION_CE_YEARLY = 18; /** * The feature id for the 'Deduction DS daily' attribute. @@ -1863,7 +1791,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_DAILY = 21; + int TAX_CARD__DEDUCTION_DS_DAILY = 19; /** * The feature id for the 'Deduction DS monthly' attribute. @@ -1872,7 +1800,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_MONTHLY = 22; + int TAX_CARD__DEDUCTION_DS_MONTHLY = 20; /** * The feature id for the 'Deduction FO daily' attribute. @@ -1881,7 +1809,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FO_DAILY = 23; + int TAX_CARD__DEDUCTION_FO_DAILY = 21; /** * The feature id for the 'Deduction FO monthly' attribute. @@ -1890,7 +1818,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FO_MONTHLY = 24; + int TAX_CARD__DEDUCTION_FO_MONTHLY = 22; /** * The feature id for the 'Deduction FO yearly' attribute. @@ -1899,7 +1827,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FO_YEARLY = 25; + int TAX_CARD__DEDUCTION_FO_YEARLY = 23; /** * The feature id for the 'Credit CIS daily' attribute. @@ -1908,7 +1836,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIS_DAILY = 26; + int TAX_CARD__CREDIT_CIS_DAILY = 24; /** * The feature id for the 'Credit CIS monthly' attribute. @@ -1917,7 +1845,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIS_MONTHLY = 27; + int TAX_CARD__CREDIT_CIS_MONTHLY = 25; /** * The feature id for the 'Credit CIM daily' attribute. @@ -1926,7 +1854,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIM_DAILY = 28; + int TAX_CARD__CREDIT_CIM_DAILY = 26; /** * The feature id for the 'Validity' attribute. @@ -1935,7 +1863,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__VALIDITY = 29; + int TAX_CARD__VALIDITY = 27; /** * The feature id for the 'Income Tax Credit' reference list. @@ -1944,7 +1872,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__INCOME_TAX_CREDIT = 30; + int TAX_CARD__INCOME_TAX_CREDIT = 28; /** * The feature id for the 'Previous' reference. @@ -1953,7 +1881,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__PREVIOUS = 31; + int TAX_CARD__PREVIOUS = 29; /** * The feature id for the 'Current tax card' reference. @@ -1962,7 +1890,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CURRENT_TAX_CARD = 32; + int TAX_CARD__CURRENT_TAX_CARD = 30; /** * The feature id for the 'Credit CIM yearly' attribute. @@ -1971,7 +1899,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIM_YEARLY = 33; + int TAX_CARD__CREDIT_CIM_YEARLY = 31; /** * The feature id for the 'Deduction DS Alimony yearly' attribute. @@ -1980,7 +1908,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = 34; + int TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = 32; /** * The feature id for the 'Deduction DS Debt yearly' attribute. @@ -1989,7 +1917,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = 35; + int TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = 33; /** * The feature id for the 'Income' container reference. @@ -1998,7 +1926,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__INCOME = 36; + int TAX_CARD__INCOME = 34; /** * The number of structural features of the 'Tax Card' class. @@ -2007,7 +1935,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD_FEATURE_COUNT = 37; + int TAX_CARD_FEATURE_COUNT = 35; /** * The number of operations of the 'Tax Card' class. @@ -2637,15 +2565,6 @@ public interface TaxationPackage extends EPackage { */ int NON_RESIDENT_TAX_PAYER__IS_WIDOWER = TAX_PAYER__IS_WIDOWER; - /** - * The feature id for the 'Owns Address' containment reference list. - * - * - * @generated - * @ordered - */ - int NON_RESIDENT_TAX_PAYER__OWNS_ADDRESS = TAX_PAYER__OWNS_ADDRESS; - /** * The feature id for the 'Dependents' containment reference list. * @@ -2936,15 +2855,6 @@ public interface TaxationPackage extends EPackage { */ int RESIDENT_TAX_PAYER__IS_WIDOWER = TAX_PAYER__IS_WIDOWER; - /** - * The feature id for the 'Owns Address' containment reference list. - * - * - * @generated - * @ordered - */ - int RESIDENT_TAX_PAYER__OWNS_ADDRESS = TAX_PAYER__OWNS_ADDRESS; - /** * The feature id for the 'Dependents' containment reference list. * @@ -3384,33 +3294,6 @@ public interface TaxationPackage extends EPackage { */ int FOREIGN_INCOME__INCOME_TYPE = INCOME__INCOME_TYPE; - /** - * The feature id for the 'Start date within taxation year' attribute. - * - * - * @generated - * @ordered - */ - int FOREIGN_INCOME__START_DATE_WITHIN_TAXATION_YEAR = INCOME__START_DATE_WITHIN_TAXATION_YEAR; - - /** - * The feature id for the 'Start date of contract' attribute. - * - * - * @generated - * @ordered - */ - int FOREIGN_INCOME__START_DATE_OF_CONTRACT = INCOME__START_DATE_OF_CONTRACT; - - /** - * The feature id for the 'End date within taxation year' attribute. - * - * - * @generated - * @ordered - */ - int FOREIGN_INCOME__END_DATE_WITHIN_TAXATION_YEAR = INCOME__END_DATE_WITHIN_TAXATION_YEAR; - /** * The feature id for the 'Tax card' containment reference. * @@ -3511,33 +3394,6 @@ public interface TaxationPackage extends EPackage { */ int LOCAL_INCOME__INCOME_TYPE = INCOME__INCOME_TYPE; - /** - * The feature id for the 'Start date within taxation year' attribute. - * - * - * @generated - * @ordered - */ - int LOCAL_INCOME__START_DATE_WITHIN_TAXATION_YEAR = INCOME__START_DATE_WITHIN_TAXATION_YEAR; - - /** - * The feature id for the 'Start date of contract' attribute. - * - * - * @generated - * @ordered - */ - int LOCAL_INCOME__START_DATE_OF_CONTRACT = INCOME__START_DATE_OF_CONTRACT; - - /** - * The feature id for the 'End date within taxation year' attribute. - * - * - * @generated - * @ordered - */ - int LOCAL_INCOME__END_DATE_WITHIN_TAXATION_YEAR = INCOME__END_DATE_WITHIN_TAXATION_YEAR; - /** * The feature id for the 'Tax card' containment reference. * @@ -6339,17 +6195,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getPhysical_Person_Is_widower(); - /** - * Returns the meta object for the containment reference list '{@link Taxation.Physical_Person#getOwns_Address Owns Address}'. - * - * - * @return the meta object for the containment reference list 'Owns Address'. - * @see Taxation.Physical_Person#getOwns_Address() - * @see #getPhysical_Person() - * @generated - */ - EReference getPhysical_Person_Owns_Address(); - /** * Returns the meta object for class '{@link Taxation.Address Address}'. * @@ -6989,39 +6834,6 @@ public interface TaxationPackage extends EPackage { */ EReference getIncome_Income_type(); - /** - * Returns the meta object for the attribute '{@link Taxation.Income#getStart_date_within_taxation_year Start date within taxation year}'. - * - * - * @return the meta object for the attribute 'Start date within taxation year'. - * @see Taxation.Income#getStart_date_within_taxation_year() - * @see #getIncome() - * @generated - */ - EAttribute getIncome_Start_date_within_taxation_year(); - - /** - * Returns the meta object for the attribute '{@link Taxation.Income#getStart_date_of_contract Start date of contract}'. - * - * - * @return the meta object for the attribute 'Start date of contract'. - * @see Taxation.Income#getStart_date_of_contract() - * @see #getIncome() - * @generated - */ - EAttribute getIncome_Start_date_of_contract(); - - /** - * Returns the meta object for the attribute '{@link Taxation.Income#getEnd_date_within_taxation_year End date within taxation year}'. - * - * - * @return the meta object for the attribute 'End date within taxation year'. - * @see Taxation.Income#getEnd_date_within_taxation_year() - * @see #getIncome() - * @generated - */ - EAttribute getIncome_End_date_within_taxation_year(); - /** * Returns the meta object for the containment reference '{@link Taxation.Income#getTax_card Tax card}'. * @@ -7174,28 +6986,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getTax_Card_Tax_office(); - /** - * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getValid_from_date Valid from date}'. - * - * - * @return the meta object for the attribute 'Valid from date'. - * @see Taxation.Tax_Card#getValid_from_date() - * @see #getTax_Card() - * @generated - */ - EAttribute getTax_Card_Valid_from_date(); - - /** - * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getValid_until_date Valid until date}'. - * - * - * @return the meta object for the attribute 'Valid until date'. - * @see Taxation.Tax_Card#getValid_until_date() - * @see #getTax_Card() - * @generated - */ - EAttribute getTax_Card_Valid_until_date(); - /** * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getPercentage_of_witholding Percentage of witholding}'. * @@ -9078,14 +8868,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute PHYSICAL_PERSON__IS_WIDOWER = eINSTANCE.getPhysical_Person_Is_widower(); - /** - * The meta object literal for the 'Owns Address' containment reference list feature. - * - * - * @generated - */ - EReference PHYSICAL_PERSON__OWNS_ADDRESS = eINSTANCE.getPhysical_Person_Owns_Address(); - /** * The meta object literal for the '{@link Taxation.impl.AddressImpl Address}' class. * @@ -9578,30 +9360,6 @@ public interface TaxationPackage extends EPackage { */ EReference INCOME__INCOME_TYPE = eINSTANCE.getIncome_Income_type(); - /** - * The meta object literal for the 'Start date within taxation year' attribute feature. - * - * - * @generated - */ - EAttribute INCOME__START_DATE_WITHIN_TAXATION_YEAR = eINSTANCE.getIncome_Start_date_within_taxation_year(); - - /** - * The meta object literal for the 'Start date of contract' attribute feature. - * - * - * @generated - */ - EAttribute INCOME__START_DATE_OF_CONTRACT = eINSTANCE.getIncome_Start_date_of_contract(); - - /** - * The meta object literal for the 'End date within taxation year' attribute feature. - * - * - * @generated - */ - EAttribute INCOME__END_DATE_WITHIN_TAXATION_YEAR = eINSTANCE.getIncome_End_date_within_taxation_year(); - /** * The meta object literal for the 'Tax card' containment reference feature. * @@ -9718,22 +9476,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute TAX_CARD__TAX_OFFICE = eINSTANCE.getTax_Card_Tax_office(); - /** - * The meta object literal for the 'Valid from date' attribute feature. - * - * - * @generated - */ - EAttribute TAX_CARD__VALID_FROM_DATE = eINSTANCE.getTax_Card_Valid_from_date(); - - /** - * The meta object literal for the 'Valid until date' attribute feature. - * - * - * @generated - */ - EAttribute TAX_CARD__VALID_UNTIL_DATE = eINSTANCE.getTax_Card_Valid_until_date(); - /** * The meta object literal for the 'Percentage of witholding' attribute feature. * diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DependentImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DependentImpl.java index 0732ae44..a1b50304 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DependentImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DependentImpl.java @@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; + import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/ExpenseImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/ExpenseImpl.java index 70dfc53e..6acf1429 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/ExpenseImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/ExpenseImpl.java @@ -9,6 +9,7 @@ import Taxation.FromAgent; import Taxation.Income; import Taxation.Physical_Person; import Taxation.TaxationPackage; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java index 0d0119a5..d73a0014 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java @@ -7,6 +7,7 @@ import Taxation.External_Allowance; import Taxation.Grantor; import Taxation.Physical_Person; import Taxation.TaxationPackage; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FromAgentImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FromAgentImpl.java index 930a23de..9b7b38bb 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FromAgentImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FromAgentImpl.java @@ -7,6 +7,7 @@ import Taxation.Expense; import Taxation.FromAgent; import Taxation.Tax_Payer; import Taxation.TaxationPackage; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/IncomeImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/IncomeImpl.java index 233d467c..f4793894 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/IncomeImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/IncomeImpl.java @@ -9,8 +9,8 @@ import Taxation.Income_Type; import Taxation.Tax_Card; import Taxation.Tax_Payer; import Taxation.TaxationPackage; + import java.util.Collection; -import java.util.Date; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -37,9 +37,6 @@ import org.eclipse.emf.ecore.util.InternalEList; * * * @generated @@ -249,16 +248,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements */ protected boolean is_widower = IS_WIDOWER_EDEFAULT; - /** - * The cached value of the '{@link #getOwns_Address() Owns Address}' containment reference list. - * - * - * @see #getOwns_Address() - * @generated - * @ordered - */ - protected EList
    owns_Address; - /** * * @@ -511,19 +500,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PHYSICAL_PERSON__IS_WIDOWER, oldIs_widower, is_widower)); } - /** - * - * - * @generated - */ - @Override - public EList
    getOwns_Address() { - if (owns_Address == null) { - owns_Address = new EObjectContainmentEList
    (Address.class, this, TaxationPackage.PHYSICAL_PERSON__OWNS_ADDRESS); - } - return owns_Address; - } - /** * * @@ -553,8 +529,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements return ((InternalEList)getAddresses()).basicRemove(otherEnd, msgs); case TaxationPackage.PHYSICAL_PERSON__EXPENSES: return ((InternalEList)getExpenses()).basicRemove(otherEnd, msgs); - case TaxationPackage.PHYSICAL_PERSON__OWNS_ADDRESS: - return ((InternalEList)getOwns_Address()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -589,8 +563,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements return getExpenses(); case TaxationPackage.PHYSICAL_PERSON__IS_WIDOWER: return isIs_widower(); - case TaxationPackage.PHYSICAL_PERSON__OWNS_ADDRESS: - return getOwns_Address(); } return super.eGet(featureID, resolve, coreType); } @@ -639,10 +611,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements case TaxationPackage.PHYSICAL_PERSON__IS_WIDOWER: setIs_widower((Boolean)newValue); return; - case TaxationPackage.PHYSICAL_PERSON__OWNS_ADDRESS: - getOwns_Address().clear(); - getOwns_Address().addAll((Collection)newValue); - return; } super.eSet(featureID, newValue); } @@ -688,9 +656,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements case TaxationPackage.PHYSICAL_PERSON__IS_WIDOWER: setIs_widower(IS_WIDOWER_EDEFAULT); return; - case TaxationPackage.PHYSICAL_PERSON__OWNS_ADDRESS: - getOwns_Address().clear(); - return; } super.eUnset(featureID); } @@ -725,8 +690,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements return expenses != null && !expenses.isEmpty(); case TaxationPackage.PHYSICAL_PERSON__IS_WIDOWER: return is_widower != IS_WIDOWER_EDEFAULT; - case TaxationPackage.PHYSICAL_PERSON__OWNS_ADDRESS: - return owns_Address != null && !owns_Address.isEmpty(); } return super.eIsSet(featureID); } diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java index dfe39a95..2b1cd545 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java @@ -5,6 +5,7 @@ package Taxation.impl; import Taxation.Category_of_Private_Insurance_and_Plan; import Taxation.Private_Insurance_and_Plan; import Taxation.TaxationPackage; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Resident_Tax_PayerImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Resident_Tax_PayerImpl.java index 34a1f15c..4ae64706 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Resident_Tax_PayerImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Resident_Tax_PayerImpl.java @@ -4,6 +4,7 @@ package Taxation.impl; import Taxation.Resident_Tax_Payer; import Taxation.TaxationPackage; + import org.eclipse.emf.ecore.EClass; /** diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java index 68f4f7f9..ebff8555 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java @@ -13,7 +13,6 @@ import Taxation.TaxationPackage; import Taxation.Town; import java.util.Collection; -import java.util.Date; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -42,8 +41,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
  • {@link Taxation.impl.Tax_CardImpl#getCard_identifier Card identifier}
    • *
  • {@link Taxation.impl.Tax_CardImpl#getTax_card_type Tax card type}
    • *
  • {@link Taxation.impl.Tax_CardImpl#getTax_office Tax office}
    • - *
  • {@link Taxation.impl.Tax_CardImpl#getValid_from_date Valid from date}
    • - *
  • {@link Taxation.impl.Tax_CardImpl#getValid_until_date Valid until date}
    • *
  • {@link Taxation.impl.Tax_CardImpl#getPercentage_of_witholding Percentage of witholding}
    • *
  • {@link Taxation.impl.Tax_CardImpl#getTax_payers_name_surname Tax payers name surname}
    • *
  • {@link Taxation.impl.Tax_CardImpl#getTax_payers_partner_name_surname Tax payers partner name surname}
    • @@ -141,46 +138,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca */ protected Tax_Office tax_office = TAX_OFFICE_EDEFAULT; - /** - * The default value of the '{@link #getValid_from_date() Valid from date}' attribute. - * - * - * @see #getValid_from_date() - * @generated - * @ordered - */ - protected static final Date VALID_FROM_DATE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getValid_from_date() Valid from date}' attribute. - * - * - * @see #getValid_from_date() - * @generated - * @ordered - */ - protected Date valid_from_date = VALID_FROM_DATE_EDEFAULT; - - /** - * The default value of the '{@link #getValid_until_date() Valid until date}' attribute. - * - * - * @see #getValid_until_date() - * @generated - * @ordered - */ - protected static final Date VALID_UNTIL_DATE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getValid_until_date() Valid until date}' attribute. - * - * - * @see #getValid_until_date() - * @generated - * @ordered - */ - protected Date valid_until_date = VALID_UNTIL_DATE_EDEFAULT; - /** * The default value of the '{@link #getPercentage_of_witholding() Percentage of witholding}' attribute. * @@ -829,52 +786,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_CARD__TAX_OFFICE, oldTax_office, tax_office)); } - /** - * - * - * @generated - */ - @Override - public Date getValid_from_date() { - return valid_from_date; - } - - /** - * - * - * @generated - */ - @Override - public void setValid_from_date(Date newValid_from_date) { - Date oldValid_from_date = valid_from_date; - valid_from_date = newValid_from_date; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_CARD__VALID_FROM_DATE, oldValid_from_date, valid_from_date)); - } - - /** - * - * - * @generated - */ - @Override - public Date getValid_until_date() { - return valid_until_date; - } - - /** - * - * - * @generated - */ - @Override - public void setValid_until_date(Date newValid_until_date) { - Date oldValid_until_date = valid_until_date; - valid_until_date = newValid_until_date; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_CARD__VALID_UNTIL_DATE, oldValid_until_date, valid_until_date)); - } - /** * * @@ -1771,10 +1682,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca return getTax_card_type(); case TaxationPackage.TAX_CARD__TAX_OFFICE: return getTax_office(); - case TaxationPackage.TAX_CARD__VALID_FROM_DATE: - return getValid_from_date(); - case TaxationPackage.TAX_CARD__VALID_UNTIL_DATE: - return getValid_until_date(); case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: return getPercentage_of_witholding(); case TaxationPackage.TAX_CARD__TAX_PAYERS_NAME_SURNAME: @@ -1864,12 +1771,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca case TaxationPackage.TAX_CARD__TAX_OFFICE: setTax_office((Tax_Office)newValue); return; - case TaxationPackage.TAX_CARD__VALID_FROM_DATE: - setValid_from_date((Date)newValue); - return; - case TaxationPackage.TAX_CARD__VALID_UNTIL_DATE: - setValid_until_date((Date)newValue); - return; case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: setPercentage_of_witholding((Double)newValue); return; @@ -1990,12 +1891,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca case TaxationPackage.TAX_CARD__TAX_OFFICE: setTax_office(TAX_OFFICE_EDEFAULT); return; - case TaxationPackage.TAX_CARD__VALID_FROM_DATE: - setValid_from_date(VALID_FROM_DATE_EDEFAULT); - return; - case TaxationPackage.TAX_CARD__VALID_UNTIL_DATE: - setValid_until_date(VALID_UNTIL_DATE_EDEFAULT); - return; case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: setPercentage_of_witholding(PERCENTAGE_OF_WITHOLDING_EDEFAULT); return; @@ -2110,10 +2005,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca return tax_card_type != TAX_CARD_TYPE_EDEFAULT; case TaxationPackage.TAX_CARD__TAX_OFFICE: return tax_office != TAX_OFFICE_EDEFAULT; - case TaxationPackage.TAX_CARD__VALID_FROM_DATE: - return VALID_FROM_DATE_EDEFAULT == null ? valid_from_date != null : !VALID_FROM_DATE_EDEFAULT.equals(valid_from_date); - case TaxationPackage.TAX_CARD__VALID_UNTIL_DATE: - return VALID_UNTIL_DATE_EDEFAULT == null ? valid_until_date != null : !VALID_UNTIL_DATE_EDEFAULT.equals(valid_until_date); case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: return percentage_of_witholding != PERCENTAGE_OF_WITHOLDING_EDEFAULT; case TaxationPackage.TAX_CARD__TAX_PAYERS_NAME_SURNAME: @@ -2198,10 +2089,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca result.append(tax_card_type); result.append(", tax_office: "); result.append(tax_office); - result.append(", valid_from_date: "); - result.append(valid_from_date); - result.append(", valid_until_date: "); - result.append(valid_until_date); result.append(", percentage_of_witholding: "); result.append(percentage_of_witholding); result.append(", tax_payers_name_surname: "); diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PropertyImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PropertyImpl.java index e1ed46e4..b8bb6ef3 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PropertyImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PropertyImpl.java @@ -5,6 +5,7 @@ package Taxation.impl; import Taxation.Legal_Union_Record; import Taxation.Tax_Property; import Taxation.TaxationPackage; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Taxation.ecore b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Taxation.ecore deleted file mode 100644 index 7834561d..00000000 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Taxation.ecore +++ /dev/null @@ -1,1257 +0,0 @@ - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - -
    - - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - -
    - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - -
    - - - - - - - -
    - - - - -
    - - - - -
    - - - - - -
    - - - - - -
    - - - - - - -
    - - - - -
    - - - - -
    - - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java index 61f42b3e..a174a065 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java @@ -73,6 +73,7 @@ import Taxation.Town; import Taxation.Trade_and_Business_Income; import Taxation.Travel_Expense_FD; import Taxation.Type_of_Rate; + import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EEnum; @@ -1164,16 +1165,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(10); } - /** - * - * - * @generated - */ - @Override - public EReference getPhysical_Person_Owns_Address() { - return (EReference)physical_PersonEClass.getEStructuralFeatures().get(11); - } - /** * * @@ -1764,36 +1755,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EReference)incomeEClass.getEStructuralFeatures().get(1); } - /** - * - * - * @generated - */ - @Override - public EAttribute getIncome_Start_date_within_taxation_year() { - return (EAttribute)incomeEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getIncome_Start_date_of_contract() { - return (EAttribute)incomeEClass.getEStructuralFeatures().get(3); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getIncome_End_date_within_taxation_year() { - return (EAttribute)incomeEClass.getEStructuralFeatures().get(4); - } - /** * * @@ -1801,7 +1762,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getIncome_Tax_card() { - return (EReference)incomeEClass.getEStructuralFeatures().get(5); + return (EReference)incomeEClass.getEStructuralFeatures().get(2); } /** @@ -1811,7 +1772,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getIncome_Tax_liability() { - return (EAttribute)incomeEClass.getEStructuralFeatures().get(6); + return (EAttribute)incomeEClass.getEStructuralFeatures().get(3); } /** @@ -1821,7 +1782,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getIncome_TaxPayer() { - return (EReference)incomeEClass.getEStructuralFeatures().get(7); + return (EReference)incomeEClass.getEStructuralFeatures().get(4); } /** @@ -1831,7 +1792,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getIncome_Details() { - return (EReference)incomeEClass.getEStructuralFeatures().get(8); + return (EReference)incomeEClass.getEStructuralFeatures().get(5); } /** @@ -1841,7 +1802,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getIncome_Num() { - return (EAttribute)incomeEClass.getEStructuralFeatures().get(9); + return (EAttribute)incomeEClass.getEStructuralFeatures().get(6); } /** @@ -1851,7 +1812,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getIncome_Expenses() { - return (EReference)incomeEClass.getEStructuralFeatures().get(10); + return (EReference)incomeEClass.getEStructuralFeatures().get(7); } /** @@ -1934,26 +1895,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2); } - /** - * - * - * @generated - */ - @Override - public EAttribute getTax_Card_Valid_from_date() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getTax_Card_Valid_until_date() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4); - } - /** * * @@ -1961,7 +1902,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Percentage_of_witholding() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(5); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3); } /** @@ -1971,7 +1912,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Tax_payers_name_surname() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(6); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4); } /** @@ -1981,7 +1922,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Tax_payers_partner_name_surname() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(5); } /** @@ -1991,7 +1932,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Tax_payers_address() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(8); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(6); } /** @@ -2001,7 +1942,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_Employer_SSNo() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7); } /** @@ -2011,7 +1952,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_employers_name() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8); } /** @@ -2021,7 +1962,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_activity_type() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9); } /** @@ -2031,7 +1972,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_place_of_work() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10); } /** @@ -2041,7 +1982,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FD_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11); } /** @@ -2051,7 +1992,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FD_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12); } /** @@ -2061,7 +2002,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_AC_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13); } /** @@ -2071,7 +2012,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_AC_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14); } /** @@ -2081,7 +2022,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_AC_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15); } /** @@ -2091,7 +2032,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_CE_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16); } /** @@ -2101,7 +2042,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_CE_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17); } /** @@ -2111,7 +2052,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_CE_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18); } /** @@ -2121,7 +2062,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19); } /** @@ -2131,7 +2072,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20); } /** @@ -2141,7 +2082,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FO_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21); } /** @@ -2151,7 +2092,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FO_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22); } /** @@ -2161,7 +2102,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FO_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23); } /** @@ -2171,7 +2112,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIS_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24); } /** @@ -2181,7 +2122,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIS_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(27); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25); } /** @@ -2191,7 +2132,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIM_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(28); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26); } /** @@ -2201,7 +2142,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Validity() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(29); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(27); } /** @@ -2211,7 +2152,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Income_Tax_Credit() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(30); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(28); } /** @@ -2221,7 +2162,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Previous() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(31); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(29); } /** @@ -2231,7 +2172,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Current_tax_card() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(32); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(30); } /** @@ -2241,7 +2182,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIM_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(33); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31); } /** @@ -2251,7 +2192,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_Alimony_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(34); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32); } /** @@ -2261,7 +2202,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_Debt_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(35); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(33); } /** @@ -2271,7 +2212,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Income() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(36); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(34); } /** @@ -3415,7 +3356,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_DAY); createEReference(physical_PersonEClass, PHYSICAL_PERSON__EXPENSES); createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_WIDOWER); - createEReference(physical_PersonEClass, PHYSICAL_PERSON__OWNS_ADDRESS); addressEClass = createEClass(ADDRESS); createEAttribute(addressEClass, ADDRESS__COUNTRY); @@ -3485,9 +3425,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage incomeEClass = createEClass(INCOME); createEAttribute(incomeEClass, INCOME__INCOME_AMOUNT); createEReference(incomeEClass, INCOME__INCOME_TYPE); - createEAttribute(incomeEClass, INCOME__START_DATE_WITHIN_TAXATION_YEAR); - createEAttribute(incomeEClass, INCOME__START_DATE_OF_CONTRACT); - createEAttribute(incomeEClass, INCOME__END_DATE_WITHIN_TAXATION_YEAR); createEReference(incomeEClass, INCOME__TAX_CARD); createEAttribute(incomeEClass, INCOME__TAX_LIABILITY); createEReference(incomeEClass, INCOME__TAX_PAYER); @@ -3504,8 +3441,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage createEAttribute(tax_CardEClass, TAX_CARD__CARD_IDENTIFIER); createEAttribute(tax_CardEClass, TAX_CARD__TAX_CARD_TYPE); createEAttribute(tax_CardEClass, TAX_CARD__TAX_OFFICE); - createEAttribute(tax_CardEClass, TAX_CARD__VALID_FROM_DATE); - createEAttribute(tax_CardEClass, TAX_CARD__VALID_UNTIL_DATE); createEAttribute(tax_CardEClass, TAX_CARD__PERCENTAGE_OF_WITHOLDING); createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_NAME_SURNAME); createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME); @@ -3813,7 +3748,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEAttribute(getPhysical_Person_Birth_day(), ecorePackage.getEInt(), "birth_day", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getPhysical_Person_Expenses(), this.getExpense(), this.getExpense_Beneficiary(), "expenses", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getPhysical_Person_Is_widower(), ecorePackage.getEBoolean(), "is_widower", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEReference(getPhysical_Person_Owns_Address(), this.getAddress(), null, "owns_Address", null, 0, -1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getAddress_Country(), this.getCountry(), "country", "ZZ", 1, 1, Address.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -3883,9 +3817,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEClass(incomeEClass, Income.class, "Income", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getIncome_Income_amount(), ecorePackage.getEDouble(), "income_amount", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getIncome_Income_type(), this.getIncome_Type(), this.getIncome_Type_Income(), "income_type", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getIncome_Start_date_within_taxation_year(), ecorePackage.getEDate(), "start_date_within_taxation_year", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getIncome_Start_date_of_contract(), ecorePackage.getEDate(), "start_date_of_contract", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getIncome_End_date_within_taxation_year(), ecorePackage.getEDate(), "end_date_within_taxation_year", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getIncome_Tax_card(), this.getTax_Card(), this.getTax_Card_Income(), "tax_card", null, 0, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getIncome_Tax_liability(), ecorePackage.getEDouble(), "tax_liability", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getIncome_TaxPayer(), this.getTax_Payer(), this.getTax_Payer_Incomes(), "taxPayer", null, 1, 1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); @@ -3902,8 +3833,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEAttribute(getTax_Card_Card_identifier(), ecorePackage.getEString(), "card_identifier", null, 0, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTax_Card_Tax_card_type(), this.getTax_Card_Type(), "tax_card_type", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEAttribute(getTax_Card_Tax_office(), this.getTax_Office(), "tax_office", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTax_Card_Valid_from_date(), ecorePackage.getEDate(), "valid_from_date", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getTax_Card_Valid_until_date(), ecorePackage.getEDate(), "valid_until_date", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getTax_Card_Percentage_of_witholding(), ecorePackage.getEDouble(), "percentage_of_witholding", null, 1, 1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTax_Card_Tax_payers_name_surname(), ecorePackage.getEString(), "tax_payers_name_surname", null, 0, -1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getTax_Card_Tax_payers_partner_name_surname(), ecorePackage.getEString(), "tax_payers_partner_name_surname", null, 0, -1, Tax_Card.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); -- cgit v1.2.3-70-g09d2