From 750b37401bc3eb3e9deb7126d90f871973ba477b Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Mon, 11 May 2020 10:06:57 -0400 Subject: Remove derived features from the PLEDGE MM --- .../case.study.pledge.model/model/Taxation.aird | 438 +++-------- .../case.study.pledge.model/model/Taxation.ecore | 70 +- .../model/Taxation.genmodel | 32 +- .../DS_for_Private_Insurance_and_Plan.java | 69 -- .../src/Taxation/Donation.java | 24 - .../src/Taxation/External_Allowance.java | 23 - .../case.study.pledge.model/src/Taxation/FD.java | 23 - .../case.study.pledge.model/src/Taxation/FO.java | 30 - .../src/Taxation/Income_Type.java | 24 - .../src/Taxation/Loss_Carryforward.java | 98 --- .../src/Taxation/Permanent_Expense.java | 24 - .../src/Taxation/Physical_Person.java | 46 -- .../src/Taxation/Private_Insurance_and_Plan.java | 24 - .../src/Taxation/Tax_Card.java | 27 - .../src/Taxation/Tax_Payer.java | 23 - .../src/Taxation/TaxationPackage.java | 858 ++------------------- .../DS_for_Private_Insurance_and_PlanImpl.java | 168 ---- .../src/Taxation/impl/DonationImpl.java | 56 -- .../src/Taxation/impl/External_AllowanceImpl.java | 58 +- .../src/Taxation/impl/FDImpl.java | 56 -- .../src/Taxation/impl/FOImpl.java | 129 ---- .../src/Taxation/impl/Income_TypeImpl.java | 58 +- .../src/Taxation/impl/Loss_CarryforwardImpl.java | 296 ------- .../src/Taxation/impl/Permanent_ExpenseImpl.java | 56 -- .../src/Taxation/impl/Physical_PersonImpl.java | 114 +-- .../impl/Private_Insurance_and_PlanImpl.java | 56 -- .../src/Taxation/impl/Tax_CardImpl.java | 57 -- .../src/Taxation/impl/Tax_PayerImpl.java | 70 -- .../src/Taxation/impl/TaxationFactoryImpl.java | 48 -- .../src/Taxation/impl/TaxationPackageImpl.java | 377 ++------- 30 files changed, 239 insertions(+), 3193 deletions(-) (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.model') 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 d99775e4..65ca16f3 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.aird @@ -4,7 +4,7 @@ Taxation.ecore - + @@ -28,12 +28,6 @@ - - - bold - - - @@ -129,7 +123,7 @@ - + @@ -238,7 +232,7 @@ - + @@ -279,7 +273,7 @@ - + @@ -312,24 +306,7 @@ - - - - - - - - - - - - - - - - - - + @@ -354,7 +331,7 @@ - + @@ -375,7 +352,7 @@ - + @@ -396,7 +373,7 @@ - + @@ -425,24 +402,7 @@ - - - - - - - - - - - - - - - - - - + @@ -463,7 +423,7 @@ - + @@ -496,7 +456,7 @@ - + @@ -525,7 +485,7 @@ - + @@ -551,10 +511,6 @@ - - - - @@ -564,10 +520,6 @@ - - - - @@ -584,10 +536,6 @@ - - - - @@ -676,10 +624,6 @@ - - - - @@ -767,7 +711,7 @@ - + @@ -836,10 +780,6 @@ - - - - @@ -857,10 +797,6 @@ - - - - @@ -1230,15 +1166,11 @@ - - - - - + @@ -1247,20 +1179,16 @@ - + - - - - - + @@ -1273,7 +1201,7 @@ - + @@ -1290,7 +1218,7 @@ - + @@ -1307,7 +1235,7 @@ - + @@ -1316,7 +1244,7 @@ - + @@ -1329,7 +1257,7 @@ - + @@ -1350,7 +1278,7 @@ - + @@ -1359,23 +1287,11 @@ - - - - - - - - - - - - - + @@ -1404,7 +1320,7 @@ - + @@ -1413,7 +1329,7 @@ - + @@ -1422,7 +1338,7 @@ - + @@ -1431,10 +1347,6 @@ - - - - @@ -1470,10 +1382,6 @@ - - - - @@ -1504,10 +1412,6 @@ - - - - @@ -1521,22 +1425,6 @@ - - - - - - - - - - - - - - - - @@ -1615,7 +1503,7 @@ - + @@ -2679,6 +2567,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -2735,6 +2626,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO italic @@ -2944,6 +2838,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3016,6 +2913,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3069,33 +2969,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3136,6 +3015,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3168,6 +3050,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3200,6 +3085,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3245,33 +3133,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3304,6 +3171,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3360,6 +3230,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3448,14 +3321,6 @@ - - - - - bold - - - @@ -3464,14 +3329,6 @@ - - - - - bold - - - @@ -3504,14 +3361,6 @@ - - - - - bold - - - @@ -3648,14 +3497,6 @@ - - - - - bold - - - @@ -3757,6 +3598,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -3895,14 +3739,6 @@ - - - - - bold - - - @@ -3927,14 +3763,6 @@ - - - - - bold - - - @@ -4451,6 +4279,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4463,18 +4294,13 @@ - - - - - bold - - - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4483,22 +4309,20 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO - - - - - bold - - - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4515,6 +4339,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4539,6 +4366,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4563,6 +4393,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4571,6 +4404,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4587,6 +4423,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4619,6 +4458,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4631,34 +4473,13 @@ - - - - - bold - - - - - - - - bold - - - - - - - - bold - - - + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4707,6 +4528,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4715,6 +4539,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -4735,14 +4562,6 @@ - - - - - bold - - - @@ -4783,14 +4602,6 @@ - - - - - bold - - - @@ -4831,14 +4642,6 @@ - - - - - bold - - - @@ -4855,38 +4658,6 @@ - - - - - bold - - - - - - - - bold - - - - - - - - bold - - - - - - - - bold - - - @@ -4947,6 +4718,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -5789,4 +5563,4 @@ - \ No newline at end of file + 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 cfed4729..12571827 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/model/Taxation.ecore @@ -96,10 +96,6 @@ - - - - @@ -123,10 +119,6 @@ - - - - - - - - - - -
- - - - -
- - - - - - + @@ -556,15 +521,6 @@ - - - @@ -578,9 +534,6 @@ - @@ -589,9 +542,6 @@ eType="#//Category_of_Private_Insurance_and_Plan"/> - - - - - - - - + - - - - @@ -59,10 +55,6 @@ - - - - @@ -148,16 +140,13 @@ - - - @@ -190,7 +179,6 @@ - @@ -238,13 +226,11 @@ - - @@ -327,12 +313,9 @@ - - - - + @@ -346,22 +329,17 @@ - - - - - @@ -369,15 +347,9 @@ - - - - - - - + diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java index c72def81..19e23ef5 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/DS_for_Private_Insurance_and_Plan.java @@ -13,9 +13,6 @@ package Taxation; *

*
    *
  • {@link Taxation.DS_for_Private_Insurance_and_Plan#getPrivate_insurance_and_plan_category Private insurance and plan category}
    • - *
  • {@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance Increase for life insurance}
    • - *
  • {@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance Maximum deductible amount for private insurance}
    • - *
  • {@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan Maximum deductible amount for old age pension plan}
    • *
* * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan() @@ -48,70 +45,4 @@ public interface DS_for_Private_Insurance_and_Plan extends DS { */ void setPrivate_insurance_and_plan_category(Category_of_Private_Insurance_and_Plan value); - /** - * Returns the value of the 'Increase for life insurance' attribute. - * - * - * @return the value of the 'Increase for life insurance' attribute. - * @see #setIncrease_for_life_insurance(double) - * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance() - * @model required="true" derived="true" - * @generated - */ - double getIncrease_for_life_insurance(); - - /** - * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance Increase for life insurance}' attribute. - * - * - * @param value the new value of the 'Increase for life insurance' attribute. - * @see #getIncrease_for_life_insurance() - * @generated - */ - void setIncrease_for_life_insurance(double value); - - /** - * Returns the value of the 'Maximum deductible amount for private insurance' attribute. - * - * - * @return the value of the 'Maximum deductible amount for private insurance' attribute. - * @see #setMaximum_deductible_amount_for_private_insurance(double) - * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance() - * @model required="true" derived="true" - * @generated - */ - double getMaximum_deductible_amount_for_private_insurance(); - - /** - * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance Maximum deductible amount for private insurance}' attribute. - * - * - * @param value the new value of the 'Maximum deductible amount for private insurance' attribute. - * @see #getMaximum_deductible_amount_for_private_insurance() - * @generated - */ - void setMaximum_deductible_amount_for_private_insurance(double value); - - /** - * Returns the value of the 'Maximum deductible amount for old age pension plan' attribute. - * - * - * @return the value of the 'Maximum deductible amount for old age pension plan' attribute. - * @see #setMaximum_deductible_amount_for_old_age_pension_plan(double) - * @see Taxation.TaxationPackage#getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan() - * @model required="true" derived="true" - * @generated - */ - double getMaximum_deductible_amount_for_old_age_pension_plan(); - - /** - * Sets the value of the '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan Maximum deductible amount for old age pension plan}' attribute. - * - * - * @param value the new value of the 'Maximum deductible amount for old age pension plan' attribute. - * @see #getMaximum_deductible_amount_for_old_age_pension_plan() - * @generated - */ - void setMaximum_deductible_amount_for_old_age_pension_plan(double value); - } // DS_for_Private_Insurance_and_Plan diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java index 343238d9..37138826 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Donation.java @@ -13,7 +13,6 @@ package Taxation; *

*
    *
  • {@link Taxation.Donation#getBeneficiary1 Beneficiary1}
    • - *
  • {@link Taxation.Donation#isIs_beneficiary_eligible Is beneficiary eligible}
    • *
  • {@link Taxation.Donation#isIs_donation_reported Is donation reported}
    • *
* @@ -44,29 +43,6 @@ public interface Donation extends Special_Expense_DS { */ void setBeneficiary1(String value); - /** - * Returns the value of the 'Is beneficiary eligible' attribute. - * The default value is "false". - * - * - * @return the value of the 'Is beneficiary eligible' attribute. - * @see #setIs_beneficiary_eligible(boolean) - * @see Taxation.TaxationPackage#getDonation_Is_beneficiary_eligible() - * @model default="false" required="true" derived="true" - * @generated - */ - boolean isIs_beneficiary_eligible(); - - /** - * Sets the value of the '{@link Taxation.Donation#isIs_beneficiary_eligible Is beneficiary eligible}' attribute. - * - * - * @param value the new value of the 'Is beneficiary eligible' attribute. - * @see #isIs_beneficiary_eligible() - * @generated - */ - void setIs_beneficiary_eligible(boolean value); - /** * Returns the value of the 'Is donation reported' attribute. * diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java index 625efe59..f239ac45 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/External_Allowance.java @@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EObject; * The following features are supported: *

*
    - *
  • {@link Taxation.External_Allowance#getAmount Amount}
    • *
  • {@link Taxation.External_Allowance#getGrantor Grantor}
    • *
  • {@link Taxation.External_Allowance#getStarting_year Starting year}
    • *
  • {@link Taxation.External_Allowance#getEnding_year Ending year}
    • @@ -27,28 +26,6 @@ import org.eclipse.emf.ecore.EObject; * @generated */ public interface External_Allowance extends EObject { - /** - * Returns the value of the 'Amount' attribute. - * - * - * @return the value of the 'Amount' attribute. - * @see #setAmount(double) - * @see Taxation.TaxationPackage#getExternal_Allowance_Amount() - * @model required="true" - * @generated - */ - double getAmount(); - - /** - * Sets the value of the '{@link Taxation.External_Allowance#getAmount Amount}' attribute. - * - * - * @param value the new value of the 'Amount' attribute. - * @see #getAmount() - * @generated - */ - void setAmount(double value); - /** * Returns the value of the 'Grantor' attribute. * The literals are from the enumeration {@link Taxation.Grantor}. diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java index 0c74a256..5555ed95 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FD.java @@ -13,7 +13,6 @@ package Taxation; *

    *
      *
    • {@link Taxation.FD#getDistance_declared_in_january Distance declared in january}
      • - *
    • {@link Taxation.FD#getCalculated_distance Calculated distance}
      • *
    * * @see Taxation.TaxationPackage#getFD() @@ -43,26 +42,4 @@ public interface FD extends Professional_Expenses_Deduction { */ void setDistance_declared_in_january(double value); - /** - * Returns the value of the 'Calculated distance' attribute. - * - * - * @return the value of the 'Calculated distance' attribute. - * @see #setCalculated_distance(double) - * @see Taxation.TaxationPackage#getFD_Calculated_distance() - * @model required="true" derived="true" - * @generated - */ - double getCalculated_distance(); - - /** - * Sets the value of the '{@link Taxation.FD#getCalculated_distance Calculated distance}' attribute. - * - * - * @param value the new value of the 'Calculated distance' attribute. - * @see #getCalculated_distance() - * @generated - */ - void setCalculated_distance(double value); - } // FD diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java index e403cfa2..420270b1 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/FO.java @@ -8,41 +8,11 @@ package Taxation; * A representation of the model object 'FO'. * * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link Taxation.FO#getRate_type_for_FO Rate type for FO}
      • - *
    * * @see Taxation.TaxationPackage#getFO() * @model * @generated */ public interface FO extends Professional_Expenses_Deduction { - /** - * Returns the value of the 'Rate type for FO' attribute. - * The literals are from the enumeration {@link Taxation.Type_of_Rate}. - * - * - * @return the value of the 'Rate type for FO' attribute. - * @see Taxation.Type_of_Rate - * @see #setRate_type_for_FO(Type_of_Rate) - * @see Taxation.TaxationPackage#getFO_Rate_type_for_FO() - * @model required="true" derived="true" - * @generated - */ - Type_of_Rate getRate_type_for_FO(); - - /** - * Sets the value of the '{@link Taxation.FO#getRate_type_for_FO Rate type for FO}' attribute. - * - * - * @param value the new value of the 'Rate type for FO' attribute. - * @see Taxation.Type_of_Rate - * @see #getRate_type_for_FO() - * @generated - */ - void setRate_type_for_FO(Type_of_Rate value); } // FO diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java index 3d7d03b1..63c3a382 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Income_Type.java @@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.EObject; * The following features are supported: *

    *
      - *
    • {@link Taxation.Income_Type#isSubjectToWithholdingTax Subject To Withholding Tax}
      • *
    • {@link Taxation.Income_Type#getId8 Id8}
      • *
    • {@link Taxation.Income_Type#getIncome Income}
      • *
    @@ -23,29 +22,6 @@ import org.eclipse.emf.ecore.EObject; * @generated */ public interface Income_Type extends EObject { - /** - * Returns the value of the 'Subject To Withholding Tax' attribute. - * - * - * @return the value of the 'Subject To Withholding Tax' attribute. - * @see #setSubjectToWithholdingTax(boolean) - * @see Taxation.TaxationPackage#getIncome_Type_SubjectToWithholdingTax() - * @model required="true" derived="true" - * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='\n\t\t\t\tself.income.tax_card->notEmpty()\n\t\t\t\t'" - * @generated - */ - boolean isSubjectToWithholdingTax(); - - /** - * Sets the value of the '{@link Taxation.Income_Type#isSubjectToWithholdingTax Subject To Withholding Tax}' attribute. - * - * - * @param value the new value of the 'Subject To Withholding Tax' attribute. - * @see #isSubjectToWithholdingTax() - * @generated - */ - void setSubjectToWithholdingTax(boolean value); - /** * Returns the value of the 'Id8' attribute. * diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java index e2ecfb38..a5acbe85 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Loss_Carryforward.java @@ -8,109 +8,11 @@ package Taxation; * A representation of the model object 'Loss Carryforward'. * * - *

    - * The following features are supported: - *

    - *
      - *
    • {@link Taxation.Loss_Carryforward#isRegular_accountability Regular accountability}
      • - *
    • {@link Taxation.Loss_Carryforward#isCompensation_by_other_means Compensation by other means}
      • - *
    • {@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership Tax payer has inherited business ownership}
      • - *
    • {@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business Tax payer has been partner in business}
      • - *
    * * @see Taxation.TaxationPackage#getLoss_Carryforward() * @model * @generated */ public interface Loss_Carryforward extends Special_Expense_DS { - /** - * Returns the value of the 'Regular accountability' attribute. - * - * - * @return the value of the 'Regular accountability' attribute. - * @see #setRegular_accountability(boolean) - * @see Taxation.TaxationPackage#getLoss_Carryforward_Regular_accountability() - * @model required="true" derived="true" - * @generated - */ - boolean isRegular_accountability(); - - /** - * Sets the value of the '{@link Taxation.Loss_Carryforward#isRegular_accountability Regular accountability}' attribute. - * - * - * @param value the new value of the 'Regular accountability' attribute. - * @see #isRegular_accountability() - * @generated - */ - void setRegular_accountability(boolean value); - - /** - * Returns the value of the 'Compensation by other means' attribute. - * - * - * @return the value of the 'Compensation by other means' attribute. - * @see #setCompensation_by_other_means(boolean) - * @see Taxation.TaxationPackage#getLoss_Carryforward_Compensation_by_other_means() - * @model required="true" derived="true" - * @generated - */ - boolean isCompensation_by_other_means(); - - /** - * Sets the value of the '{@link Taxation.Loss_Carryforward#isCompensation_by_other_means Compensation by other means}' attribute. - * - * - * @param value the new value of the 'Compensation by other means' attribute. - * @see #isCompensation_by_other_means() - * @generated - */ - void setCompensation_by_other_means(boolean value); - - /** - * Returns the value of the 'Tax payer has inherited business ownership' attribute. - * The default value is "false". - * - * - * @return the value of the 'Tax payer has inherited business ownership' attribute. - * @see #setTax_payer_has_inherited_business_ownership(boolean) - * @see Taxation.TaxationPackage#getLoss_Carryforward_Tax_payer_has_inherited_business_ownership() - * @model default="false" required="true" derived="true" - * @generated - */ - boolean isTax_payer_has_inherited_business_ownership(); - - /** - * Sets the value of the '{@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership Tax payer has inherited business ownership}' attribute. - * - * - * @param value the new value of the 'Tax payer has inherited business ownership' attribute. - * @see #isTax_payer_has_inherited_business_ownership() - * @generated - */ - void setTax_payer_has_inherited_business_ownership(boolean value); - - /** - * Returns the value of the 'Tax payer has been partner in business' attribute. - * The default value is "true". - * - * - * @return the value of the 'Tax payer has been partner in business' attribute. - * @see #setTax_payer_has_been_partner_in_business(boolean) - * @see Taxation.TaxationPackage#getLoss_Carryforward_Tax_payer_has_been_partner_in_business() - * @model default="true" required="true" derived="true" - * @generated - */ - boolean isTax_payer_has_been_partner_in_business(); - - /** - * Sets the value of the '{@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business Tax payer has been partner in business}' attribute. - * - * - * @param value the new value of the 'Tax payer has been partner in business' attribute. - * @see #isTax_payer_has_been_partner_in_business() - * @generated - */ - void setTax_payer_has_been_partner_in_business(boolean value); } // Loss_Carryforward diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java index 1e8d885b..fd957a6b 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Permanent_Expense.java @@ -13,7 +13,6 @@ package Taxation; *

    *
      *
    • {@link Taxation.Permanent_Expense#getCategory Category}
      • - *
    • {@link Taxation.Permanent_Expense#isIs_eligible_for_deduction Is eligible for deduction}
      • *
    * * @see Taxation.TaxationPackage#getPermanent_Expense() @@ -46,27 +45,4 @@ public interface Permanent_Expense extends Special_Expense_DS { */ void setCategory(Category_of_Permanent_Expense value); - /** - * Returns the value of the 'Is eligible for deduction' attribute. - * The default value is "false". - * - * - * @return the value of the 'Is eligible for deduction' attribute. - * @see #setIs_eligible_for_deduction(boolean) - * @see Taxation.TaxationPackage#getPermanent_Expense_Is_eligible_for_deduction() - * @model default="false" required="true" derived="true" - * @generated - */ - boolean isIs_eligible_for_deduction(); - - /** - * Sets the value of the '{@link Taxation.Permanent_Expense#isIs_eligible_for_deduction Is eligible for deduction}' attribute. - * - * - * @param value the new value of the 'Is eligible for deduction' attribute. - * @see #isIs_eligible_for_deduction() - * @generated - */ - void setIs_eligible_for_deduction(boolean value); - } // Permanent_Expense diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java index b2f40b46..d951f5dc 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Physical_Person.java @@ -15,13 +15,11 @@ import org.eclipse.emf.ecore.EObject; * The following features are supported: *

    *
      - *
    • {@link Taxation.Physical_Person#isIs_assisting_spouse Is assisting spouse}
      • *
    • {@link Taxation.Physical_Person#getSSNo SS No}
      • *
    • {@link Taxation.Physical_Person#getAddresses Addresses}
      • *
    • {@link Taxation.Physical_Person#getBirth_year Birth year}
      • *
    • {@link Taxation.Physical_Person#getDisability_percentage Disability percentage}
      • *
    • {@link Taxation.Physical_Person#getDisability_type Disability type}
      • - *
    • {@link Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security Is affiliated personnaly to social security}
      • *
    • {@link Taxation.Physical_Person#getBirth_month Birth month}
      • *
    • {@link Taxation.Physical_Person#getBirth_day Birth day}
      • *
    • {@link Taxation.Physical_Person#getExpenses Expenses}
      • @@ -33,28 +31,6 @@ import org.eclipse.emf.ecore.EObject; * @generated */ public interface Physical_Person extends EObject { - /** - * Returns the value of the 'Is assisting spouse' attribute. - * - * - * @return the value of the 'Is assisting spouse' attribute. - * @see #setIs_assisting_spouse(boolean) - * @see Taxation.TaxationPackage#getPhysical_Person_Is_assisting_spouse() - * @model required="true" derived="true" - * @generated - */ - boolean isIs_assisting_spouse(); - - /** - * Sets the value of the '{@link Taxation.Physical_Person#isIs_assisting_spouse Is assisting spouse}' attribute. - * - * - * @param value the new value of the 'Is assisting spouse' attribute. - * @see #isIs_assisting_spouse() - * @generated - */ - void setIs_assisting_spouse(boolean value); - /** * Returns the value of the 'SS No' attribute. * @@ -160,28 +136,6 @@ public interface Physical_Person extends EObject { */ void setDisability_type(Disability_Types value); - /** - * Returns the value of the 'Is affiliated personnaly to social security' attribute. - * - * - * @return the value of the 'Is affiliated personnaly to social security' attribute. - * @see #setIs_affiliated_personnaly_to_social_security(boolean) - * @see Taxation.TaxationPackage#getPhysical_Person_Is_affiliated_personnaly_to_social_security() - * @model required="true" derived="true" - * @generated - */ - boolean isIs_affiliated_personnaly_to_social_security(); - - /** - * Sets the value of the '{@link Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security Is affiliated personnaly to social security}' attribute. - * - * - * @param value the new value of the 'Is affiliated personnaly to social security' attribute. - * @see #isIs_affiliated_personnaly_to_social_security() - * @generated - */ - void setIs_affiliated_personnaly_to_social_security(boolean value); - /** * Returns the value of the 'Birth month' attribute. * 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 5cd6e8f0..0a99ebed 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 @@ -14,7 +14,6 @@ package Taxation; *
        *
      • {@link Taxation.Private_Insurance_and_Plan#getCategory Category}
        • *
      • {@link Taxation.Private_Insurance_and_Plan#getDuration_of_contract Duration of contract}
        • - *
      • {@link Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction Is private insurance and plan eligible for deduction}
        • *
      * * @see Taxation.TaxationPackage#getPrivate_Insurance_and_Plan() @@ -69,27 +68,4 @@ public interface Private_Insurance_and_Plan extends Special_Expense_DS { */ void setDuration_of_contract(int value); - /** - * Returns the value of the 'Is private insurance and plan eligible for deduction' attribute. - * The default value is "false". - * - * - * @return the value of the 'Is private insurance and plan eligible for deduction' attribute. - * @see #setIs_private_insurance_and_plan_eligible_for_deduction(boolean) - * @see Taxation.TaxationPackage#getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction() - * @model default="false" required="true" derived="true" - * @generated - */ - boolean isIs_private_insurance_and_plan_eligible_for_deduction(); - - /** - * Sets the value of the '{@link Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction Is private insurance and plan eligible for deduction}' attribute. - * - * - * @param value the new value of the 'Is private insurance and plan eligible for deduction' attribute. - * @see #isIs_private_insurance_and_plan_eligible_for_deduction() - * @generated - */ - void setIs_private_insurance_and_plan_eligible_for_deduction(boolean value); - } // Private_Insurance_and_Plan 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 bcfc0c75..94de4a1b 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 @@ -16,7 +16,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#getPercentage_of_witholding Percentage of witholding}
        • *
      • {@link Taxation.Tax_Card#getTax_payers_name_surname Tax payers name surname}
        • @@ -79,32 +78,6 @@ public interface Tax_Card extends EObject { */ void setCard_identifier(String value); - /** - * Returns the value of the 'Tax card type' attribute. - * The literals are from the enumeration {@link Taxation.Tax_Card_Type}. - * - * - * @return the value of the 'Tax card type' attribute. - * @see Taxation.Tax_Card_Type - * @see #setTax_card_type(Tax_Card_Type) - * @see Taxation.TaxationPackage#getTax_Card_Tax_card_type() - * @model required="true" derived="true" - * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot derivation='if(self.income.taxPayer.incomes->size()=1) then \nTax_Card_Type::Principal\n\telse\n\t\tlet all_incomes:OrderedSet(Income)=self.income.taxPayer.incomes->select(inc:Income| inc.income_amount= self.income.taxPayer.incomes.income_amount->max())->asOrderedSet() in\n\t\tlet bigest_income:Income= all_incomes->first() in\n\t\t\t if(bigest_income=self.income) then\n\t\t\t \t Tax_Card_Type::Principal\n\t\t\t else\n\t\t\t\t\tTax_Card_Type::Additional\n\t\t\t\tendif\nendif\n\t\t\t\t'" - * @generated - */ - Tax_Card_Type getTax_card_type(); - - /** - * Sets the value of the '{@link Taxation.Tax_Card#getTax_card_type Tax card type}' attribute. - * - * - * @param value the new value of the 'Tax card type' attribute. - * @see Taxation.Tax_Card_Type - * @see #getTax_card_type() - * @generated - */ - void setTax_card_type(Tax_Card_Type value); - /** * Returns the value of the 'Tax office' attribute. * The literals are from the enumeration {@link Taxation.Tax_Office}. diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java index 56de04a4..8d5b3989 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/Tax_Payer.java @@ -17,7 +17,6 @@ import org.eclipse.emf.common.util.EList; *
      • {@link Taxation.Tax_Payer#getFrom_agent From agent}
        • *
      • {@link Taxation.Tax_Payer#getIncomes Incomes}
        • *
      • {@link Taxation.Tax_Payer#getFrom_law From law}
        • - *
      • {@link Taxation.Tax_Payer#getTaxesDue Taxes Due}
        • *
      * * @see Taxation.TaxationPackage#getTax_Payer() @@ -102,26 +101,4 @@ public interface Tax_Payer extends Physical_Person, Tax_Case { */ void setFrom_law(FromLaw value); - /** - * Returns the value of the 'Taxes Due' attribute. - * - * - * @return the value of the 'Taxes Due' attribute. - * @see #setTaxesDue(double) - * @see Taxation.TaxationPackage#getTax_Payer_TaxesDue() - * @model required="true" ordered="false" - * @generated - */ - double getTaxesDue(); - - /** - * Sets the value of the '{@link Taxation.Tax_Payer#getTaxesDue Taxes Due}' attribute. - * - * - * @param value the new value of the 'Taxes Due' attribute. - * @see #getTaxesDue() - * @generated - */ - void setTaxesDue(double value); - } // Tax_Payer 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 8706121f..3746e63a 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 @@ -385,15 +385,6 @@ public interface TaxationPackage extends EPackage { */ int PHYSICAL_PERSON = 3; - /** - * The feature id for the 'Is assisting spouse' attribute. - * - * - * @generated - * @ordered - */ - int PHYSICAL_PERSON__IS_ASSISTING_SPOUSE = 0; - /** * The feature id for the 'SS No' attribute. * @@ -401,7 +392,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__SS_NO = 1; + int PHYSICAL_PERSON__SS_NO = 0; /** * The feature id for the 'Addresses' reference list. @@ -410,7 +401,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__ADDRESSES = 2; + int PHYSICAL_PERSON__ADDRESSES = 1; /** * The feature id for the 'Birth year' attribute. @@ -419,7 +410,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__BIRTH_YEAR = 3; + int PHYSICAL_PERSON__BIRTH_YEAR = 2; /** * The feature id for the 'Disability percentage' attribute. @@ -428,7 +419,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__DISABILITY_PERCENTAGE = 4; + int PHYSICAL_PERSON__DISABILITY_PERCENTAGE = 3; /** * The feature id for the 'Disability type' attribute. @@ -437,16 +428,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__DISABILITY_TYPE = 5; - - /** - * The feature id for the 'Is affiliated personnaly to social security' attribute. - * - * - * @generated - * @ordered - */ - int PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = 6; + int PHYSICAL_PERSON__DISABILITY_TYPE = 4; /** * The feature id for the 'Birth month' attribute. @@ -455,7 +437,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__BIRTH_MONTH = 7; + int PHYSICAL_PERSON__BIRTH_MONTH = 5; /** * The feature id for the 'Birth day' attribute. @@ -464,7 +446,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__BIRTH_DAY = 8; + int PHYSICAL_PERSON__BIRTH_DAY = 6; /** * The feature id for the 'Expenses' reference list. @@ -473,7 +455,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__EXPENSES = 9; + int PHYSICAL_PERSON__EXPENSES = 7; /** * The feature id for the 'Is widower' attribute. @@ -482,7 +464,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON__IS_WIDOWER = 10; + int PHYSICAL_PERSON__IS_WIDOWER = 8; /** * The number of structural features of the 'Physical Person' class. @@ -491,7 +473,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PHYSICAL_PERSON_FEATURE_COUNT = 11; + int PHYSICAL_PERSON_FEATURE_COUNT = 9; /** * The number of operations of the 'Physical Person' class. @@ -512,15 +494,6 @@ public interface TaxationPackage extends EPackage { */ int TAX_PAYER = 2; - /** - * The feature id for the 'Is assisting spouse' attribute. - * - * - * @generated - * @ordered - */ - int TAX_PAYER__IS_ASSISTING_SPOUSE = PHYSICAL_PERSON__IS_ASSISTING_SPOUSE; - /** * The feature id for the 'SS No' attribute. * @@ -566,15 +539,6 @@ public interface TaxationPackage extends EPackage { */ int TAX_PAYER__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE; - /** - * The feature id for the 'Is affiliated personnaly to social security' attribute. - * - * - * @generated - * @ordered - */ - int TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY; - /** * The feature id for the 'Birth month' attribute. * @@ -647,15 +611,6 @@ public interface TaxationPackage extends EPackage { */ int TAX_PAYER__FROM_LAW = PHYSICAL_PERSON_FEATURE_COUNT + 3; - /** - * The feature id for the 'Taxes Due' attribute. - * - * - * @generated - * @ordered - */ - int TAX_PAYER__TAXES_DUE = PHYSICAL_PERSON_FEATURE_COUNT + 4; - /** * The number of structural features of the 'Tax Payer' class. * @@ -663,7 +618,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_PAYER_FEATURE_COUNT = PHYSICAL_PERSON_FEATURE_COUNT + 5; + int TAX_PAYER_FEATURE_COUNT = PHYSICAL_PERSON_FEATURE_COUNT + 4; /** * The number of operations of the 'Tax Payer' class. @@ -857,15 +812,6 @@ public interface TaxationPackage extends EPackage { */ int DEPENDENT = 6; - /** - * The feature id for the 'Is assisting spouse' attribute. - * - * - * @generated - * @ordered - */ - int DEPENDENT__IS_ASSISTING_SPOUSE = PHYSICAL_PERSON__IS_ASSISTING_SPOUSE; - /** * The feature id for the 'SS No' attribute. * @@ -911,15 +857,6 @@ public interface TaxationPackage extends EPackage { */ int DEPENDENT__DISABILITY_TYPE = PHYSICAL_PERSON__DISABILITY_TYPE; - /** - * The feature id for the 'Is affiliated personnaly to social security' attribute. - * - * - * @generated - * @ordered - */ - int DEPENDENT__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY; - /** * The feature id for the 'Birth month' attribute. * @@ -1047,15 +984,6 @@ public interface TaxationPackage extends EPackage { */ int EXTERNAL_ALLOWANCE = 7; - /** - * The feature id for the 'Amount' attribute. - * - * - * @generated - * @ordered - */ - int EXTERNAL_ALLOWANCE__AMOUNT = 0; - /** * The feature id for the 'Grantor' attribute. * @@ -1063,7 +991,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int EXTERNAL_ALLOWANCE__GRANTOR = 1; + int EXTERNAL_ALLOWANCE__GRANTOR = 0; /** * The feature id for the 'Starting year' attribute. @@ -1072,7 +1000,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int EXTERNAL_ALLOWANCE__STARTING_YEAR = 2; + int EXTERNAL_ALLOWANCE__STARTING_YEAR = 1; /** * The feature id for the 'Ending year' attribute. @@ -1081,7 +1009,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int EXTERNAL_ALLOWANCE__ENDING_YEAR = 3; + int EXTERNAL_ALLOWANCE__ENDING_YEAR = 2; /** * The feature id for the 'Reciver' reference. @@ -1090,7 +1018,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int EXTERNAL_ALLOWANCE__RECIVER = 4; + int EXTERNAL_ALLOWANCE__RECIVER = 3; /** * The feature id for the 'Id5' attribute. @@ -1099,7 +1027,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int EXTERNAL_ALLOWANCE__ID5 = 5; + int EXTERNAL_ALLOWANCE__ID5 = 4; /** * The feature id for the 'Person' container reference. @@ -1108,7 +1036,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int EXTERNAL_ALLOWANCE__PERSON = 6; + int EXTERNAL_ALLOWANCE__PERSON = 5; /** * The number of structural features of the 'External Allowance' class. @@ -1117,7 +1045,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int EXTERNAL_ALLOWANCE_FEATURE_COUNT = 7; + int EXTERNAL_ALLOWANCE_FEATURE_COUNT = 6; /** * The number of operations of the 'External Allowance' class. @@ -1558,15 +1486,6 @@ public interface TaxationPackage extends EPackage { */ int INCOME_TYPE = 14; - /** - * The feature id for the 'Subject To Withholding Tax' attribute. - * - * - * @generated - * @ordered - */ - int INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX = 0; - /** * The feature id for the 'Id8' attribute. * @@ -1574,7 +1493,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME_TYPE__ID8 = 1; + int INCOME_TYPE__ID8 = 0; /** * The feature id for the 'Income' container reference. @@ -1583,7 +1502,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME_TYPE__INCOME = 2; + int INCOME_TYPE__INCOME = 1; /** * The number of structural features of the 'Income Type' class. @@ -1592,7 +1511,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int INCOME_TYPE_FEATURE_COUNT = 3; + int INCOME_TYPE_FEATURE_COUNT = 2; /** * The number of operations of the 'Income Type' class. @@ -1622,15 +1541,6 @@ public interface TaxationPackage extends EPackage { */ int TAX_CARD__CARD_IDENTIFIER = 0; - /** - * The feature id for the 'Tax card type' attribute. - * - * - * @generated - * @ordered - */ - int TAX_CARD__TAX_CARD_TYPE = 1; - /** * The feature id for the 'Tax office' attribute. * @@ -1638,7 +1548,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__TAX_OFFICE = 2; + int TAX_CARD__TAX_OFFICE = 1; /** * The feature id for the 'Percentage of witholding' attribute. @@ -1647,7 +1557,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__PERCENTAGE_OF_WITHOLDING = 3; + int TAX_CARD__PERCENTAGE_OF_WITHOLDING = 2; /** * The feature id for the 'Tax payers name surname' attribute list. @@ -1656,7 +1566,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__TAX_PAYERS_NAME_SURNAME = 4; + int TAX_CARD__TAX_PAYERS_NAME_SURNAME = 3; /** * The feature id for the 'Tax payers partner name surname' attribute list. @@ -1665,7 +1575,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = 5; + int TAX_CARD__TAX_PAYERS_PARTNER_NAME_SURNAME = 4; /** * The feature id for the 'Tax payers address' reference. @@ -1674,7 +1584,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__TAX_PAYERS_ADDRESS = 6; + int TAX_CARD__TAX_PAYERS_ADDRESS = 5; /** * The feature id for the 'Jobs Employer SS No' attribute. @@ -1683,7 +1593,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_EMPLOYER_SS_NO = 7; + int TAX_CARD__JOBS_EMPLOYER_SS_NO = 6; /** * The feature id for the 'Jobs employers name' attribute. @@ -1692,7 +1602,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_EMPLOYERS_NAME = 8; + int TAX_CARD__JOBS_EMPLOYERS_NAME = 7; /** * The feature id for the 'Jobs activity type' attribute. @@ -1701,7 +1611,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_ACTIVITY_TYPE = 9; + int TAX_CARD__JOBS_ACTIVITY_TYPE = 8; /** * The feature id for the 'Jobs place of work' attribute. @@ -1710,7 +1620,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__JOBS_PLACE_OF_WORK = 10; + int TAX_CARD__JOBS_PLACE_OF_WORK = 9; /** * The feature id for the 'Deduction FD daily' attribute. @@ -1719,7 +1629,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FD_DAILY = 11; + int TAX_CARD__DEDUCTION_FD_DAILY = 10; /** * The feature id for the 'Deduction FD monthly' attribute. @@ -1728,7 +1638,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FD_MONTHLY = 12; + int TAX_CARD__DEDUCTION_FD_MONTHLY = 11; /** * The feature id for the 'Deduction AC daily' attribute. @@ -1737,7 +1647,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_AC_DAILY = 13; + int TAX_CARD__DEDUCTION_AC_DAILY = 12; /** * The feature id for the 'Deduction AC monthly' attribute. @@ -1746,7 +1656,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_AC_MONTHLY = 14; + int TAX_CARD__DEDUCTION_AC_MONTHLY = 13; /** * The feature id for the 'Deduction AC yearly' attribute. @@ -1755,7 +1665,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_AC_YEARLY = 15; + int TAX_CARD__DEDUCTION_AC_YEARLY = 14; /** * The feature id for the 'Deduction CE daily' attribute. @@ -1764,7 +1674,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_CE_DAILY = 16; + int TAX_CARD__DEDUCTION_CE_DAILY = 15; /** * The feature id for the 'Deduction CE monthly' attribute. @@ -1773,7 +1683,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_CE_MONTHLY = 17; + int TAX_CARD__DEDUCTION_CE_MONTHLY = 16; /** * The feature id for the 'Deduction CE yearly' attribute. @@ -1782,7 +1692,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_CE_YEARLY = 18; + int TAX_CARD__DEDUCTION_CE_YEARLY = 17; /** * The feature id for the 'Deduction DS daily' attribute. @@ -1791,7 +1701,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_DAILY = 19; + int TAX_CARD__DEDUCTION_DS_DAILY = 18; /** * The feature id for the 'Deduction DS monthly' attribute. @@ -1800,7 +1710,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_MONTHLY = 20; + int TAX_CARD__DEDUCTION_DS_MONTHLY = 19; /** * The feature id for the 'Deduction FO daily' attribute. @@ -1809,7 +1719,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FO_DAILY = 21; + int TAX_CARD__DEDUCTION_FO_DAILY = 20; /** * The feature id for the 'Deduction FO monthly' attribute. @@ -1818,7 +1728,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FO_MONTHLY = 22; + int TAX_CARD__DEDUCTION_FO_MONTHLY = 21; /** * The feature id for the 'Deduction FO yearly' attribute. @@ -1827,7 +1737,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_FO_YEARLY = 23; + int TAX_CARD__DEDUCTION_FO_YEARLY = 22; /** * The feature id for the 'Credit CIS daily' attribute. @@ -1836,7 +1746,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIS_DAILY = 24; + int TAX_CARD__CREDIT_CIS_DAILY = 23; /** * The feature id for the 'Credit CIS monthly' attribute. @@ -1845,7 +1755,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIS_MONTHLY = 25; + int TAX_CARD__CREDIT_CIS_MONTHLY = 24; /** * The feature id for the 'Credit CIM daily' attribute. @@ -1854,7 +1764,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIM_DAILY = 26; + int TAX_CARD__CREDIT_CIM_DAILY = 25; /** * The feature id for the 'Validity' attribute. @@ -1863,7 +1773,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__VALIDITY = 27; + int TAX_CARD__VALIDITY = 26; /** * The feature id for the 'Income Tax Credit' reference list. @@ -1872,7 +1782,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__INCOME_TAX_CREDIT = 28; + int TAX_CARD__INCOME_TAX_CREDIT = 27; /** * The feature id for the 'Previous' reference. @@ -1881,7 +1791,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__PREVIOUS = 29; + int TAX_CARD__PREVIOUS = 28; /** * The feature id for the 'Current tax card' reference. @@ -1890,7 +1800,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CURRENT_TAX_CARD = 30; + int TAX_CARD__CURRENT_TAX_CARD = 29; /** * The feature id for the 'Credit CIM yearly' attribute. @@ -1899,7 +1809,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__CREDIT_CIM_YEARLY = 31; + int TAX_CARD__CREDIT_CIM_YEARLY = 30; /** * The feature id for the 'Deduction DS Alimony yearly' attribute. @@ -1908,7 +1818,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = 32; + int TAX_CARD__DEDUCTION_DS_ALIMONY_YEARLY = 31; /** * The feature id for the 'Deduction DS Debt yearly' attribute. @@ -1917,7 +1827,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = 33; + int TAX_CARD__DEDUCTION_DS_DEBT_YEARLY = 32; /** * The feature id for the 'Income' container reference. @@ -1926,7 +1836,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD__INCOME = 34; + int TAX_CARD__INCOME = 33; /** * The number of structural features of the 'Tax Card' class. @@ -1935,7 +1845,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int TAX_CARD_FEATURE_COUNT = 35; + int TAX_CARD_FEATURE_COUNT = 34; /** * The number of operations of the 'Tax Card' class. @@ -2466,15 +2376,6 @@ public interface TaxationPackage extends EPackage { */ int NON_RESIDENT_TAX_PAYER = 22; - /** - * The feature id for the 'Is assisting spouse' attribute. - * - * - * @generated - * @ordered - */ - int NON_RESIDENT_TAX_PAYER__IS_ASSISTING_SPOUSE = TAX_PAYER__IS_ASSISTING_SPOUSE; - /** * The feature id for the 'SS No' attribute. * @@ -2520,15 +2421,6 @@ public interface TaxationPackage extends EPackage { */ int NON_RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE; - /** - * The feature id for the 'Is affiliated personnaly to social security' attribute. - * - * - * @generated - * @ordered - */ - int NON_RESIDENT_TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY; - /** * The feature id for the 'Birth month' attribute. * @@ -2601,15 +2493,6 @@ public interface TaxationPackage extends EPackage { */ int NON_RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW; - /** - * The feature id for the 'Taxes Due' attribute. - * - * - * @generated - * @ordered - */ - int NON_RESIDENT_TAX_PAYER__TAXES_DUE = TAX_PAYER__TAXES_DUE; - /** * The feature id for the 'Is assimilated to resident' attribute. * @@ -2756,15 +2639,6 @@ public interface TaxationPackage extends EPackage { */ int RESIDENT_TAX_PAYER = 24; - /** - * The feature id for the 'Is assisting spouse' attribute. - * - * - * @generated - * @ordered - */ - int RESIDENT_TAX_PAYER__IS_ASSISTING_SPOUSE = TAX_PAYER__IS_ASSISTING_SPOUSE; - /** * The feature id for the 'SS No' attribute. * @@ -2810,15 +2684,6 @@ public interface TaxationPackage extends EPackage { */ int RESIDENT_TAX_PAYER__DISABILITY_TYPE = TAX_PAYER__DISABILITY_TYPE; - /** - * The feature id for the 'Is affiliated personnaly to social security' attribute. - * - * - * @generated - * @ordered - */ - int RESIDENT_TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = TAX_PAYER__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY; - /** * The feature id for the 'Birth month' attribute. * @@ -2891,15 +2756,6 @@ public interface TaxationPackage extends EPackage { */ int RESIDENT_TAX_PAYER__FROM_LAW = TAX_PAYER__FROM_LAW; - /** - * The feature id for the 'Taxes Due' attribute. - * - * - * @generated - * @ordered - */ - int RESIDENT_TAX_PAYER__TAXES_DUE = TAX_PAYER__TAXES_DUE; - /** * The number of structural features of the 'Resident Tax Payer' class. * @@ -2928,15 +2784,6 @@ public interface TaxationPackage extends EPackage { */ int TRADE_AND_BUSINESS_INCOME = 25; - /** - * The feature id for the 'Subject To Withholding Tax' attribute. - * - * - * @generated - * @ordered - */ - int TRADE_AND_BUSINESS_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX; - /** * The feature id for the 'Id8' attribute. * @@ -2983,15 +2830,6 @@ public interface TaxationPackage extends EPackage { */ int AGRICULTURE_AND_FORESTRY_INCOME = 26; - /** - * The feature id for the 'Subject To Withholding Tax' attribute. - * - * - * @generated - * @ordered - */ - int AGRICULTURE_AND_FORESTRY_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX; - /** * The feature id for the 'Id8' attribute. * @@ -3038,15 +2876,6 @@ public interface TaxationPackage extends EPackage { */ int PENSIONS_AND_ANNUITIES_INCOME = 27; - /** - * The feature id for the 'Subject To Withholding Tax' attribute. - * - * - * @generated - * @ordered - */ - int PENSIONS_AND_ANNUITIES_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX; - /** * The feature id for the 'Id8' attribute. * @@ -3102,15 +2931,6 @@ public interface TaxationPackage extends EPackage { */ int CAPITAL_AND_INVESTMENTS_INCOME = 28; - /** - * The feature id for the 'Subject To Withholding Tax' attribute. - * - * - * @generated - * @ordered - */ - int CAPITAL_AND_INVESTMENTS_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX; - /** * The feature id for the 'Id8' attribute. * @@ -3157,15 +2977,6 @@ public interface TaxationPackage extends EPackage { */ int EMPLOYMENT_INCOME = 29; - /** - * The feature id for the 'Subject To Withholding Tax' attribute. - * - * - * @generated - * @ordered - */ - int EMPLOYMENT_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX; - /** * The feature id for the 'Id8' attribute. * @@ -3212,15 +3023,6 @@ public interface TaxationPackage extends EPackage { */ int RENTALS_AND_LEASES_INCOME = 30; - /** - * The feature id for the 'Subject To Withholding Tax' attribute. - * - * - * @generated - * @ordered - */ - int RENTALS_AND_LEASES_INCOME__SUBJECT_TO_WITHHOLDING_TAX = INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX; - /** * The feature id for the 'Id8' attribute. * @@ -3813,15 +3615,6 @@ public interface TaxationPackage extends EPackage { */ int FD__DISTANCE_DECLARED_IN_JANUARY = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 0; - /** - * The feature id for the 'Calculated distance' attribute. - * - * - * @generated - * @ordered - */ - int FD__CALCULATED_DISTANCE = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 1; - /** * The number of structural features of the 'FD' class. * @@ -3829,7 +3622,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int FD_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 2; + int FD_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 1; /** * The number of operations of the 'FD' class. @@ -3850,15 +3643,6 @@ public interface TaxationPackage extends EPackage { */ int FO = 38; - /** - * The feature id for the 'Rate type for FO' attribute. - * - * - * @generated - * @ordered - */ - int FO__RATE_TYPE_FOR_FO = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 0; - /** * The number of structural features of the 'FO' class. * @@ -3866,7 +3650,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int FO_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 1; + int FO_FEATURE_COUNT = PROFESSIONAL_EXPENSES_DEDUCTION_FEATURE_COUNT + 0; /** * The number of operations of the 'FO' class. @@ -4116,33 +3900,6 @@ public interface TaxationPackage extends EPackage { */ int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY = DS_FEATURE_COUNT + 0; - /** - * The feature id for the 'Increase for life insurance' attribute. - * - * - * @generated - * @ordered - */ - int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE = DS_FEATURE_COUNT + 1; - - /** - * The feature id for the 'Maximum deductible amount for private insurance' attribute. - * - * - * @generated - * @ordered - */ - int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE = DS_FEATURE_COUNT + 2; - - /** - * The feature id for the 'Maximum deductible amount for old age pension plan' attribute. - * - * - * @generated - * @ordered - */ - int DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN = DS_FEATURE_COUNT + 3; - /** * The number of structural features of the 'DS for Private Insurance and Plan' class. * @@ -4150,7 +3907,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int DS_FOR_PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = DS_FEATURE_COUNT + 4; + int DS_FOR_PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = DS_FEATURE_COUNT + 1; /** * The number of operations of the 'DS for Private Insurance and Plan' class. @@ -4426,15 +4183,6 @@ public interface TaxationPackage extends EPackage { */ int PERMANENT_EXPENSE__CATEGORY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0; - /** - * The feature id for the 'Is eligible for deduction' attribute. - * - * - * @generated - * @ordered - */ - int PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1; - /** * The number of structural features of the 'Permanent Expense' class. * @@ -4442,7 +4190,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PERMANENT_EXPENSE_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; + int PERMANENT_EXPENSE_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1; /** * The number of operations of the 'Permanent Expense' class. @@ -4635,15 +4383,6 @@ public interface TaxationPackage extends EPackage { */ int PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1; - /** - * The feature id for the 'Is private insurance and plan eligible for deduction' attribute. - * - * - * @generated - * @ordered - */ - int PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; - /** * The number of structural features of the 'Private Insurance and Plan' class. * @@ -4651,7 +4390,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 3; + int PRIVATE_INSURANCE_AND_PLAN_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; /** * The number of operations of the 'Private Insurance and Plan' class. @@ -4853,15 +4592,6 @@ public interface TaxationPackage extends EPackage { */ int DONATION__BENEFICIARY1 = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0; - /** - * The feature id for the 'Is beneficiary eligible' attribute. - * - * - * @generated - * @ordered - */ - int DONATION__IS_BENEFICIARY_ELIGIBLE = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1; - /** * The feature id for the 'Is donation reported' attribute. * @@ -4869,7 +4599,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int DONATION__IS_DONATION_REPORTED = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; + int DONATION__IS_DONATION_REPORTED = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1; /** * The number of structural features of the 'Donation' class. @@ -4878,7 +4608,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int DONATION_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 3; + int DONATION_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; /** * The number of operations of the 'Donation' class. @@ -4962,42 +4692,6 @@ public interface TaxationPackage extends EPackage { */ int LOSS_CARRYFORWARD__BENEFICIARY = SPECIAL_EXPENSE_DS__BENEFICIARY; - /** - * The feature id for the 'Regular accountability' attribute. - * - * - * @generated - * @ordered - */ - int LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0; - - /** - * The feature id for the 'Compensation by other means' attribute. - * - * - * @generated - * @ordered - */ - int LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 1; - - /** - * The feature id for the 'Tax payer has inherited business ownership' attribute. - * - * - * @generated - * @ordered - */ - int LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 2; - - /** - * The feature id for the 'Tax payer has been partner in business' attribute. - * - * - * @generated - * @ordered - */ - int LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 3; - /** * The number of structural features of the 'Loss Carryforward' class. * @@ -5005,7 +4699,7 @@ public interface TaxationPackage extends EPackage { * @generated * @ordered */ - int LOSS_CARRYFORWARD_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 4; + int LOSS_CARRYFORWARD_FEATURE_COUNT = SPECIAL_EXPENSE_DS_FEATURE_COUNT + 0; /** * The number of operations of the 'Loss Carryforward' class. @@ -5519,16 +5213,6 @@ public interface TaxationPackage extends EPackage { */ int COUNTRY = 60; - /** - * The meta object id for the '{@link Taxation.Tax_Card_Type Tax Card Type}' enum. - * - * - * @see Taxation.Tax_Card_Type - * @see Taxation.impl.TaxationPackageImpl#getTax_Card_Type() - * @generated - */ - int TAX_CARD_TYPE = 61; - /** * The meta object id for the '{@link Taxation.Tax_Office Tax Office}' enum. * @@ -5537,7 +5221,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getTax_Office() * @generated */ - int TAX_OFFICE = 62; + int TAX_OFFICE = 61; /** * The meta object id for the '{@link Taxation.Tax_Class_Category Tax Class Category}' enum. @@ -5547,7 +5231,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getTax_Class_Category() * @generated */ - int TAX_CLASS_CATEGORY = 63; + int TAX_CLASS_CATEGORY = 62; /** * The meta object id for the '{@link Taxation.Job_Activity Job Activity}' enum. @@ -5557,7 +5241,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getJob_Activity() * @generated */ - int JOB_ACTIVITY = 64; + int JOB_ACTIVITY = 63; /** * The meta object id for the '{@link Taxation.Town Town}' enum. @@ -5567,17 +5251,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getTown() * @generated */ - int TOWN = 65; - - /** - * The meta object id for the '{@link Taxation.Type_of_Rate Type of Rate}' enum. - * - * - * @see Taxation.Type_of_Rate - * @see Taxation.impl.TaxationPackageImpl#getType_of_Rate() - * @generated - */ - int TYPE_OF_RATE = 66; + int TOWN = 64; /** * The meta object id for the '{@link Taxation.CE_Type CE Type}' enum. @@ -5587,7 +5261,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getCE_Type() * @generated */ - int CE_TYPE = 67; + int CE_TYPE = 65; /** * The meta object id for the '{@link Taxation.Expense_Purpose Expense Purpose}' enum. @@ -5597,7 +5271,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getExpense_Purpose() * @generated */ - int EXPENSE_PURPOSE = 68; + int EXPENSE_PURPOSE = 66; /** * The meta object id for the '{@link Taxation.Dependent_Type Dependent Type}' enum. @@ -5607,7 +5281,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getDependent_Type() * @generated */ - int DEPENDENT_TYPE = 69; + int DEPENDENT_TYPE = 67; /** * The meta object id for the '{@link Taxation.Separation_Causes Separation Causes}' enum. @@ -5617,7 +5291,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getSeparation_Causes() * @generated */ - int SEPARATION_CAUSES = 70; + int SEPARATION_CAUSES = 68; /** * The meta object id for the '{@link Taxation.Category_of_Permanent_Expense Category of Permanent Expense}' enum. @@ -5627,7 +5301,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Permanent_Expense() * @generated */ - int CATEGORY_OF_PERMANENT_EXPENSE = 71; + int CATEGORY_OF_PERMANENT_EXPENSE = 69; /** * The meta object id for the '{@link Taxation.Category_of_Health_and_Pension_Insurances Category of Health and Pension Insurances}' enum. @@ -5637,7 +5311,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Health_and_Pension_Insurances() * @generated */ - int CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES = 72; + int CATEGORY_OF_HEALTH_AND_PENSION_INSURANCES = 70; /** * The meta object id for the '{@link Taxation.Category_of_Private_Insurance_and_Plan Category of Private Insurance and Plan}' enum. @@ -5647,7 +5321,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getCategory_of_Private_Insurance_and_Plan() * @generated */ - int CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN = 73; + int CATEGORY_OF_PRIVATE_INSURANCE_AND_PLAN = 71; /** * The meta object id for the '{@link Taxation.Legal_Union_Types Legal Union Types}' enum. @@ -5657,7 +5331,7 @@ public interface TaxationPackage extends EPackage { * @see Taxation.impl.TaxationPackageImpl#getLegal_Union_Types() * @generated */ - int LEGAL_UNION_TYPES = 74; + int LEGAL_UNION_TYPES = 72; /** @@ -6053,17 +5727,6 @@ public interface TaxationPackage extends EPackage { */ EReference getTax_Payer_From_law(); - /** - * Returns the meta object for the attribute '{@link Taxation.Tax_Payer#getTaxesDue Taxes Due}'. - * - * - * @return the meta object for the attribute 'Taxes Due'. - * @see Taxation.Tax_Payer#getTaxesDue() - * @see #getTax_Payer() - * @generated - */ - EAttribute getTax_Payer_TaxesDue(); - /** * Returns the meta object for class '{@link Taxation.Physical_Person Physical Person}'. * @@ -6074,17 +5737,6 @@ public interface TaxationPackage extends EPackage { */ EClass getPhysical_Person(); - /** - * Returns the meta object for the attribute '{@link Taxation.Physical_Person#isIs_assisting_spouse Is assisting spouse}'. - * - * - * @return the meta object for the attribute 'Is assisting spouse'. - * @see Taxation.Physical_Person#isIs_assisting_spouse() - * @see #getPhysical_Person() - * @generated - */ - EAttribute getPhysical_Person_Is_assisting_spouse(); - /** * Returns the meta object for the attribute '{@link Taxation.Physical_Person#getSSNo SS No}'. * @@ -6140,17 +5792,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getPhysical_Person_Disability_type(); - /** - * Returns the meta object for the attribute '{@link Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security Is affiliated personnaly to social security}'. - * - * - * @return the meta object for the attribute 'Is affiliated personnaly to social security'. - * @see Taxation.Physical_Person#isIs_affiliated_personnaly_to_social_security() - * @see #getPhysical_Person() - * @generated - */ - EAttribute getPhysical_Person_Is_affiliated_personnaly_to_social_security(); - /** * Returns the meta object for the attribute '{@link Taxation.Physical_Person#getBirth_month Birth month}'. * @@ -6455,17 +6096,6 @@ public interface TaxationPackage extends EPackage { */ EClass getExternal_Allowance(); - /** - * Returns the meta object for the attribute '{@link Taxation.External_Allowance#getAmount Amount}'. - * - * - * @return the meta object for the attribute 'Amount'. - * @see Taxation.External_Allowance#getAmount() - * @see #getExternal_Allowance() - * @generated - */ - EAttribute getExternal_Allowance_Amount(); - /** * Returns the meta object for the attribute '{@link Taxation.External_Allowance#getGrantor Grantor}'. * @@ -6910,17 +6540,6 @@ public interface TaxationPackage extends EPackage { */ EClass getIncome_Type(); - /** - * Returns the meta object for the attribute '{@link Taxation.Income_Type#isSubjectToWithholdingTax Subject To Withholding Tax}'. - * - * - * @return the meta object for the attribute 'Subject To Withholding Tax'. - * @see Taxation.Income_Type#isSubjectToWithholdingTax() - * @see #getIncome_Type() - * @generated - */ - EAttribute getIncome_Type_SubjectToWithholdingTax(); - /** * Returns the meta object for the attribute '{@link Taxation.Income_Type#getId8 Id8}'. * @@ -6964,17 +6583,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getTax_Card_Card_identifier(); - /** - * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getTax_card_type Tax card type}'. - * - * - * @return the meta object for the attribute 'Tax card type'. - * @see Taxation.Tax_Card#getTax_card_type() - * @see #getTax_Card() - * @generated - */ - EAttribute getTax_Card_Tax_card_type(); - /** * Returns the meta object for the attribute '{@link Taxation.Tax_Card#getTax_office Tax office}'. * @@ -7779,17 +7387,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getFD_Distance_declared_in_january(); - /** - * Returns the meta object for the attribute '{@link Taxation.FD#getCalculated_distance Calculated distance}'. - * - * - * @return the meta object for the attribute 'Calculated distance'. - * @see Taxation.FD#getCalculated_distance() - * @see #getFD() - * @generated - */ - EAttribute getFD_Calculated_distance(); - /** * Returns the meta object for class '{@link Taxation.Professional_Expenses_Deduction Professional Expenses Deduction}'. * @@ -7810,17 +7407,6 @@ public interface TaxationPackage extends EPackage { */ EClass getFO(); - /** - * Returns the meta object for the attribute '{@link Taxation.FO#getRate_type_for_FO Rate type for FO}'. - * - * - * @return the meta object for the attribute 'Rate type for FO'. - * @see Taxation.FO#getRate_type_for_FO() - * @see #getFO() - * @generated - */ - EAttribute getFO_Rate_type_for_FO(); - /** * Returns the meta object for class '{@link Taxation.DS_for_Permanent_Expense DS for Permanent Expense}'. * @@ -7926,39 +7512,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category(); - /** - * Returns the meta object for the attribute '{@link Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance Increase for life insurance}'. - * - * - * @return the meta object for the attribute 'Increase for life insurance'. - * @see Taxation.DS_for_Private_Insurance_and_Plan#getIncrease_for_life_insurance() - * @see #getDS_for_Private_Insurance_and_Plan() - * @generated - */ - EAttribute getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance(); - - /** - * Returns the meta object for the attribute '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance Maximum deductible amount for private insurance}'. - * - * - * @return the meta object for the attribute 'Maximum deductible amount for private insurance'. - * @see Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_private_insurance() - * @see #getDS_for_Private_Insurance_and_Plan() - * @generated - */ - EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance(); - - /** - * Returns the meta object for the attribute '{@link Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan Maximum deductible amount for old age pension plan}'. - * - * - * @return the meta object for the attribute 'Maximum deductible amount for old age pension plan'. - * @see Taxation.DS_for_Private_Insurance_and_Plan#getMaximum_deductible_amount_for_old_age_pension_plan() - * @see #getDS_for_Private_Insurance_and_Plan() - * @generated - */ - EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan(); - /** * Returns the meta object for class '{@link Taxation.DS_for_Loss_Carryforward DS for Loss Carryforward}'. * @@ -8000,17 +7553,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getPermanent_Expense_Category(); - /** - * Returns the meta object for the attribute '{@link Taxation.Permanent_Expense#isIs_eligible_for_deduction Is eligible for deduction}'. - * - * - * @return the meta object for the attribute 'Is eligible for deduction'. - * @see Taxation.Permanent_Expense#isIs_eligible_for_deduction() - * @see #getPermanent_Expense() - * @generated - */ - EAttribute getPermanent_Expense_Is_eligible_for_deduction(); - /** * Returns the meta object for class '{@link Taxation.Special_Expense_DS Special Expense DS}'. * @@ -8063,17 +7605,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getPrivate_Insurance_and_Plan_Duration_of_contract(); - /** - * Returns the meta object for the attribute '{@link Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction Is private insurance and plan eligible for deduction}'. - * - * - * @return the meta object for the attribute 'Is private insurance and plan eligible for deduction'. - * @see Taxation.Private_Insurance_and_Plan#isIs_private_insurance_and_plan_eligible_for_deduction() - * @see #getPrivate_Insurance_and_Plan() - * @generated - */ - EAttribute getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction(); - /** * Returns the meta object for class '{@link Taxation.Health_and_Pension_Insurance Health and Pension Insurance}'. * @@ -8127,17 +7658,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute getDonation_Beneficiary1(); - /** - * Returns the meta object for the attribute '{@link Taxation.Donation#isIs_beneficiary_eligible Is beneficiary eligible}'. - * - * - * @return the meta object for the attribute 'Is beneficiary eligible'. - * @see Taxation.Donation#isIs_beneficiary_eligible() - * @see #getDonation() - * @generated - */ - EAttribute getDonation_Is_beneficiary_eligible(); - /** * Returns the meta object for the attribute '{@link Taxation.Donation#isIs_donation_reported Is donation reported}'. * @@ -8159,50 +7679,6 @@ public interface TaxationPackage extends EPackage { */ EClass getLoss_Carryforward(); - /** - * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isRegular_accountability Regular accountability}'. - * - * - * @return the meta object for the attribute 'Regular accountability'. - * @see Taxation.Loss_Carryforward#isRegular_accountability() - * @see #getLoss_Carryforward() - * @generated - */ - EAttribute getLoss_Carryforward_Regular_accountability(); - - /** - * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isCompensation_by_other_means Compensation by other means}'. - * - * - * @return the meta object for the attribute 'Compensation by other means'. - * @see Taxation.Loss_Carryforward#isCompensation_by_other_means() - * @see #getLoss_Carryforward() - * @generated - */ - EAttribute getLoss_Carryforward_Compensation_by_other_means(); - - /** - * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership Tax payer has inherited business ownership}'. - * - * - * @return the meta object for the attribute 'Tax payer has inherited business ownership'. - * @see Taxation.Loss_Carryforward#isTax_payer_has_inherited_business_ownership() - * @see #getLoss_Carryforward() - * @generated - */ - EAttribute getLoss_Carryforward_Tax_payer_has_inherited_business_ownership(); - - /** - * Returns the meta object for the attribute '{@link Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business Tax payer has been partner in business}'. - * - * - * @return the meta object for the attribute 'Tax payer has been partner in business'. - * @see Taxation.Loss_Carryforward#isTax_payer_has_been_partner_in_business() - * @see #getLoss_Carryforward() - * @generated - */ - EAttribute getLoss_Carryforward_Tax_payer_has_been_partner_in_business(); - /** * Returns the meta object for class '{@link Taxation.Spousal_Expense_AC Spousal Expense AC}'. * @@ -8305,16 +7781,6 @@ public interface TaxationPackage extends EPackage { */ EEnum getCountry(); - /** - * Returns the meta object for enum '{@link Taxation.Tax_Card_Type Tax Card Type}'. - * - * - * @return the meta object for enum 'Tax Card Type'. - * @see Taxation.Tax_Card_Type - * @generated - */ - EEnum getTax_Card_Type(); - /** * Returns the meta object for enum '{@link Taxation.Tax_Office Tax Office}'. * @@ -8355,16 +7821,6 @@ public interface TaxationPackage extends EPackage { */ EEnum getTown(); - /** - * Returns the meta object for enum '{@link Taxation.Type_of_Rate Type of Rate}'. - * - * - * @return the meta object for enum 'Type of Rate'. - * @see Taxation.Type_of_Rate - * @generated - */ - EEnum getType_of_Rate(); - /** * Returns the meta object for enum '{@link Taxation.CE_Type CE Type}'. * @@ -8762,14 +8218,6 @@ public interface TaxationPackage extends EPackage { */ EReference TAX_PAYER__FROM_LAW = eINSTANCE.getTax_Payer_From_law(); - /** - * The meta object literal for the 'Taxes Due' attribute feature. - * - * - * @generated - */ - EAttribute TAX_PAYER__TAXES_DUE = eINSTANCE.getTax_Payer_TaxesDue(); - /** * The meta object literal for the '{@link Taxation.impl.Physical_PersonImpl Physical Person}' class. * @@ -8780,14 +8228,6 @@ public interface TaxationPackage extends EPackage { */ EClass PHYSICAL_PERSON = eINSTANCE.getPhysical_Person(); - /** - * The meta object literal for the 'Is assisting spouse' attribute feature. - * - * - * @generated - */ - EAttribute PHYSICAL_PERSON__IS_ASSISTING_SPOUSE = eINSTANCE.getPhysical_Person_Is_assisting_spouse(); - /** * The meta object literal for the 'SS No' attribute feature. * @@ -8828,14 +8268,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute PHYSICAL_PERSON__DISABILITY_TYPE = eINSTANCE.getPhysical_Person_Disability_type(); - /** - * The meta object literal for the 'Is affiliated personnaly to social security' attribute feature. - * - * - * @generated - */ - EAttribute PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY = eINSTANCE.getPhysical_Person_Is_affiliated_personnaly_to_social_security(); - /** * The meta object literal for the 'Birth month' attribute feature. * @@ -9068,14 +8500,6 @@ public interface TaxationPackage extends EPackage { */ EClass EXTERNAL_ALLOWANCE = eINSTANCE.getExternal_Allowance(); - /** - * The meta object literal for the 'Amount' attribute feature. - * - * - * @generated - */ - EAttribute EXTERNAL_ALLOWANCE__AMOUNT = eINSTANCE.getExternal_Allowance_Amount(); - /** * The meta object literal for the 'Grantor' attribute feature. * @@ -9418,14 +8842,6 @@ public interface TaxationPackage extends EPackage { */ EClass INCOME_TYPE = eINSTANCE.getIncome_Type(); - /** - * The meta object literal for the 'Subject To Withholding Tax' attribute feature. - * - * - * @generated - */ - EAttribute INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX = eINSTANCE.getIncome_Type_SubjectToWithholdingTax(); - /** * The meta object literal for the 'Id8' attribute feature. * @@ -9460,14 +8876,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute TAX_CARD__CARD_IDENTIFIER = eINSTANCE.getTax_Card_Card_identifier(); - /** - * The meta object literal for the 'Tax card type' attribute feature. - * - * - * @generated - */ - EAttribute TAX_CARD__TAX_CARD_TYPE = eINSTANCE.getTax_Card_Tax_card_type(); - /** * The meta object literal for the 'Tax office' attribute feature. * @@ -10110,14 +9518,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute FD__DISTANCE_DECLARED_IN_JANUARY = eINSTANCE.getFD_Distance_declared_in_january(); - /** - * The meta object literal for the 'Calculated distance' attribute feature. - * - * - * @generated - */ - EAttribute FD__CALCULATED_DISTANCE = eINSTANCE.getFD_Calculated_distance(); - /** * The meta object literal for the '{@link Taxation.impl.Professional_Expenses_DeductionImpl Professional Expenses Deduction}' class. * @@ -10138,14 +9538,6 @@ public interface TaxationPackage extends EPackage { */ EClass FO = eINSTANCE.getFO(); - /** - * The meta object literal for the 'Rate type for FO' attribute feature. - * - * - * @generated - */ - EAttribute FO__RATE_TYPE_FOR_FO = eINSTANCE.getFO_Rate_type_for_FO(); - /** * The meta object literal for the '{@link Taxation.impl.DS_for_Permanent_ExpenseImpl DS for Permanent Expense}' class. * @@ -10236,30 +9628,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category(); - /** - * The meta object literal for the 'Increase for life insurance' attribute feature. - * - * - * @generated - */ - EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance(); - - /** - * The meta object literal for the 'Maximum deductible amount for private insurance' attribute feature. - * - * - * @generated - */ - EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance(); - - /** - * The meta object literal for the 'Maximum deductible amount for old age pension plan' attribute feature. - * - * - * @generated - */ - EAttribute DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN = eINSTANCE.getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan(); - /** * The meta object literal for the '{@link Taxation.impl.DS_for_Loss_CarryforwardImpl DS for Loss Carryforward}' class. * @@ -10298,14 +9666,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute PERMANENT_EXPENSE__CATEGORY = eINSTANCE.getPermanent_Expense_Category(); - /** - * The meta object literal for the 'Is eligible for deduction' attribute feature. - * - * - * @generated - */ - EAttribute PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION = eINSTANCE.getPermanent_Expense_Is_eligible_for_deduction(); - /** * The meta object literal for the '{@link Taxation.impl.Special_Expense_DSImpl Special Expense DS}' class. * @@ -10352,14 +9712,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT = eINSTANCE.getPrivate_Insurance_and_Plan_Duration_of_contract(); - /** - * The meta object literal for the 'Is private insurance and plan eligible for deduction' attribute feature. - * - * - * @generated - */ - EAttribute PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION = eINSTANCE.getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction(); - /** * The meta object literal for the '{@link Taxation.impl.Health_and_Pension_InsuranceImpl Health and Pension Insurance}' class. * @@ -10404,14 +9756,6 @@ public interface TaxationPackage extends EPackage { */ EAttribute DONATION__BENEFICIARY1 = eINSTANCE.getDonation_Beneficiary1(); - /** - * The meta object literal for the 'Is beneficiary eligible' attribute feature. - * - * - * @generated - */ - EAttribute DONATION__IS_BENEFICIARY_ELIGIBLE = eINSTANCE.getDonation_Is_beneficiary_eligible(); - /** * The meta object literal for the 'Is donation reported' attribute feature. * @@ -10430,38 +9774,6 @@ public interface TaxationPackage extends EPackage { */ EClass LOSS_CARRYFORWARD = eINSTANCE.getLoss_Carryforward(); - /** - * The meta object literal for the 'Regular accountability' attribute feature. - * - * - * @generated - */ - EAttribute LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY = eINSTANCE.getLoss_Carryforward_Regular_accountability(); - - /** - * The meta object literal for the 'Compensation by other means' attribute feature. - * - * - * @generated - */ - EAttribute LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS = eINSTANCE.getLoss_Carryforward_Compensation_by_other_means(); - - /** - * The meta object literal for the 'Tax payer has inherited business ownership' attribute feature. - * - * - * @generated - */ - EAttribute LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP = eINSTANCE.getLoss_Carryforward_Tax_payer_has_inherited_business_ownership(); - - /** - * The meta object literal for the 'Tax payer has been partner in business' attribute feature. - * - * - * @generated - */ - EAttribute LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS = eINSTANCE.getLoss_Carryforward_Tax_payer_has_been_partner_in_business(); - /** * The meta object literal for the '{@link Taxation.impl.Spousal_Expense_ACImpl Spousal Expense AC}' class. * @@ -10558,16 +9870,6 @@ public interface TaxationPackage extends EPackage { */ EEnum COUNTRY = eINSTANCE.getCountry(); - /** - * The meta object literal for the '{@link Taxation.Tax_Card_Type Tax Card Type}' enum. - * - * - * @see Taxation.Tax_Card_Type - * @see Taxation.impl.TaxationPackageImpl#getTax_Card_Type() - * @generated - */ - EEnum TAX_CARD_TYPE = eINSTANCE.getTax_Card_Type(); - /** * The meta object literal for the '{@link Taxation.Tax_Office Tax Office}' enum. * @@ -10608,16 +9910,6 @@ public interface TaxationPackage extends EPackage { */ EEnum TOWN = eINSTANCE.getTown(); - /** - * The meta object literal for the '{@link Taxation.Type_of_Rate Type of Rate}' enum. - * - * - * @see Taxation.Type_of_Rate - * @see Taxation.impl.TaxationPackageImpl#getType_of_Rate() - * @generated - */ - EEnum TYPE_OF_RATE = eINSTANCE.getType_of_Rate(); - /** * The meta object literal for the '{@link Taxation.CE_Type CE Type}' enum. * diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java index d33beb48..8ad3e39d 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java @@ -21,9 +21,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *

      *
        *
      • {@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getPrivate_insurance_and_plan_category Private insurance and plan category}
        • - *
      • {@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getIncrease_for_life_insurance Increase for life insurance}
        • - *
      • {@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getMaximum_deductible_amount_for_private_insurance Maximum deductible amount for private insurance}
        • - *
      • {@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getMaximum_deductible_amount_for_old_age_pension_plan Maximum deductible amount for old age pension plan}
        • *
      * * @generated @@ -49,66 +46,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_ */ protected Category_of_Private_Insurance_and_Plan private_insurance_and_plan_category = PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT; - /** - * The default value of the '{@link #getIncrease_for_life_insurance() Increase for life insurance}' attribute. - * - * - * @see #getIncrease_for_life_insurance() - * @generated - * @ordered - */ - protected static final double INCREASE_FOR_LIFE_INSURANCE_EDEFAULT = 0.0; - - /** - * The cached value of the '{@link #getIncrease_for_life_insurance() Increase for life insurance}' attribute. - * - * - * @see #getIncrease_for_life_insurance() - * @generated - * @ordered - */ - protected double increase_for_life_insurance = INCREASE_FOR_LIFE_INSURANCE_EDEFAULT; - - /** - * The default value of the '{@link #getMaximum_deductible_amount_for_private_insurance() Maximum deductible amount for private insurance}' attribute. - * - * - * @see #getMaximum_deductible_amount_for_private_insurance() - * @generated - * @ordered - */ - protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT = 0.0; - - /** - * The cached value of the '{@link #getMaximum_deductible_amount_for_private_insurance() Maximum deductible amount for private insurance}' attribute. - * - * - * @see #getMaximum_deductible_amount_for_private_insurance() - * @generated - * @ordered - */ - protected double maximum_deductible_amount_for_private_insurance = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT; - - /** - * The default value of the '{@link #getMaximum_deductible_amount_for_old_age_pension_plan() Maximum deductible amount for old age pension plan}' attribute. - * - * - * @see #getMaximum_deductible_amount_for_old_age_pension_plan() - * @generated - * @ordered - */ - protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT = 0.0; - - /** - * The cached value of the '{@link #getMaximum_deductible_amount_for_old_age_pension_plan() Maximum deductible amount for old age pension plan}' attribute. - * - * - * @see #getMaximum_deductible_amount_for_old_age_pension_plan() - * @generated - * @ordered - */ - protected double maximum_deductible_amount_for_old_age_pension_plan = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT; - /** * * @@ -151,75 +88,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_ eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY, oldPrivate_insurance_and_plan_category, private_insurance_and_plan_category)); } - /** - * - * - * @generated - */ - @Override - public double getIncrease_for_life_insurance() { - return increase_for_life_insurance; - } - - /** - * - * - * @generated - */ - @Override - public void setIncrease_for_life_insurance(double newIncrease_for_life_insurance) { - double oldIncrease_for_life_insurance = increase_for_life_insurance; - increase_for_life_insurance = newIncrease_for_life_insurance; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE, oldIncrease_for_life_insurance, increase_for_life_insurance)); - } - - /** - * - * - * @generated - */ - @Override - public double getMaximum_deductible_amount_for_private_insurance() { - return maximum_deductible_amount_for_private_insurance; - } - - /** - * - * - * @generated - */ - @Override - public void setMaximum_deductible_amount_for_private_insurance(double newMaximum_deductible_amount_for_private_insurance) { - double oldMaximum_deductible_amount_for_private_insurance = maximum_deductible_amount_for_private_insurance; - maximum_deductible_amount_for_private_insurance = newMaximum_deductible_amount_for_private_insurance; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE, oldMaximum_deductible_amount_for_private_insurance, maximum_deductible_amount_for_private_insurance)); - } - - /** - * - * - * @generated - */ - @Override - public double getMaximum_deductible_amount_for_old_age_pension_plan() { - return maximum_deductible_amount_for_old_age_pension_plan; - } - - /** - * - * - * @generated - */ - @Override - public void setMaximum_deductible_amount_for_old_age_pension_plan(double newMaximum_deductible_amount_for_old_age_pension_plan) { - double oldMaximum_deductible_amount_for_old_age_pension_plan = maximum_deductible_amount_for_old_age_pension_plan; - maximum_deductible_amount_for_old_age_pension_plan = newMaximum_deductible_amount_for_old_age_pension_plan; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN, oldMaximum_deductible_amount_for_old_age_pension_plan, maximum_deductible_amount_for_old_age_pension_plan)); - } - /** * * @@ -230,12 +98,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_ switch (featureID) { case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: return getPrivate_insurance_and_plan_category(); - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE: - return getIncrease_for_life_insurance(); - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE: - return getMaximum_deductible_amount_for_private_insurance(); - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN: - return getMaximum_deductible_amount_for_old_age_pension_plan(); } return super.eGet(featureID, resolve, coreType); } @@ -251,15 +113,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_ case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: setPrivate_insurance_and_plan_category((Category_of_Private_Insurance_and_Plan)newValue); return; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE: - setIncrease_for_life_insurance((Double)newValue); - return; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE: - setMaximum_deductible_amount_for_private_insurance((Double)newValue); - return; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN: - setMaximum_deductible_amount_for_old_age_pension_plan((Double)newValue); - return; } super.eSet(featureID, newValue); } @@ -275,15 +128,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_ case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: setPrivate_insurance_and_plan_category(PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT); return; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE: - setIncrease_for_life_insurance(INCREASE_FOR_LIFE_INSURANCE_EDEFAULT); - return; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE: - setMaximum_deductible_amount_for_private_insurance(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT); - return; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN: - setMaximum_deductible_amount_for_old_age_pension_plan(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT); - return; } super.eUnset(featureID); } @@ -298,12 +142,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_ switch (featureID) { case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: return private_insurance_and_plan_category != PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE: - return increase_for_life_insurance != INCREASE_FOR_LIFE_INSURANCE_EDEFAULT; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE: - return maximum_deductible_amount_for_private_insurance != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT; - case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN: - return maximum_deductible_amount_for_old_age_pension_plan != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT; } return super.eIsSet(featureID); } @@ -320,12 +158,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_ StringBuilder result = new StringBuilder(super.toString()); result.append(" (private_insurance_and_plan_category: "); result.append(private_insurance_and_plan_category); - result.append(", increase_for_life_insurance: "); - result.append(increase_for_life_insurance); - result.append(", maximum_deductible_amount_for_private_insurance: "); - result.append(maximum_deductible_amount_for_private_insurance); - result.append(", maximum_deductible_amount_for_old_age_pension_plan: "); - result.append(maximum_deductible_amount_for_old_age_pension_plan); result.append(')'); return result.toString(); } diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java index e631901a..2ea09206 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java @@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *

      *
        *
      • {@link Taxation.impl.DonationImpl#getBeneficiary1 Beneficiary1}
        • - *
      • {@link Taxation.impl.DonationImpl#isIs_beneficiary_eligible Is beneficiary eligible}
        • *
      • {@link Taxation.impl.DonationImpl#isIs_donation_reported Is donation reported}
        • *
      * @@ -47,26 +46,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation { */ protected String beneficiary1 = BENEFICIARY1_EDEFAULT; - /** - * The default value of the '{@link #isIs_beneficiary_eligible() Is beneficiary eligible}' attribute. - * - * - * @see #isIs_beneficiary_eligible() - * @generated - * @ordered - */ - protected static final boolean IS_BENEFICIARY_ELIGIBLE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isIs_beneficiary_eligible() Is beneficiary eligible}' attribute. - * - * - * @see #isIs_beneficiary_eligible() - * @generated - * @ordered - */ - protected boolean is_beneficiary_eligible = IS_BENEFICIARY_ELIGIBLE_EDEFAULT; - /** * The default value of the '{@link #isIs_donation_reported() Is donation reported}' attribute. * @@ -129,29 +108,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation { eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DONATION__BENEFICIARY1, oldBeneficiary1, beneficiary1)); } - /** - * - * - * @generated - */ - @Override - public boolean isIs_beneficiary_eligible() { - return is_beneficiary_eligible; - } - - /** - * - * - * @generated - */ - @Override - public void setIs_beneficiary_eligible(boolean newIs_beneficiary_eligible) { - boolean oldIs_beneficiary_eligible = is_beneficiary_eligible; - is_beneficiary_eligible = newIs_beneficiary_eligible; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE, oldIs_beneficiary_eligible, is_beneficiary_eligible)); - } - /** * * @@ -185,8 +141,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation { switch (featureID) { case TaxationPackage.DONATION__BENEFICIARY1: return getBeneficiary1(); - case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE: - return isIs_beneficiary_eligible(); case TaxationPackage.DONATION__IS_DONATION_REPORTED: return isIs_donation_reported(); } @@ -204,9 +158,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation { case TaxationPackage.DONATION__BENEFICIARY1: setBeneficiary1((String)newValue); return; - case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE: - setIs_beneficiary_eligible((Boolean)newValue); - return; case TaxationPackage.DONATION__IS_DONATION_REPORTED: setIs_donation_reported((Boolean)newValue); return; @@ -225,9 +176,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation { case TaxationPackage.DONATION__BENEFICIARY1: setBeneficiary1(BENEFICIARY1_EDEFAULT); return; - case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE: - setIs_beneficiary_eligible(IS_BENEFICIARY_ELIGIBLE_EDEFAULT); - return; case TaxationPackage.DONATION__IS_DONATION_REPORTED: setIs_donation_reported(IS_DONATION_REPORTED_EDEFAULT); return; @@ -245,8 +193,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation { switch (featureID) { case TaxationPackage.DONATION__BENEFICIARY1: return BENEFICIARY1_EDEFAULT == null ? beneficiary1 != null : !BENEFICIARY1_EDEFAULT.equals(beneficiary1); - case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE: - return is_beneficiary_eligible != IS_BENEFICIARY_ELIGIBLE_EDEFAULT; case TaxationPackage.DONATION__IS_DONATION_REPORTED: return is_donation_reported != IS_DONATION_REPORTED_EDEFAULT; } @@ -265,8 +211,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation { StringBuilder result = new StringBuilder(super.toString()); result.append(" (beneficiary1: "); result.append(beneficiary1); - result.append(", is_beneficiary_eligible: "); - result.append(is_beneficiary_eligible); result.append(", is_donation_reported: "); result.append(is_donation_reported); result.append(')'); 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 d73a0014..5a846b56 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 @@ -27,7 +27,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * The following features are implemented: *

      *
        - *
      • {@link Taxation.impl.External_AllowanceImpl#getAmount Amount}
        • *
      • {@link Taxation.impl.External_AllowanceImpl#getGrantor Grantor}
        • *
      • {@link Taxation.impl.External_AllowanceImpl#getStarting_year Starting year}
        • *
      • {@link Taxation.impl.External_AllowanceImpl#getEnding_year Ending year}
        • @@ -39,26 +38,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * @generated */ public class External_AllowanceImpl extends MinimalEObjectImpl.Container implements External_Allowance { - /** - * The default value of the '{@link #getAmount() Amount}' attribute. - * - * - * @see #getAmount() - * @generated - * @ordered - */ - protected static final double AMOUNT_EDEFAULT = 0.0; - - /** - * The cached value of the '{@link #getAmount() Amount}' attribute. - * - * - * @see #getAmount() - * @generated - * @ordered - */ - protected double amount = AMOUNT_EDEFAULT; - /** * The default value of the '{@link #getGrantor() Grantor}' attribute. * @@ -168,29 +147,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme return TaxationPackage.Literals.EXTERNAL_ALLOWANCE; } - /** - * - * - * @generated - */ - @Override - public double getAmount() { - return amount; - } - - /** - * - * - * @generated - */ - @Override - public void setAmount(double newAmount) { - double oldAmount = amount; - amount = newAmount; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT, oldAmount, amount)); - } - /** * * @@ -418,8 +374,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT: - return getAmount(); case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: return getGrantor(); case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR: @@ -445,9 +399,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT: - setAmount((Double)newValue); - return; case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: setGrantor((Grantor)newValue); return; @@ -478,9 +429,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme @Override public void eUnset(int featureID) { switch (featureID) { - case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT: - setAmount(AMOUNT_EDEFAULT); - return; case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: setGrantor(GRANTOR_EDEFAULT); return; @@ -511,8 +459,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme @Override public boolean eIsSet(int featureID) { switch (featureID) { - case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT: - return amount != AMOUNT_EDEFAULT; case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: return grantor != GRANTOR_EDEFAULT; case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR: @@ -539,9 +485,7 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (amount: "); - result.append(amount); - result.append(", grantor: "); + result.append(" (grantor: "); result.append(grantor); result.append(", starting_year: "); result.append(starting_year); diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java index 70b890f3..06e852c4 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java @@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *

        *
          *
        • {@link Taxation.impl.FDImpl#getDistance_declared_in_january Distance declared in january}
          • - *
        • {@link Taxation.impl.FDImpl#getCalculated_distance Calculated distance}
          • *
        * * @generated @@ -46,26 +45,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD { */ protected double distance_declared_in_january = DISTANCE_DECLARED_IN_JANUARY_EDEFAULT; - /** - * The default value of the '{@link #getCalculated_distance() Calculated distance}' attribute. - * - * - * @see #getCalculated_distance() - * @generated - * @ordered - */ - protected static final double CALCULATED_DISTANCE_EDEFAULT = 0.0; - - /** - * The cached value of the '{@link #getCalculated_distance() Calculated distance}' attribute. - * - * - * @see #getCalculated_distance() - * @generated - * @ordered - */ - protected double calculated_distance = CALCULATED_DISTANCE_EDEFAULT; - /** * * @@ -108,29 +87,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD { eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY, oldDistance_declared_in_january, distance_declared_in_january)); } - /** - * - * - * @generated - */ - @Override - public double getCalculated_distance() { - return calculated_distance; - } - - /** - * - * - * @generated - */ - @Override - public void setCalculated_distance(double newCalculated_distance) { - double oldCalculated_distance = calculated_distance; - calculated_distance = newCalculated_distance; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.FD__CALCULATED_DISTANCE, oldCalculated_distance, calculated_distance)); - } - /** * * @@ -141,8 +97,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD { switch (featureID) { case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: return getDistance_declared_in_january(); - case TaxationPackage.FD__CALCULATED_DISTANCE: - return getCalculated_distance(); } return super.eGet(featureID, resolve, coreType); } @@ -158,9 +112,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD { case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: setDistance_declared_in_january((Double)newValue); return; - case TaxationPackage.FD__CALCULATED_DISTANCE: - setCalculated_distance((Double)newValue); - return; } super.eSet(featureID, newValue); } @@ -176,9 +127,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD { case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: setDistance_declared_in_january(DISTANCE_DECLARED_IN_JANUARY_EDEFAULT); return; - case TaxationPackage.FD__CALCULATED_DISTANCE: - setCalculated_distance(CALCULATED_DISTANCE_EDEFAULT); - return; } super.eUnset(featureID); } @@ -193,8 +141,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD { switch (featureID) { case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: return distance_declared_in_january != DISTANCE_DECLARED_IN_JANUARY_EDEFAULT; - case TaxationPackage.FD__CALCULATED_DISTANCE: - return calculated_distance != CALCULATED_DISTANCE_EDEFAULT; } return super.eIsSet(featureID); } @@ -211,8 +157,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD { StringBuilder result = new StringBuilder(super.toString()); result.append(" (distance_declared_in_january: "); result.append(distance_declared_in_january); - result.append(", calculated_distance: "); - result.append(calculated_distance); result.append(')'); return result.toString(); } diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java index d03ee8bc..5ffe9463 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java @@ -4,48 +4,16 @@ package Taxation.impl; import Taxation.FO; import Taxation.TaxationPackage; -import Taxation.Type_of_Rate; - -import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; - /** * * An implementation of the model object 'FO'. * - *

        - * The following features are implemented: - *

        - *
          - *
        • {@link Taxation.impl.FOImpl#getRate_type_for_FO Rate type for FO}
          • - *
        * * @generated */ public class FOImpl extends Professional_Expenses_DeductionImpl implements FO { - /** - * The default value of the '{@link #getRate_type_for_FO() Rate type for FO}' attribute. - * - * - * @see #getRate_type_for_FO() - * @generated - * @ordered - */ - protected static final Type_of_Rate RATE_TYPE_FOR_FO_EDEFAULT = Type_of_Rate.REGULAR; - - /** - * The cached value of the '{@link #getRate_type_for_FO() Rate type for FO}' attribute. - * - * - * @see #getRate_type_for_FO() - * @generated - * @ordered - */ - protected Type_of_Rate rate_type_for_FO = RATE_TYPE_FOR_FO_EDEFAULT; - /** * * @@ -65,101 +33,4 @@ public class FOImpl extends Professional_Expenses_DeductionImpl implements FO { return TaxationPackage.Literals.FO; } - /** - * - * - * @generated - */ - @Override - public Type_of_Rate getRate_type_for_FO() { - return rate_type_for_FO; - } - - /** - * - * - * @generated - */ - @Override - public void setRate_type_for_FO(Type_of_Rate newRate_type_for_FO) { - Type_of_Rate oldRate_type_for_FO = rate_type_for_FO; - rate_type_for_FO = newRate_type_for_FO == null ? RATE_TYPE_FOR_FO_EDEFAULT : newRate_type_for_FO; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.FO__RATE_TYPE_FOR_FO, oldRate_type_for_FO, rate_type_for_FO)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TaxationPackage.FO__RATE_TYPE_FOR_FO: - return getRate_type_for_FO(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TaxationPackage.FO__RATE_TYPE_FOR_FO: - setRate_type_for_FO((Type_of_Rate)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TaxationPackage.FO__RATE_TYPE_FOR_FO: - setRate_type_for_FO(RATE_TYPE_FOR_FO_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TaxationPackage.FO__RATE_TYPE_FOR_FO: - return rate_type_for_FO != RATE_TYPE_FOR_FO_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (rate_type_for_FO: "); - result.append(rate_type_for_FO); - result.append(')'); - return result.toString(); - } - } //FOImpl diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java index 7b2564b2..4a111a01 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java @@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * The following features are implemented: *

        *
          - *
        • {@link Taxation.impl.Income_TypeImpl#isSubjectToWithholdingTax Subject To Withholding Tax}
          • *
        • {@link Taxation.impl.Income_TypeImpl#getId8 Id8}
          • *
        • {@link Taxation.impl.Income_TypeImpl#getIncome Income}
          • *
        @@ -33,26 +32,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * @generated */ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container implements Income_Type { - /** - * The default value of the '{@link #isSubjectToWithholdingTax() Subject To Withholding Tax}' attribute. - * - * - * @see #isSubjectToWithholdingTax() - * @generated - * @ordered - */ - protected static final boolean SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT = false; - - /** - * The cached value of the '{@link #isSubjectToWithholdingTax() Subject To Withholding Tax}' attribute. - * - * - * @see #isSubjectToWithholdingTax() - * @generated - * @ordered - */ - protected boolean subjectToWithholdingTax = SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT; - /** * The default value of the '{@link #getId8() Id8}' attribute. * @@ -92,29 +71,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple return TaxationPackage.Literals.INCOME_TYPE; } - /** - * - * - * @generated - */ - @Override - public boolean isSubjectToWithholdingTax() { - return subjectToWithholdingTax; - } - - /** - * - * - * @generated - */ - @Override - public void setSubjectToWithholdingTax(boolean newSubjectToWithholdingTax) { - boolean oldSubjectToWithholdingTax = subjectToWithholdingTax; - subjectToWithholdingTax = newSubjectToWithholdingTax; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX, oldSubjectToWithholdingTax, subjectToWithholdingTax)); - } - /** * * @@ -233,8 +189,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX: - return isSubjectToWithholdingTax(); case TaxationPackage.INCOME_TYPE__ID8: return getId8(); case TaxationPackage.INCOME_TYPE__INCOME: @@ -251,9 +205,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX: - setSubjectToWithholdingTax((Boolean)newValue); - return; case TaxationPackage.INCOME_TYPE__ID8: setId8((String)newValue); return; @@ -272,9 +223,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple @Override public void eUnset(int featureID) { switch (featureID) { - case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX: - setSubjectToWithholdingTax(SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT); - return; case TaxationPackage.INCOME_TYPE__ID8: setId8(ID8_EDEFAULT); return; @@ -293,8 +241,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple @Override public boolean eIsSet(int featureID) { switch (featureID) { - case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX: - return subjectToWithholdingTax != SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT; case TaxationPackage.INCOME_TYPE__ID8: return ID8_EDEFAULT == null ? id8 != null : !ID8_EDEFAULT.equals(id8); case TaxationPackage.INCOME_TYPE__INCOME: @@ -313,9 +259,7 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (subjectToWithholdingTax: "); - result.append(subjectToWithholdingTax); - result.append(", id8: "); + result.append(" (id8: "); result.append(id8); result.append(')'); return result.toString(); diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java index d43422f8..2f578d2c 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java @@ -4,110 +4,16 @@ package Taxation.impl; import Taxation.Loss_Carryforward; import Taxation.TaxationPackage; - -import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; - /** * * An implementation of the model object 'Loss Carryforward'. * - *

        - * The following features are implemented: - *

        - *
          - *
        • {@link Taxation.impl.Loss_CarryforwardImpl#isRegular_accountability Regular accountability}
          • - *
        • {@link Taxation.impl.Loss_CarryforwardImpl#isCompensation_by_other_means Compensation by other means}
          • - *
        • {@link Taxation.impl.Loss_CarryforwardImpl#isTax_payer_has_inherited_business_ownership Tax payer has inherited business ownership}
          • - *
        • {@link Taxation.impl.Loss_CarryforwardImpl#isTax_payer_has_been_partner_in_business Tax payer has been partner in business}
          • - *
        * * @generated */ public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Loss_Carryforward { - /** - * The default value of the '{@link #isRegular_accountability() Regular accountability}' attribute. - * - * - * @see #isRegular_accountability() - * @generated - * @ordered - */ - protected static final boolean REGULAR_ACCOUNTABILITY_EDEFAULT = false; - - /** - * The cached value of the '{@link #isRegular_accountability() Regular accountability}' attribute. - * - * - * @see #isRegular_accountability() - * @generated - * @ordered - */ - protected boolean regular_accountability = REGULAR_ACCOUNTABILITY_EDEFAULT; - - /** - * The default value of the '{@link #isCompensation_by_other_means() Compensation by other means}' attribute. - * - * - * @see #isCompensation_by_other_means() - * @generated - * @ordered - */ - protected static final boolean COMPENSATION_BY_OTHER_MEANS_EDEFAULT = false; - - /** - * The cached value of the '{@link #isCompensation_by_other_means() Compensation by other means}' attribute. - * - * - * @see #isCompensation_by_other_means() - * @generated - * @ordered - */ - protected boolean compensation_by_other_means = COMPENSATION_BY_OTHER_MEANS_EDEFAULT; - - /** - * The default value of the '{@link #isTax_payer_has_inherited_business_ownership() Tax payer has inherited business ownership}' attribute. - * - * - * @see #isTax_payer_has_inherited_business_ownership() - * @generated - * @ordered - */ - protected static final boolean TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT = false; - - /** - * The cached value of the '{@link #isTax_payer_has_inherited_business_ownership() Tax payer has inherited business ownership}' attribute. - * - * - * @see #isTax_payer_has_inherited_business_ownership() - * @generated - * @ordered - */ - protected boolean tax_payer_has_inherited_business_ownership = TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT; - - /** - * The default value of the '{@link #isTax_payer_has_been_partner_in_business() Tax payer has been partner in business}' attribute. - * - * - * @see #isTax_payer_has_been_partner_in_business() - * @generated - * @ordered - */ - protected static final boolean TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT = true; - - /** - * The cached value of the '{@link #isTax_payer_has_been_partner_in_business() Tax payer has been partner in business}' attribute. - * - * - * @see #isTax_payer_has_been_partner_in_business() - * @generated - * @ordered - */ - protected boolean tax_payer_has_been_partner_in_business = TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT; - /** * * @@ -127,206 +33,4 @@ public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Los return TaxationPackage.Literals.LOSS_CARRYFORWARD; } - /** - * - * - * @generated - */ - @Override - public boolean isRegular_accountability() { - return regular_accountability; - } - - /** - * - * - * @generated - */ - @Override - public void setRegular_accountability(boolean newRegular_accountability) { - boolean oldRegular_accountability = regular_accountability; - regular_accountability = newRegular_accountability; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY, oldRegular_accountability, regular_accountability)); - } - - /** - * - * - * @generated - */ - @Override - public boolean isCompensation_by_other_means() { - return compensation_by_other_means; - } - - /** - * - * - * @generated - */ - @Override - public void setCompensation_by_other_means(boolean newCompensation_by_other_means) { - boolean oldCompensation_by_other_means = compensation_by_other_means; - compensation_by_other_means = newCompensation_by_other_means; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS, oldCompensation_by_other_means, compensation_by_other_means)); - } - - /** - * - * - * @generated - */ - @Override - public boolean isTax_payer_has_inherited_business_ownership() { - return tax_payer_has_inherited_business_ownership; - } - - /** - * - * - * @generated - */ - @Override - public void setTax_payer_has_inherited_business_ownership(boolean newTax_payer_has_inherited_business_ownership) { - boolean oldTax_payer_has_inherited_business_ownership = tax_payer_has_inherited_business_ownership; - tax_payer_has_inherited_business_ownership = newTax_payer_has_inherited_business_ownership; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP, oldTax_payer_has_inherited_business_ownership, tax_payer_has_inherited_business_ownership)); - } - - /** - * - * - * @generated - */ - @Override - public boolean isTax_payer_has_been_partner_in_business() { - return tax_payer_has_been_partner_in_business; - } - - /** - * - * - * @generated - */ - @Override - public void setTax_payer_has_been_partner_in_business(boolean newTax_payer_has_been_partner_in_business) { - boolean oldTax_payer_has_been_partner_in_business = tax_payer_has_been_partner_in_business; - tax_payer_has_been_partner_in_business = newTax_payer_has_been_partner_in_business; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS, oldTax_payer_has_been_partner_in_business, tax_payer_has_been_partner_in_business)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY: - return isRegular_accountability(); - case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS: - return isCompensation_by_other_means(); - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP: - return isTax_payer_has_inherited_business_ownership(); - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS: - return isTax_payer_has_been_partner_in_business(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY: - setRegular_accountability((Boolean)newValue); - return; - case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS: - setCompensation_by_other_means((Boolean)newValue); - return; - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP: - setTax_payer_has_inherited_business_ownership((Boolean)newValue); - return; - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS: - setTax_payer_has_been_partner_in_business((Boolean)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY: - setRegular_accountability(REGULAR_ACCOUNTABILITY_EDEFAULT); - return; - case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS: - setCompensation_by_other_means(COMPENSATION_BY_OTHER_MEANS_EDEFAULT); - return; - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP: - setTax_payer_has_inherited_business_ownership(TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT); - return; - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS: - setTax_payer_has_been_partner_in_business(TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY: - return regular_accountability != REGULAR_ACCOUNTABILITY_EDEFAULT; - case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS: - return compensation_by_other_means != COMPENSATION_BY_OTHER_MEANS_EDEFAULT; - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP: - return tax_payer_has_inherited_business_ownership != TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT; - case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS: - return tax_payer_has_been_partner_in_business != TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT; - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (regular_accountability: "); - result.append(regular_accountability); - result.append(", compensation_by_other_means: "); - result.append(compensation_by_other_means); - result.append(", tax_payer_has_inherited_business_ownership: "); - result.append(tax_payer_has_inherited_business_ownership); - result.append(", tax_payer_has_been_partner_in_business: "); - result.append(tax_payer_has_been_partner_in_business); - result.append(')'); - return result.toString(); - } - } //Loss_CarryforwardImpl diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java index 9473ae17..9d88c2db 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java @@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *

        *
          *
        • {@link Taxation.impl.Permanent_ExpenseImpl#getCategory Category}
          • - *
        • {@link Taxation.impl.Permanent_ExpenseImpl#isIs_eligible_for_deduction Is eligible for deduction}
          • *
        * * @generated @@ -47,26 +46,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per */ protected Category_of_Permanent_Expense category = CATEGORY_EDEFAULT; - /** - * The default value of the '{@link #isIs_eligible_for_deduction() Is eligible for deduction}' attribute. - * - * - * @see #isIs_eligible_for_deduction() - * @generated - * @ordered - */ - protected static final boolean IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT = false; - - /** - * The cached value of the '{@link #isIs_eligible_for_deduction() Is eligible for deduction}' attribute. - * - * - * @see #isIs_eligible_for_deduction() - * @generated - * @ordered - */ - protected boolean is_eligible_for_deduction = IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT; - /** * * @@ -109,29 +88,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PERMANENT_EXPENSE__CATEGORY, oldCategory, category)); } - /** - * - * - * @generated - */ - @Override - public boolean isIs_eligible_for_deduction() { - return is_eligible_for_deduction; - } - - /** - * - * - * @generated - */ - @Override - public void setIs_eligible_for_deduction(boolean newIs_eligible_for_deduction) { - boolean oldIs_eligible_for_deduction = is_eligible_for_deduction; - is_eligible_for_deduction = newIs_eligible_for_deduction; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION, oldIs_eligible_for_deduction, is_eligible_for_deduction)); - } - /** * * @@ -142,8 +98,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per switch (featureID) { case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: return getCategory(); - case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION: - return isIs_eligible_for_deduction(); } return super.eGet(featureID, resolve, coreType); } @@ -159,9 +113,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: setCategory((Category_of_Permanent_Expense)newValue); return; - case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION: - setIs_eligible_for_deduction((Boolean)newValue); - return; } super.eSet(featureID, newValue); } @@ -177,9 +128,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: setCategory(CATEGORY_EDEFAULT); return; - case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION: - setIs_eligible_for_deduction(IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT); - return; } super.eUnset(featureID); } @@ -194,8 +142,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per switch (featureID) { case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: return category != CATEGORY_EDEFAULT; - case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION: - return is_eligible_for_deduction != IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT; } return super.eIsSet(featureID); } @@ -212,8 +158,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per StringBuilder result = new StringBuilder(super.toString()); result.append(" (category: "); result.append(category); - result.append(", is_eligible_for_deduction: "); - result.append(is_eligible_for_deduction); result.append(')'); return result.toString(); } diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java index 13e12888..ab7793f4 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java @@ -32,13 +32,11 @@ import org.eclipse.emf.ecore.util.InternalEList; * The following features are implemented: *

        *
          - *
        • {@link Taxation.impl.Physical_PersonImpl#isIs_assisting_spouse Is assisting spouse}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getSSNo SS No}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getAddresses Addresses}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getBirth_year Birth year}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getDisability_percentage Disability percentage}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getDisability_type Disability type}
          • - *
        • {@link Taxation.impl.Physical_PersonImpl#isIs_affiliated_personnaly_to_social_security Is affiliated personnaly to social security}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getBirth_month Birth month}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getBirth_day Birth day}
          • *
        • {@link Taxation.impl.Physical_PersonImpl#getExpenses Expenses}
          • @@ -48,26 +46,6 @@ import org.eclipse.emf.ecore.util.InternalEList; * @generated */ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements Physical_Person { - /** - * The default value of the '{@link #isIs_assisting_spouse() Is assisting spouse}' attribute. - * - * - * @see #isIs_assisting_spouse() - * @generated - * @ordered - */ - protected static final boolean IS_ASSISTING_SPOUSE_EDEFAULT = false; - - /** - * The cached value of the '{@link #isIs_assisting_spouse() Is assisting spouse}' attribute. - * - * - * @see #isIs_assisting_spouse() - * @generated - * @ordered - */ - protected boolean is_assisting_spouse = IS_ASSISTING_SPOUSE_EDEFAULT; - /** * The default value of the '{@link #getSSNo() SS No}' attribute. * @@ -158,26 +136,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements */ protected Disability_Types disability_type = DISABILITY_TYPE_EDEFAULT; - /** - * The default value of the '{@link #isIs_affiliated_personnaly_to_social_security() Is affiliated personnaly to social security}' attribute. - * - * - * @see #isIs_affiliated_personnaly_to_social_security() - * @generated - * @ordered - */ - protected static final boolean IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT = false; - - /** - * The cached value of the '{@link #isIs_affiliated_personnaly_to_social_security() Is affiliated personnaly to social security}' attribute. - * - * - * @see #isIs_affiliated_personnaly_to_social_security() - * @generated - * @ordered - */ - protected boolean is_affiliated_personnaly_to_social_security = IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT; - /** * The default value of the '{@link #getBirth_month() Birth month}' attribute. * @@ -267,29 +225,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements return TaxationPackage.Literals.PHYSICAL_PERSON; } - /** - * - * - * @generated - */ - @Override - public boolean isIs_assisting_spouse() { - return is_assisting_spouse; - } - - /** - * - * - * @generated - */ - @Override - public void setIs_assisting_spouse(boolean newIs_assisting_spouse) { - boolean oldIs_assisting_spouse = is_assisting_spouse; - is_assisting_spouse = newIs_assisting_spouse; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE, oldIs_assisting_spouse, is_assisting_spouse)); - } - /** * * @@ -395,29 +330,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE, oldDisability_type, disability_type)); } - /** - * - * - * @generated - */ - @Override - public boolean isIs_affiliated_personnaly_to_social_security() { - return is_affiliated_personnaly_to_social_security; - } - - /** - * - * - * @generated - */ - @Override - public void setIs_affiliated_personnaly_to_social_security(boolean newIs_affiliated_personnaly_to_social_security) { - boolean oldIs_affiliated_personnaly_to_social_security = is_affiliated_personnaly_to_social_security; - is_affiliated_personnaly_to_social_security = newIs_affiliated_personnaly_to_social_security; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY, oldIs_affiliated_personnaly_to_social_security, is_affiliated_personnaly_to_social_security)); - } - /** * * @@ -541,8 +453,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE: - return isIs_assisting_spouse(); case TaxationPackage.PHYSICAL_PERSON__SS_NO: return getSSNo(); case TaxationPackage.PHYSICAL_PERSON__ADDRESSES: @@ -553,8 +463,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements return getDisability_percentage(); case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: return getDisability_type(); - case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY: - return isIs_affiliated_personnaly_to_social_security(); case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: return getBirth_month(); case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY: @@ -576,9 +484,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE: - setIs_assisting_spouse((Boolean)newValue); - return; case TaxationPackage.PHYSICAL_PERSON__SS_NO: setSSNo((String)newValue); return; @@ -595,9 +500,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: setDisability_type((Disability_Types)newValue); return; - case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY: - setIs_affiliated_personnaly_to_social_security((Boolean)newValue); - return; case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: setBirth_month((Integer)newValue); return; @@ -623,9 +525,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements @Override public void eUnset(int featureID) { switch (featureID) { - case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE: - setIs_assisting_spouse(IS_ASSISTING_SPOUSE_EDEFAULT); - return; case TaxationPackage.PHYSICAL_PERSON__SS_NO: setSSNo(SS_NO_EDEFAULT); return; @@ -641,9 +540,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: setDisability_type(DISABILITY_TYPE_EDEFAULT); return; - case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY: - setIs_affiliated_personnaly_to_social_security(IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT); - return; case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: setBirth_month(BIRTH_MONTH_EDEFAULT); return; @@ -668,8 +564,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements @Override public boolean eIsSet(int featureID) { switch (featureID) { - case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE: - return is_assisting_spouse != IS_ASSISTING_SPOUSE_EDEFAULT; case TaxationPackage.PHYSICAL_PERSON__SS_NO: return SS_NO_EDEFAULT == null ? ssNo != null : !SS_NO_EDEFAULT.equals(ssNo); case TaxationPackage.PHYSICAL_PERSON__ADDRESSES: @@ -680,8 +574,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements return disability_percentage != DISABILITY_PERCENTAGE_EDEFAULT; case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: return disability_type != DISABILITY_TYPE_EDEFAULT; - case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY: - return is_affiliated_personnaly_to_social_security != IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT; case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: return birth_month != BIRTH_MONTH_EDEFAULT; case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY: @@ -704,9 +596,7 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements if (eIsProxy()) return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (is_assisting_spouse: "); - result.append(is_assisting_spouse); - result.append(", SSNo: "); + result.append(" (SSNo: "); result.append(ssNo); result.append(", birth_year: "); result.append(birth_year); @@ -714,8 +604,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements result.append(disability_percentage); result.append(", disability_type: "); result.append(disability_type); - result.append(", is_affiliated_personnaly_to_social_security: "); - result.append(is_affiliated_personnaly_to_social_security); result.append(", birth_month: "); result.append(birth_month); result.append(", birth_day: "); 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 2b1cd545..0ee24a42 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 @@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *
            *
          • {@link Taxation.impl.Private_Insurance_and_PlanImpl#getCategory Category}
            • *
          • {@link Taxation.impl.Private_Insurance_and_PlanImpl#getDuration_of_contract Duration of contract}
            • - *
          • {@link Taxation.impl.Private_Insurance_and_PlanImpl#isIs_private_insurance_and_plan_eligible_for_deduction Is private insurance and plan eligible for deduction}
            • *
          * * @generated @@ -68,26 +67,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple */ protected int duration_of_contract = DURATION_OF_CONTRACT_EDEFAULT; - /** - * The default value of the '{@link #isIs_private_insurance_and_plan_eligible_for_deduction() Is private insurance and plan eligible for deduction}' attribute. - * - * - * @see #isIs_private_insurance_and_plan_eligible_for_deduction() - * @generated - * @ordered - */ - protected static final boolean IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT = false; - - /** - * The cached value of the '{@link #isIs_private_insurance_and_plan_eligible_for_deduction() Is private insurance and plan eligible for deduction}' attribute. - * - * - * @see #isIs_private_insurance_and_plan_eligible_for_deduction() - * @generated - * @ordered - */ - protected boolean is_private_insurance_and_plan_eligible_for_deduction = IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT; - /** * * @@ -153,29 +132,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT, oldDuration_of_contract, duration_of_contract)); } - /** - * - * - * @generated - */ - @Override - public boolean isIs_private_insurance_and_plan_eligible_for_deduction() { - return is_private_insurance_and_plan_eligible_for_deduction; - } - - /** - * - * - * @generated - */ - @Override - public void setIs_private_insurance_and_plan_eligible_for_deduction(boolean newIs_private_insurance_and_plan_eligible_for_deduction) { - boolean oldIs_private_insurance_and_plan_eligible_for_deduction = is_private_insurance_and_plan_eligible_for_deduction; - is_private_insurance_and_plan_eligible_for_deduction = newIs_private_insurance_and_plan_eligible_for_deduction; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION, oldIs_private_insurance_and_plan_eligible_for_deduction, is_private_insurance_and_plan_eligible_for_deduction)); - } - /** * * @@ -188,8 +144,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple return getCategory(); case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: return getDuration_of_contract(); - case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION: - return isIs_private_insurance_and_plan_eligible_for_deduction(); } return super.eGet(featureID, resolve, coreType); } @@ -208,9 +162,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: setDuration_of_contract((Integer)newValue); return; - case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION: - setIs_private_insurance_and_plan_eligible_for_deduction((Boolean)newValue); - return; } super.eSet(featureID, newValue); } @@ -229,9 +180,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: setDuration_of_contract(DURATION_OF_CONTRACT_EDEFAULT); return; - case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION: - setIs_private_insurance_and_plan_eligible_for_deduction(IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT); - return; } super.eUnset(featureID); } @@ -248,8 +196,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple return category != CATEGORY_EDEFAULT; case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: return duration_of_contract != DURATION_OF_CONTRACT_EDEFAULT; - case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION: - return is_private_insurance_and_plan_eligible_for_deduction != IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT; } return super.eIsSet(featureID); } @@ -268,8 +214,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple result.append(category); result.append(", duration_of_contract: "); result.append(duration_of_contract); - result.append(", is_private_insurance_and_plan_eligible_for_deduction: "); - result.append(is_private_insurance_and_plan_eligible_for_deduction); result.append(')'); return result.toString(); } 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 ebff8555..0bb2e737 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 @@ -7,7 +7,6 @@ import Taxation.Income; import Taxation.Income_Tax_Credit; import Taxation.Job_Activity; import Taxation.Tax_Card; -import Taxation.Tax_Card_Type; import Taxation.Tax_Office; import Taxation.TaxationPackage; import Taxation.Town; @@ -39,7 +38,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#getPercentage_of_witholding Percentage of witholding}
            • *
          • {@link Taxation.impl.Tax_CardImpl#getTax_payers_name_surname Tax payers name surname}
            • @@ -98,26 +96,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca */ protected String card_identifier = CARD_IDENTIFIER_EDEFAULT; - /** - * The default value of the '{@link #getTax_card_type() Tax card type}' attribute. - * - * - * @see #getTax_card_type() - * @generated - * @ordered - */ - protected static final Tax_Card_Type TAX_CARD_TYPE_EDEFAULT = Tax_Card_Type.PRINCIPAL; - - /** - * The cached value of the '{@link #getTax_card_type() Tax card type}' attribute. - * - * - * @see #getTax_card_type() - * @generated - * @ordered - */ - protected Tax_Card_Type tax_card_type = TAX_CARD_TYPE_EDEFAULT; - /** * The default value of the '{@link #getTax_office() Tax office}' attribute. * @@ -740,29 +718,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_CARD__CARD_IDENTIFIER, oldCard_identifier, card_identifier)); } - /** - * - * - * @generated - */ - @Override - public Tax_Card_Type getTax_card_type() { - return tax_card_type; - } - - /** - * - * - * @generated - */ - @Override - public void setTax_card_type(Tax_Card_Type newTax_card_type) { - Tax_Card_Type oldTax_card_type = tax_card_type; - tax_card_type = newTax_card_type == null ? TAX_CARD_TYPE_EDEFAULT : newTax_card_type; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_CARD__TAX_CARD_TYPE, oldTax_card_type, tax_card_type)); - } - /** * * @@ -1678,8 +1633,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca switch (featureID) { case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: return getCard_identifier(); - case TaxationPackage.TAX_CARD__TAX_CARD_TYPE: - return getTax_card_type(); case TaxationPackage.TAX_CARD__TAX_OFFICE: return getTax_office(); case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: @@ -1765,9 +1718,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: setCard_identifier((String)newValue); return; - case TaxationPackage.TAX_CARD__TAX_CARD_TYPE: - setTax_card_type((Tax_Card_Type)newValue); - return; case TaxationPackage.TAX_CARD__TAX_OFFICE: setTax_office((Tax_Office)newValue); return; @@ -1885,9 +1835,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: setCard_identifier(CARD_IDENTIFIER_EDEFAULT); return; - case TaxationPackage.TAX_CARD__TAX_CARD_TYPE: - setTax_card_type(TAX_CARD_TYPE_EDEFAULT); - return; case TaxationPackage.TAX_CARD__TAX_OFFICE: setTax_office(TAX_OFFICE_EDEFAULT); return; @@ -2001,8 +1948,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca switch (featureID) { case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: return CARD_IDENTIFIER_EDEFAULT == null ? card_identifier != null : !CARD_IDENTIFIER_EDEFAULT.equals(card_identifier); - case TaxationPackage.TAX_CARD__TAX_CARD_TYPE: - return tax_card_type != TAX_CARD_TYPE_EDEFAULT; case TaxationPackage.TAX_CARD__TAX_OFFICE: return tax_office != TAX_OFFICE_EDEFAULT; case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: @@ -2085,8 +2030,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca StringBuilder result = new StringBuilder(super.toString()); result.append(" (card_identifier: "); result.append(card_identifier); - result.append(", tax_card_type: "); - result.append(tax_card_type); result.append(", tax_office: "); result.append(tax_office); result.append(", percentage_of_witholding: "); diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java index 7e382d7f..2a4f4422 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java @@ -36,7 +36,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
          • {@link Taxation.impl.Tax_PayerImpl#getFrom_agent From agent}
            • *
          • {@link Taxation.impl.Tax_PayerImpl#getIncomes Incomes}
            • *
          • {@link Taxation.impl.Tax_PayerImpl#getFrom_law From law}
            • - *
          • {@link Taxation.impl.Tax_PayerImpl#getTaxesDue Taxes Due}
            • *
          * * @generated @@ -82,26 +81,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P */ protected FromLaw from_law; - /** - * The default value of the '{@link #getTaxesDue() Taxes Due}' attribute. - * - * - * @see #getTaxesDue() - * @generated - * @ordered - */ - protected static final double TAXES_DUE_EDEFAULT = 0.0; - - /** - * The cached value of the '{@link #getTaxesDue() Taxes Due}' attribute. - * - * - * @see #getTaxesDue() - * @generated - * @ordered - */ - protected double taxesDue = TAXES_DUE_EDEFAULT; - /** * * @@ -237,29 +216,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_PAYER__FROM_LAW, newFrom_law, newFrom_law)); } - /** - * - * - * @generated - */ - @Override - public double getTaxesDue() { - return taxesDue; - } - - /** - * - * - * @generated - */ - @Override - public void setTaxesDue(double newTaxesDue) { - double oldTaxesDue = taxesDue; - taxesDue = newTaxesDue; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_PAYER__TAXES_DUE, oldTaxesDue, taxesDue)); - } - /** * * @@ -321,8 +277,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P return getIncomes(); case TaxationPackage.TAX_PAYER__FROM_LAW: return getFrom_law(); - case TaxationPackage.TAX_PAYER__TAXES_DUE: - return getTaxesDue(); } return super.eGet(featureID, resolve, coreType); } @@ -350,9 +304,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P case TaxationPackage.TAX_PAYER__FROM_LAW: setFrom_law((FromLaw)newValue); return; - case TaxationPackage.TAX_PAYER__TAXES_DUE: - setTaxesDue((Double)newValue); - return; } super.eSet(featureID, newValue); } @@ -377,9 +328,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P case TaxationPackage.TAX_PAYER__FROM_LAW: setFrom_law((FromLaw)null); return; - case TaxationPackage.TAX_PAYER__TAXES_DUE: - setTaxesDue(TAXES_DUE_EDEFAULT); - return; } super.eUnset(featureID); } @@ -400,26 +348,8 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P return incomes != null && !incomes.isEmpty(); case TaxationPackage.TAX_PAYER__FROM_LAW: return from_law != null; - case TaxationPackage.TAX_PAYER__TAXES_DUE: - return taxesDue != TAXES_DUE_EDEFAULT; } return super.eIsSet(featureID); } - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (taxesDue: "); - result.append(taxesDue); - result.append(')'); - return result.toString(); - } - } //Tax_PayerImpl diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java index 36f4493c..7f29a224 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java @@ -128,8 +128,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory return createDisability_TypesFromString(eDataType, initialValue); case TaxationPackage.COUNTRY: return createCountryFromString(eDataType, initialValue); - case TaxationPackage.TAX_CARD_TYPE: - return createTax_Card_TypeFromString(eDataType, initialValue); case TaxationPackage.TAX_OFFICE: return createTax_OfficeFromString(eDataType, initialValue); case TaxationPackage.TAX_CLASS_CATEGORY: @@ -138,8 +136,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory return createJob_ActivityFromString(eDataType, initialValue); case TaxationPackage.TOWN: return createTownFromString(eDataType, initialValue); - case TaxationPackage.TYPE_OF_RATE: - return createType_of_RateFromString(eDataType, initialValue); case TaxationPackage.CE_TYPE: return createCE_TypeFromString(eDataType, initialValue); case TaxationPackage.EXPENSE_PURPOSE: @@ -175,8 +171,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory return convertDisability_TypesToString(eDataType, instanceValue); case TaxationPackage.COUNTRY: return convertCountryToString(eDataType, instanceValue); - case TaxationPackage.TAX_CARD_TYPE: - return convertTax_Card_TypeToString(eDataType, instanceValue); case TaxationPackage.TAX_OFFICE: return convertTax_OfficeToString(eDataType, instanceValue); case TaxationPackage.TAX_CLASS_CATEGORY: @@ -185,8 +179,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory return convertJob_ActivityToString(eDataType, instanceValue); case TaxationPackage.TOWN: return convertTownToString(eDataType, instanceValue); - case TaxationPackage.TYPE_OF_RATE: - return convertType_of_RateToString(eDataType, instanceValue); case TaxationPackage.CE_TYPE: return convertCE_TypeToString(eDataType, instanceValue); case TaxationPackage.EXPENSE_PURPOSE: @@ -840,26 +832,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory return instanceValue == null ? null : instanceValue.toString(); } - /** - * - * - * @generated - */ - public Tax_Card_Type createTax_Card_TypeFromString(EDataType eDataType, String initialValue) { - Tax_Card_Type result = Tax_Card_Type.get(initialValue); - if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - return result; - } - - /** - * - * - * @generated - */ - public String convertTax_Card_TypeToString(EDataType eDataType, Object instanceValue) { - return instanceValue == null ? null : instanceValue.toString(); - } - /** * * @@ -940,26 +912,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory return instanceValue == null ? null : instanceValue.toString(); } - /** - * - * - * @generated - */ - public Type_of_Rate createType_of_RateFromString(EDataType eDataType, String initialValue) { - Type_of_Rate result = Type_of_Rate.get(initialValue); - if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - return result; - } - - /** - * - * - * @generated - */ - public String convertType_of_RateToString(EDataType eDataType, Object instanceValue) { - return instanceValue == null ? null : instanceValue.toString(); - } - /** * * 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 a174a065..56d3b3de 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 @@ -61,7 +61,6 @@ import Taxation.Separation_Causes; import Taxation.Special_Expense_DS; import Taxation.Spousal_Expense_AC; import Taxation.Tax_Card; -import Taxation.Tax_Card_Type; import Taxation.Tax_Case; import Taxation.Tax_Class_Category; import Taxation.Tax_Office; @@ -72,8 +71,6 @@ import Taxation.TaxationPackage; 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; @@ -516,13 +513,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ private EEnum countryEEnum = null; - /** - * - * - * @generated - */ - private EEnum tax_Card_TypeEEnum = null; - /** * * @@ -551,13 +541,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ private EEnum townEEnum = null; - /** - * - * - * @generated - */ - private EEnum type_of_RateEEnum = null; - /** * * @@ -1035,16 +1018,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EReference)tax_PayerEClass.getEStructuralFeatures().get(3); } - /** - * - * - * @generated - */ - @Override - public EAttribute getTax_Payer_TaxesDue() { - return (EAttribute)tax_PayerEClass.getEStructuralFeatures().get(4); - } - /** * * @@ -1055,16 +1028,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return physical_PersonEClass; } - /** - * - * - * @generated - */ - @Override - public EAttribute getPhysical_Person_Is_assisting_spouse() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(0); - } - /** * * @@ -1072,7 +1035,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getPhysical_Person_SSNo() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(1); + return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(0); } /** @@ -1082,7 +1045,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getPhysical_Person_Addresses() { - return (EReference)physical_PersonEClass.getEStructuralFeatures().get(2); + return (EReference)physical_PersonEClass.getEStructuralFeatures().get(1); } /** @@ -1092,7 +1055,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getPhysical_Person_Birth_year() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(3); + return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(2); } /** @@ -1102,7 +1065,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getPhysical_Person_Disability_percentage() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(4); + return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(3); } /** @@ -1112,17 +1075,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getPhysical_Person_Disability_type() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(5); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getPhysical_Person_Is_affiliated_personnaly_to_social_security() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(6); + return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(4); } /** @@ -1132,7 +1085,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getPhysical_Person_Birth_month() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(7); + return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(5); } /** @@ -1142,7 +1095,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getPhysical_Person_Birth_day() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(8); + return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(6); } /** @@ -1152,7 +1105,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getPhysical_Person_Expenses() { - return (EReference)physical_PersonEClass.getEStructuralFeatures().get(9); + return (EReference)physical_PersonEClass.getEStructuralFeatures().get(7); } /** @@ -1162,7 +1115,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getPhysical_Person_Is_widower() { - return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(10); + return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(8); } /** @@ -1405,16 +1358,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return external_AllowanceEClass; } - /** - * - * - * @generated - */ - @Override - public EAttribute getExternal_Allowance_Amount() { - return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(0); - } - /** * * @@ -1422,7 +1365,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getExternal_Allowance_Grantor() { - return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(1); + return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(0); } /** @@ -1432,7 +1375,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getExternal_Allowance_Starting_year() { - return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(2); + return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(1); } /** @@ -1442,7 +1385,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getExternal_Allowance_Ending_year() { - return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(3); + return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(2); } /** @@ -1452,7 +1395,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getExternal_Allowance_Reciver() { - return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(4); + return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(3); } /** @@ -1462,7 +1405,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getExternal_Allowance_Id5() { - return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(5); + return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(4); } /** @@ -1472,7 +1415,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getExternal_Allowance_Person() { - return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(6); + return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(5); } /** @@ -1825,16 +1768,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return income_TypeEClass; } - /** - * - * - * @generated - */ - @Override - public EAttribute getIncome_Type_SubjectToWithholdingTax() { - return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(0); - } - /** * * @@ -1842,7 +1775,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getIncome_Type_Id8() { - return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(1); + return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(0); } /** @@ -1852,7 +1785,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getIncome_Type_Income() { - return (EReference)income_TypeEClass.getEStructuralFeatures().get(2); + return (EReference)income_TypeEClass.getEStructuralFeatures().get(1); } /** @@ -1875,16 +1808,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(0); } - /** - * - * - * @generated - */ - @Override - public EAttribute getTax_Card_Tax_card_type() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(1); - } - /** * * @@ -1892,7 +1815,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Tax_office() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(1); } /** @@ -1902,7 +1825,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Percentage_of_witholding() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2); } /** @@ -1912,7 +1835,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Tax_payers_name_surname() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3); } /** @@ -1922,7 +1845,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Tax_payers_partner_name_surname() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(5); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4); } /** @@ -1932,7 +1855,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Tax_payers_address() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(6); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(5); } /** @@ -1942,7 +1865,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_Employer_SSNo() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(6); } /** @@ -1952,7 +1875,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_employers_name() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7); } /** @@ -1962,7 +1885,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_activity_type() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8); } /** @@ -1972,7 +1895,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Jobs_place_of_work() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9); } /** @@ -1982,7 +1905,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FD_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10); } /** @@ -1992,7 +1915,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FD_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11); } /** @@ -2002,7 +1925,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_AC_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12); } /** @@ -2012,7 +1935,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_AC_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13); } /** @@ -2022,7 +1945,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_AC_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14); } /** @@ -2032,7 +1955,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_CE_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15); } /** @@ -2042,7 +1965,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_CE_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16); } /** @@ -2052,7 +1975,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_CE_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17); } /** @@ -2062,7 +1985,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18); } /** @@ -2072,7 +1995,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19); } /** @@ -2082,7 +2005,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FO_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20); } /** @@ -2092,7 +2015,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FO_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21); } /** @@ -2102,7 +2025,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_FO_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22); } /** @@ -2112,7 +2035,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIS_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23); } /** @@ -2122,7 +2045,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIS_monthly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24); } /** @@ -2132,7 +2055,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIM_daily() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25); } /** @@ -2142,7 +2065,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Validity() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(27); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26); } /** @@ -2152,7 +2075,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Income_Tax_Credit() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(28); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(27); } /** @@ -2162,7 +2085,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Previous() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(29); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(28); } /** @@ -2172,7 +2095,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Current_tax_card() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(30); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(29); } /** @@ -2182,7 +2105,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Credit_CIM_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(30); } /** @@ -2192,7 +2115,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_Alimony_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31); } /** @@ -2202,7 +2125,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getTax_Card_Deduction_DS_Debt_yearly() { - return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(33); + return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32); } /** @@ -2212,7 +2135,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EReference getTax_Card_Income() { - return (EReference)tax_CardEClass.getEStructuralFeatures().get(34); + return (EReference)tax_CardEClass.getEStructuralFeatures().get(33); } /** @@ -2635,16 +2558,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)fdEClass.getEStructuralFeatures().get(0); } - /** - * - * - * @generated - */ - @Override - public EAttribute getFD_Calculated_distance() { - return (EAttribute)fdEClass.getEStructuralFeatures().get(1); - } - /** * * @@ -2665,16 +2578,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return foEClass; } - /** - * - * - * @generated - */ - @Override - public EAttribute getFO_Rate_type_for_FO() { - return (EAttribute)foEClass.getEStructuralFeatures().get(0); - } - /** * * @@ -2775,36 +2678,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(0); } - /** - * - * - * @generated - */ - @Override - public EAttribute getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance() { - return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance() { - return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan() { - return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(3); - } - /** * * @@ -2845,16 +2718,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)permanent_ExpenseEClass.getEStructuralFeatures().get(0); } - /** - * - * - * @generated - */ - @Override - public EAttribute getPermanent_Expense_Is_eligible_for_deduction() { - return (EAttribute)permanent_ExpenseEClass.getEStructuralFeatures().get(1); - } - /** * * @@ -2905,16 +2768,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)private_Insurance_and_PlanEClass.getEStructuralFeatures().get(1); } - /** - * - * - * @generated - */ - @Override - public EAttribute getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction() { - return (EAttribute)private_Insurance_and_PlanEClass.getEStructuralFeatures().get(2); - } - /** * * @@ -2965,16 +2818,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return (EAttribute)donationEClass.getEStructuralFeatures().get(0); } - /** - * - * - * @generated - */ - @Override - public EAttribute getDonation_Is_beneficiary_eligible() { - return (EAttribute)donationEClass.getEStructuralFeatures().get(1); - } - /** * * @@ -2982,7 +2825,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage */ @Override public EAttribute getDonation_Is_donation_reported() { - return (EAttribute)donationEClass.getEStructuralFeatures().get(2); + return (EAttribute)donationEClass.getEStructuralFeatures().get(1); } /** @@ -2995,46 +2838,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return loss_CarryforwardEClass; } - /** - * - * - * @generated - */ - @Override - public EAttribute getLoss_Carryforward_Regular_accountability() { - return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getLoss_Carryforward_Compensation_by_other_means() { - return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getLoss_Carryforward_Tax_payer_has_inherited_business_ownership() { - return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ - @Override - public EAttribute getLoss_Carryforward_Tax_payer_has_been_partner_in_business() { - return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(3); - } - /** * * @@ -3135,16 +2938,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return countryEEnum; } - /** - * - * - * @generated - */ - @Override - public EEnum getTax_Card_Type() { - return tax_Card_TypeEEnum; - } - /** * * @@ -3185,16 +2978,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage return townEEnum; } - /** - * - * - * @generated - */ - @Override - public EEnum getType_of_Rate() { - return type_of_RateEEnum; - } - /** * * @@ -3342,16 +3125,13 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage createEReference(tax_PayerEClass, TAX_PAYER__FROM_AGENT); createEReference(tax_PayerEClass, TAX_PAYER__INCOMES); createEReference(tax_PayerEClass, TAX_PAYER__FROM_LAW); - createEAttribute(tax_PayerEClass, TAX_PAYER__TAXES_DUE); physical_PersonEClass = createEClass(PHYSICAL_PERSON); - createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_ASSISTING_SPOUSE); createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__SS_NO); createEReference(physical_PersonEClass, PHYSICAL_PERSON__ADDRESSES); createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_YEAR); createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_PERCENTAGE); createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_TYPE); - createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY); createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_MONTH); createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_DAY); createEReference(physical_PersonEClass, PHYSICAL_PERSON__EXPENSES); @@ -3384,7 +3164,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage createEReference(dependentEClass, DEPENDENT__EXPENSE); external_AllowanceEClass = createEClass(EXTERNAL_ALLOWANCE); - createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__AMOUNT); createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__GRANTOR); createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__STARTING_YEAR); createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__ENDING_YEAR); @@ -3433,13 +3212,11 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage createEReference(incomeEClass, INCOME__EXPENSES); income_TypeEClass = createEClass(INCOME_TYPE); - createEAttribute(income_TypeEClass, INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX); createEAttribute(income_TypeEClass, INCOME_TYPE__ID8); createEReference(income_TypeEClass, INCOME_TYPE__INCOME); tax_CardEClass = createEClass(TAX_CARD); 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__PERCENTAGE_OF_WITHOLDING); createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_NAME_SURNAME); @@ -3536,12 +3313,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage fdEClass = createEClass(FD); createEAttribute(fdEClass, FD__DISTANCE_DECLARED_IN_JANUARY); - createEAttribute(fdEClass, FD__CALCULATED_DISTANCE); professional_Expenses_DeductionEClass = createEClass(PROFESSIONAL_EXPENSES_DEDUCTION); foEClass = createEClass(FO); - createEAttribute(foEClass, FO__RATE_TYPE_FOR_FO); dS_for_Permanent_ExpenseEClass = createEClass(DS_FOR_PERMANENT_EXPENSE); createEAttribute(dS_for_Permanent_ExpenseEClass, DS_FOR_PERMANENT_EXPENSE__PERMANENT_EXPENSE_CATEGORY); @@ -3557,9 +3332,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage dS_for_Private_Insurance_and_PlanEClass = createEClass(DS_FOR_PRIVATE_INSURANCE_AND_PLAN); createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY); - createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE); - createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE); - createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN); dS_for_Loss_CarryforwardEClass = createEClass(DS_FOR_LOSS_CARRYFORWARD); @@ -3567,7 +3339,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage permanent_ExpenseEClass = createEClass(PERMANENT_EXPENSE); createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__CATEGORY); - createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION); special_Expense_DSEClass = createEClass(SPECIAL_EXPENSE_DS); @@ -3576,7 +3347,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage private_Insurance_and_PlanEClass = createEClass(PRIVATE_INSURANCE_AND_PLAN); createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__CATEGORY); createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT); - createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION); health_and_Pension_InsuranceEClass = createEClass(HEALTH_AND_PENSION_INSURANCE); createEAttribute(health_and_Pension_InsuranceEClass, HEALTH_AND_PENSION_INSURANCE__CATEGORY); @@ -3584,14 +3354,9 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage donationEClass = createEClass(DONATION); createEAttribute(donationEClass, DONATION__BENEFICIARY1); - createEAttribute(donationEClass, DONATION__IS_BENEFICIARY_ELIGIBLE); createEAttribute(donationEClass, DONATION__IS_DONATION_REPORTED); loss_CarryforwardEClass = createEClass(LOSS_CARRYFORWARD); - createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY); - createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS); - createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP); - createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS); spousal_Expense_ACEClass = createEClass(SPOUSAL_EXPENSE_AC); @@ -3609,12 +3374,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage grantorEEnum = createEEnum(GRANTOR); disability_TypesEEnum = createEEnum(DISABILITY_TYPES); countryEEnum = createEEnum(COUNTRY); - tax_Card_TypeEEnum = createEEnum(TAX_CARD_TYPE); tax_OfficeEEnum = createEEnum(TAX_OFFICE); tax_Class_CategoryEEnum = createEEnum(TAX_CLASS_CATEGORY); job_ActivityEEnum = createEEnum(JOB_ACTIVITY); townEEnum = createEEnum(TOWN); - type_of_RateEEnum = createEEnum(TYPE_OF_RATE); cE_TypeEEnum = createEEnum(CE_TYPE); expense_PurposeEEnum = createEEnum(EXPENSE_PURPOSE); dependent_TypeEEnum = createEEnum(DEPENDENT_TYPE); @@ -3734,16 +3497,13 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEReference(getTax_Payer_From_agent(), this.getFromAgent(), this.getFromAgent_TaxPayer(), "from_agent", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTax_Payer_Incomes(), this.getIncome(), this.getIncome_TaxPayer(), "incomes", null, 1, -1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getTax_Payer_From_law(), this.getFromLaw(), this.getFromLaw_TaxPayer(), "from_law", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTax_Payer_TaxesDue(), ecorePackage.getEDouble(), "taxesDue", null, 1, 1, Tax_Payer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(physical_PersonEClass, Physical_Person.class, "Physical_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getPhysical_Person_Is_assisting_spouse(), ecorePackage.getEBoolean(), "is_assisting_spouse", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEAttribute(getPhysical_Person_SSNo(), ecorePackage.getEString(), "SSNo", 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_Addresses(), this.getAddress(), this.getAddress_TaxPayer(), "addresses", 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_Birth_year(), ecorePackage.getEInt(), "birth_year", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getPhysical_Person_Disability_percentage(), ecorePackage.getEDouble(), "disability_percentage", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getPhysical_Person_Disability_type(), this.getDisability_Types(), "disability_type", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); - initEAttribute(getPhysical_Person_Is_affiliated_personnaly_to_social_security(), ecorePackage.getEBoolean(), "is_affiliated_personnaly_to_social_security", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEAttribute(getPhysical_Person_Birth_month(), ecorePackage.getEInt(), "birth_month", null, 1, 1, Physical_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); 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); @@ -3776,7 +3536,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEReference(getDependent_Expense(), this.getExpense(), this.getExpense_Dependent(), "expense", null, 0, -1, Dependent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(external_AllowanceEClass, External_Allowance.class, "External_Allowance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getExternal_Allowance_Amount(), ecorePackage.getEDouble(), "amount", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getExternal_Allowance_Grantor(), this.getGrantor(), "grantor", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getExternal_Allowance_Starting_year(), ecorePackage.getEInt(), "starting_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEAttribute(getExternal_Allowance_Ending_year(), ecorePackage.getEInt(), "ending_year", null, 1, 1, External_Allowance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); @@ -3825,13 +3584,11 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEReference(getIncome_Expenses(), this.getExpense(), this.getExpense_Income(), "expenses", null, 0, -1, Income.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEClass(income_TypeEClass, Income_Type.class, "Income_Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getIncome_Type_SubjectToWithholdingTax(), ecorePackage.getEBoolean(), "subjectToWithholdingTax", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEAttribute(getIncome_Type_Id8(), ecorePackage.getEString(), "id8", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); initEReference(getIncome_Type_Income(), this.getIncome(), this.getIncome_Income_type(), "income", null, 1, 1, Income_Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(tax_CardEClass, Tax_Card.class, "Tax_Card", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 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_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); @@ -3928,12 +3685,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEClass(fdEClass, Taxation.FD.class, "FD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getFD_Distance_declared_in_january(), ecorePackage.getEDouble(), "distance_declared_in_january", null, 1, 1, Taxation.FD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getFD_Calculated_distance(), ecorePackage.getEDouble(), "calculated_distance", null, 1, 1, Taxation.FD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(professional_Expenses_DeductionEClass, Professional_Expenses_Deduction.class, "Professional_Expenses_Deduction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(foEClass, Taxation.FO.class, "FO", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getFO_Rate_type_for_FO(), this.getType_of_Rate(), "rate_type_for_FO", null, 1, 1, Taxation.FO.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(dS_for_Permanent_ExpenseEClass, DS_for_Permanent_Expense.class, "DS_for_Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDS_for_Permanent_Expense_Permanent_expense_category(), this.getCategory_of_Permanent_Expense(), "permanent_expense_category", null, 1, 1, DS_for_Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -3949,9 +3704,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEClass(dS_for_Private_Insurance_and_PlanEClass, DS_for_Private_Insurance_and_Plan.class, "DS_for_Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDS_for_Private_Insurance_and_Plan_Private_insurance_and_plan_category(), this.getCategory_of_Private_Insurance_and_Plan(), "private_insurance_and_plan_category", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance(), ecorePackage.getEDouble(), "increase_for_life_insurance", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance(), ecorePackage.getEDouble(), "maximum_deductible_amount_for_private_insurance", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan(), ecorePackage.getEDouble(), "maximum_deductible_amount_for_old_age_pension_plan", null, 1, 1, DS_for_Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(dS_for_Loss_CarryforwardEClass, DS_for_Loss_Carryforward.class, "DS_for_Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -3959,7 +3711,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEClass(permanent_ExpenseEClass, Permanent_Expense.class, "Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPermanent_Expense_Category(), this.getCategory_of_Permanent_Expense(), "category", null, 1, 1, Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getPermanent_Expense_Is_eligible_for_deduction(), ecorePackage.getEBoolean(), "is_eligible_for_deduction", "false", 1, 1, Permanent_Expense.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(special_Expense_DSEClass, Special_Expense_DS.class, "Special_Expense_DS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -3968,7 +3719,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEClass(private_Insurance_and_PlanEClass, Private_Insurance_and_Plan.class, "Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPrivate_Insurance_and_Plan_Category(), this.getCategory_of_Private_Insurance_and_Plan(), "category", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getPrivate_Insurance_and_Plan_Duration_of_contract(), ecorePackage.getEInt(), "duration_of_contract", null, 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction(), ecorePackage.getEBoolean(), "is_private_insurance_and_plan_eligible_for_deduction", "false", 1, 1, Private_Insurance_and_Plan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(health_and_Pension_InsuranceEClass, Health_and_Pension_Insurance.class, "Health_and_Pension_Insurance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getHealth_and_Pension_Insurance_Category(), this.getCategory_of_Health_and_Pension_Insurances(), "category", null, 1, 1, Health_and_Pension_Insurance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -3976,14 +3726,9 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage initEClass(donationEClass, Donation.class, "Donation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDonation_Beneficiary1(), ecorePackage.getEString(), "beneficiary1", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getDonation_Is_beneficiary_eligible(), ecorePackage.getEBoolean(), "is_beneficiary_eligible", "false", 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEAttribute(getDonation_Is_donation_reported(), ecorePackage.getEBoolean(), "is_donation_reported", null, 1, 1, Donation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(loss_CarryforwardEClass, Loss_Carryforward.class, "Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getLoss_Carryforward_Regular_accountability(), ecorePackage.getEBoolean(), "regular_accountability", null, 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getLoss_Carryforward_Compensation_by_other_means(), ecorePackage.getEBoolean(), "compensation_by_other_means", null, 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getLoss_Carryforward_Tax_payer_has_inherited_business_ownership(), ecorePackage.getEBoolean(), "tax_payer_has_inherited_business_ownership", "false", 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getLoss_Carryforward_Tax_payer_has_been_partner_in_business(), ecorePackage.getEBoolean(), "tax_payer_has_been_partner_in_business", "true", 1, 1, Loss_Carryforward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(spousal_Expense_ACEClass, Spousal_Expense_AC.class, "Spousal_Expense_AC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -4024,10 +3769,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage addEEnumLiteral(countryEEnum, Country.NN); addEEnumLiteral(countryEEnum, Country.OTHER); - initEEnum(tax_Card_TypeEEnum, Tax_Card_Type.class, "Tax_Card_Type"); - addEEnumLiteral(tax_Card_TypeEEnum, Tax_Card_Type.PRINCIPAL); - addEEnumLiteral(tax_Card_TypeEEnum, Tax_Card_Type.ADDITIONAL); - initEEnum(tax_OfficeEEnum, Tax_Office.class, "Tax_Office"); addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_2); addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_3); @@ -4051,10 +3792,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage addEEnumLiteral(townEEnum, Town.TT); addEEnumLiteral(townEEnum, Town.OTHER); - initEEnum(type_of_RateEEnum, Type_of_Rate.class, "Type_of_Rate"); - addEEnumLiteral(type_of_RateEEnum, Type_of_Rate.REGULAR); - addEEnumLiteral(type_of_RateEEnum, Type_of_Rate.REAL_COST); - initEEnum(cE_TypeEEnum, CE_Type.class, "CE_Type"); addEEnumLiteral(cE_TypeEEnum, CE_Type.INALIDITY_AND_INFIRMITY); addEEnumLiteral(cE_TypeEEnum, CE_Type.DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD); @@ -4183,18 +3920,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage new String[] { "derivation", "let non_null_amounts:OrderedSet(Income_Detail)=self.details->select(det:Income_Detail|det.amount>0)->asOrderedSet() in\nnon_null_amounts->collect(amount)->min()" }); - addAnnotation - (getIncome_Type_SubjectToWithholdingTax(), - source, - new String[] { - "derivation", "\n\t\t\t\tself.income.tax_card->notEmpty()\n\t\t\t\t" - }); - addAnnotation - (getTax_Card_Tax_card_type(), - source, - new String[] { - "derivation", "if(self.income.taxPayer.incomes->size()=1) then \nTax_Card_Type::Principal\n\telse\n\t\tlet all_incomes:OrderedSet(Income)=self.income.taxPayer.incomes->select(inc:Income| inc.income_amount= self.income.taxPayer.incomes.income_amount->max())->asOrderedSet() in\n\t\tlet bigest_income:Income= all_incomes->first() in\n\t\t\t if(bigest_income=self.income) then\n\t\t\t \t Tax_Card_Type::Principal\n\t\t\t else\n\t\t\t\t\tTax_Card_Type::Additional\n\t\t\t\tendif\nendif\n\t\t\t\t" - }); } } //TaxationPackageImpl -- cgit v1.2.3-54-g00ecf