aboutsummaryrefslogtreecommitdiffstats
path: root/Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl
diff options
context:
space:
mode:
authorLibravatar ArenBabikian <aren.babikian@mail.mcgill.ca>2020-05-11 10:06:57 -0400
committerLibravatar ArenBabikian <aren.babikian@mail.mcgill.ca>2020-05-11 10:06:57 -0400
commit750b37401bc3eb3e9deb7126d90f871973ba477b (patch)
treeabe90e700f79ae1e126586039bf15d2a51dbb60c /Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl
parentAllow real numbers to be in the solution (diff)
downloadVIATRA-Generator-750b37401bc3eb3e9deb7126d90f871973ba477b.tar.gz
VIATRA-Generator-750b37401bc3eb3e9deb7126d90f871973ba477b.tar.zst
VIATRA-Generator-750b37401bc3eb3e9deb7126d90f871973ba477b.zip
Remove derived features from the PLEDGE MM
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl')
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DS_for_Private_Insurance_and_PlanImpl.java168
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/DonationImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/External_AllowanceImpl.java58
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FDImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/FOImpl.java129
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Income_TypeImpl.java58
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Loss_CarryforwardImpl.java296
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Permanent_ExpenseImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Physical_PersonImpl.java114
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Private_Insurance_and_PlanImpl.java56
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_CardImpl.java57
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/Tax_PayerImpl.java70
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationFactoryImpl.java48
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.model/src/Taxation/impl/TaxationPackageImpl.java377
14 files changed, 54 insertions, 1545 deletions
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;
21 * </p> 21 * </p>
22 * <ul> 22 * <ul>
23 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getPrivate_insurance_and_plan_category <em>Private insurance and plan category</em>}</li> 23 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getPrivate_insurance_and_plan_category <em>Private insurance and plan category</em>}</li>
24 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getIncrease_for_life_insurance <em>Increase for life insurance</em>}</li>
25 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getMaximum_deductible_amount_for_private_insurance <em>Maximum deductible amount for private insurance</em>}</li>
26 * <li>{@link Taxation.impl.DS_for_Private_Insurance_and_PlanImpl#getMaximum_deductible_amount_for_old_age_pension_plan <em>Maximum deductible amount for old age pension plan</em>}</li>
27 * </ul> 24 * </ul>
28 * 25 *
29 * @generated 26 * @generated
@@ -50,66 +47,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
50 protected Category_of_Private_Insurance_and_Plan private_insurance_and_plan_category = PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT; 47 protected Category_of_Private_Insurance_and_Plan private_insurance_and_plan_category = PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT;
51 48
52 /** 49 /**
53 * The default value of the '{@link #getIncrease_for_life_insurance() <em>Increase for life insurance</em>}' attribute.
54 * <!-- begin-user-doc -->
55 * <!-- end-user-doc -->
56 * @see #getIncrease_for_life_insurance()
57 * @generated
58 * @ordered
59 */
60 protected static final double INCREASE_FOR_LIFE_INSURANCE_EDEFAULT = 0.0;
61
62 /**
63 * The cached value of the '{@link #getIncrease_for_life_insurance() <em>Increase for life insurance</em>}' attribute.
64 * <!-- begin-user-doc -->
65 * <!-- end-user-doc -->
66 * @see #getIncrease_for_life_insurance()
67 * @generated
68 * @ordered
69 */
70 protected double increase_for_life_insurance = INCREASE_FOR_LIFE_INSURANCE_EDEFAULT;
71
72 /**
73 * The default value of the '{@link #getMaximum_deductible_amount_for_private_insurance() <em>Maximum deductible amount for private insurance</em>}' attribute.
74 * <!-- begin-user-doc -->
75 * <!-- end-user-doc -->
76 * @see #getMaximum_deductible_amount_for_private_insurance()
77 * @generated
78 * @ordered
79 */
80 protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT = 0.0;
81
82 /**
83 * The cached value of the '{@link #getMaximum_deductible_amount_for_private_insurance() <em>Maximum deductible amount for private insurance</em>}' attribute.
84 * <!-- begin-user-doc -->
85 * <!-- end-user-doc -->
86 * @see #getMaximum_deductible_amount_for_private_insurance()
87 * @generated
88 * @ordered
89 */
90 protected double maximum_deductible_amount_for_private_insurance = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT;
91
92 /**
93 * The default value of the '{@link #getMaximum_deductible_amount_for_old_age_pension_plan() <em>Maximum deductible amount for old age pension plan</em>}' attribute.
94 * <!-- begin-user-doc -->
95 * <!-- end-user-doc -->
96 * @see #getMaximum_deductible_amount_for_old_age_pension_plan()
97 * @generated
98 * @ordered
99 */
100 protected static final double MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT = 0.0;
101
102 /**
103 * The cached value of the '{@link #getMaximum_deductible_amount_for_old_age_pension_plan() <em>Maximum deductible amount for old age pension plan</em>}' attribute.
104 * <!-- begin-user-doc -->
105 * <!-- end-user-doc -->
106 * @see #getMaximum_deductible_amount_for_old_age_pension_plan()
107 * @generated
108 * @ordered
109 */
110 protected double maximum_deductible_amount_for_old_age_pension_plan = MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT;
111
112 /**
113 * <!-- begin-user-doc --> 50 * <!-- begin-user-doc -->
114 * <!-- end-user-doc --> 51 * <!-- end-user-doc -->
115 * @generated 52 * @generated
@@ -157,85 +94,10 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
157 * @generated 94 * @generated
158 */ 95 */
159 @Override 96 @Override
160 public double getIncrease_for_life_insurance() {
161 return increase_for_life_insurance;
162 }
163
164 /**
165 * <!-- begin-user-doc -->
166 * <!-- end-user-doc -->
167 * @generated
168 */
169 @Override
170 public void setIncrease_for_life_insurance(double newIncrease_for_life_insurance) {
171 double oldIncrease_for_life_insurance = increase_for_life_insurance;
172 increase_for_life_insurance = newIncrease_for_life_insurance;
173 if (eNotificationRequired())
174 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));
175 }
176
177 /**
178 * <!-- begin-user-doc -->
179 * <!-- end-user-doc -->
180 * @generated
181 */
182 @Override
183 public double getMaximum_deductible_amount_for_private_insurance() {
184 return maximum_deductible_amount_for_private_insurance;
185 }
186
187 /**
188 * <!-- begin-user-doc -->
189 * <!-- end-user-doc -->
190 * @generated
191 */
192 @Override
193 public void setMaximum_deductible_amount_for_private_insurance(double newMaximum_deductible_amount_for_private_insurance) {
194 double oldMaximum_deductible_amount_for_private_insurance = maximum_deductible_amount_for_private_insurance;
195 maximum_deductible_amount_for_private_insurance = newMaximum_deductible_amount_for_private_insurance;
196 if (eNotificationRequired())
197 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));
198 }
199
200 /**
201 * <!-- begin-user-doc -->
202 * <!-- end-user-doc -->
203 * @generated
204 */
205 @Override
206 public double getMaximum_deductible_amount_for_old_age_pension_plan() {
207 return maximum_deductible_amount_for_old_age_pension_plan;
208 }
209
210 /**
211 * <!-- begin-user-doc -->
212 * <!-- end-user-doc -->
213 * @generated
214 */
215 @Override
216 public void setMaximum_deductible_amount_for_old_age_pension_plan(double newMaximum_deductible_amount_for_old_age_pension_plan) {
217 double oldMaximum_deductible_amount_for_old_age_pension_plan = maximum_deductible_amount_for_old_age_pension_plan;
218 maximum_deductible_amount_for_old_age_pension_plan = newMaximum_deductible_amount_for_old_age_pension_plan;
219 if (eNotificationRequired())
220 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));
221 }
222
223 /**
224 * <!-- begin-user-doc -->
225 * <!-- end-user-doc -->
226 * @generated
227 */
228 @Override
229 public Object eGet(int featureID, boolean resolve, boolean coreType) { 97 public Object eGet(int featureID, boolean resolve, boolean coreType) {
230 switch (featureID) { 98 switch (featureID) {
231 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 99 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
232 return getPrivate_insurance_and_plan_category(); 100 return getPrivate_insurance_and_plan_category();
233 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
234 return getIncrease_for_life_insurance();
235 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
236 return getMaximum_deductible_amount_for_private_insurance();
237 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
238 return getMaximum_deductible_amount_for_old_age_pension_plan();
239 } 101 }
240 return super.eGet(featureID, resolve, coreType); 102 return super.eGet(featureID, resolve, coreType);
241 } 103 }
@@ -251,15 +113,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
251 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 113 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
252 setPrivate_insurance_and_plan_category((Category_of_Private_Insurance_and_Plan)newValue); 114 setPrivate_insurance_and_plan_category((Category_of_Private_Insurance_and_Plan)newValue);
253 return; 115 return;
254 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
255 setIncrease_for_life_insurance((Double)newValue);
256 return;
257 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
258 setMaximum_deductible_amount_for_private_insurance((Double)newValue);
259 return;
260 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
261 setMaximum_deductible_amount_for_old_age_pension_plan((Double)newValue);
262 return;
263 } 116 }
264 super.eSet(featureID, newValue); 117 super.eSet(featureID, newValue);
265 } 118 }
@@ -275,15 +128,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
275 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 128 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
276 setPrivate_insurance_and_plan_category(PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT); 129 setPrivate_insurance_and_plan_category(PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT);
277 return; 130 return;
278 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
279 setIncrease_for_life_insurance(INCREASE_FOR_LIFE_INSURANCE_EDEFAULT);
280 return;
281 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
282 setMaximum_deductible_amount_for_private_insurance(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT);
283 return;
284 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
285 setMaximum_deductible_amount_for_old_age_pension_plan(MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT);
286 return;
287 } 131 }
288 super.eUnset(featureID); 132 super.eUnset(featureID);
289 } 133 }
@@ -298,12 +142,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
298 switch (featureID) { 142 switch (featureID) {
299 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY: 143 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY:
300 return private_insurance_and_plan_category != PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT; 144 return private_insurance_and_plan_category != PRIVATE_INSURANCE_AND_PLAN_CATEGORY_EDEFAULT;
301 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE:
302 return increase_for_life_insurance != INCREASE_FOR_LIFE_INSURANCE_EDEFAULT;
303 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE:
304 return maximum_deductible_amount_for_private_insurance != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE_EDEFAULT;
305 case TaxationPackage.DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN:
306 return maximum_deductible_amount_for_old_age_pension_plan != MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN_EDEFAULT;
307 } 145 }
308 return super.eIsSet(featureID); 146 return super.eIsSet(featureID);
309 } 147 }
@@ -320,12 +158,6 @@ public class DS_for_Private_Insurance_and_PlanImpl extends DSImpl implements DS_
320 StringBuilder result = new StringBuilder(super.toString()); 158 StringBuilder result = new StringBuilder(super.toString());
321 result.append(" (private_insurance_and_plan_category: "); 159 result.append(" (private_insurance_and_plan_category: ");
322 result.append(private_insurance_and_plan_category); 160 result.append(private_insurance_and_plan_category);
323 result.append(", increase_for_life_insurance: ");
324 result.append(increase_for_life_insurance);
325 result.append(", maximum_deductible_amount_for_private_insurance: ");
326 result.append(maximum_deductible_amount_for_private_insurance);
327 result.append(", maximum_deductible_amount_for_old_age_pension_plan: ");
328 result.append(maximum_deductible_amount_for_old_age_pension_plan);
329 result.append(')'); 161 result.append(')');
330 return result.toString(); 162 return result.toString();
331 } 163 }
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;
20 * </p> 20 * </p>
21 * <ul> 21 * <ul>
22 * <li>{@link Taxation.impl.DonationImpl#getBeneficiary1 <em>Beneficiary1</em>}</li> 22 * <li>{@link Taxation.impl.DonationImpl#getBeneficiary1 <em>Beneficiary1</em>}</li>
23 * <li>{@link Taxation.impl.DonationImpl#isIs_beneficiary_eligible <em>Is beneficiary eligible</em>}</li>
24 * <li>{@link Taxation.impl.DonationImpl#isIs_donation_reported <em>Is donation reported</em>}</li> 23 * <li>{@link Taxation.impl.DonationImpl#isIs_donation_reported <em>Is donation reported</em>}</li>
25 * </ul> 24 * </ul>
26 * 25 *
@@ -48,26 +47,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
48 protected String beneficiary1 = BENEFICIARY1_EDEFAULT; 47 protected String beneficiary1 = BENEFICIARY1_EDEFAULT;
49 48
50 /** 49 /**
51 * The default value of the '{@link #isIs_beneficiary_eligible() <em>Is beneficiary eligible</em>}' attribute.
52 * <!-- begin-user-doc -->
53 * <!-- end-user-doc -->
54 * @see #isIs_beneficiary_eligible()
55 * @generated
56 * @ordered
57 */
58 protected static final boolean IS_BENEFICIARY_ELIGIBLE_EDEFAULT = false;
59
60 /**
61 * The cached value of the '{@link #isIs_beneficiary_eligible() <em>Is beneficiary eligible</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @see #isIs_beneficiary_eligible()
65 * @generated
66 * @ordered
67 */
68 protected boolean is_beneficiary_eligible = IS_BENEFICIARY_ELIGIBLE_EDEFAULT;
69
70 /**
71 * The default value of the '{@link #isIs_donation_reported() <em>Is donation reported</em>}' attribute. 50 * The default value of the '{@link #isIs_donation_reported() <em>Is donation reported</em>}' attribute.
72 * <!-- begin-user-doc --> 51 * <!-- begin-user-doc -->
73 * <!-- end-user-doc --> 52 * <!-- end-user-doc -->
@@ -135,29 +114,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
135 * @generated 114 * @generated
136 */ 115 */
137 @Override 116 @Override
138 public boolean isIs_beneficiary_eligible() {
139 return is_beneficiary_eligible;
140 }
141
142 /**
143 * <!-- begin-user-doc -->
144 * <!-- end-user-doc -->
145 * @generated
146 */
147 @Override
148 public void setIs_beneficiary_eligible(boolean newIs_beneficiary_eligible) {
149 boolean oldIs_beneficiary_eligible = is_beneficiary_eligible;
150 is_beneficiary_eligible = newIs_beneficiary_eligible;
151 if (eNotificationRequired())
152 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE, oldIs_beneficiary_eligible, is_beneficiary_eligible));
153 }
154
155 /**
156 * <!-- begin-user-doc -->
157 * <!-- end-user-doc -->
158 * @generated
159 */
160 @Override
161 public boolean isIs_donation_reported() { 117 public boolean isIs_donation_reported() {
162 return is_donation_reported; 118 return is_donation_reported;
163 } 119 }
@@ -185,8 +141,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
185 switch (featureID) { 141 switch (featureID) {
186 case TaxationPackage.DONATION__BENEFICIARY1: 142 case TaxationPackage.DONATION__BENEFICIARY1:
187 return getBeneficiary1(); 143 return getBeneficiary1();
188 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
189 return isIs_beneficiary_eligible();
190 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 144 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
191 return isIs_donation_reported(); 145 return isIs_donation_reported();
192 } 146 }
@@ -204,9 +158,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
204 case TaxationPackage.DONATION__BENEFICIARY1: 158 case TaxationPackage.DONATION__BENEFICIARY1:
205 setBeneficiary1((String)newValue); 159 setBeneficiary1((String)newValue);
206 return; 160 return;
207 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
208 setIs_beneficiary_eligible((Boolean)newValue);
209 return;
210 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 161 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
211 setIs_donation_reported((Boolean)newValue); 162 setIs_donation_reported((Boolean)newValue);
212 return; 163 return;
@@ -225,9 +176,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
225 case TaxationPackage.DONATION__BENEFICIARY1: 176 case TaxationPackage.DONATION__BENEFICIARY1:
226 setBeneficiary1(BENEFICIARY1_EDEFAULT); 177 setBeneficiary1(BENEFICIARY1_EDEFAULT);
227 return; 178 return;
228 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
229 setIs_beneficiary_eligible(IS_BENEFICIARY_ELIGIBLE_EDEFAULT);
230 return;
231 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 179 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
232 setIs_donation_reported(IS_DONATION_REPORTED_EDEFAULT); 180 setIs_donation_reported(IS_DONATION_REPORTED_EDEFAULT);
233 return; 181 return;
@@ -245,8 +193,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
245 switch (featureID) { 193 switch (featureID) {
246 case TaxationPackage.DONATION__BENEFICIARY1: 194 case TaxationPackage.DONATION__BENEFICIARY1:
247 return BENEFICIARY1_EDEFAULT == null ? beneficiary1 != null : !BENEFICIARY1_EDEFAULT.equals(beneficiary1); 195 return BENEFICIARY1_EDEFAULT == null ? beneficiary1 != null : !BENEFICIARY1_EDEFAULT.equals(beneficiary1);
248 case TaxationPackage.DONATION__IS_BENEFICIARY_ELIGIBLE:
249 return is_beneficiary_eligible != IS_BENEFICIARY_ELIGIBLE_EDEFAULT;
250 case TaxationPackage.DONATION__IS_DONATION_REPORTED: 196 case TaxationPackage.DONATION__IS_DONATION_REPORTED:
251 return is_donation_reported != IS_DONATION_REPORTED_EDEFAULT; 197 return is_donation_reported != IS_DONATION_REPORTED_EDEFAULT;
252 } 198 }
@@ -265,8 +211,6 @@ public class DonationImpl extends Special_Expense_DSImpl implements Donation {
265 StringBuilder result = new StringBuilder(super.toString()); 211 StringBuilder result = new StringBuilder(super.toString());
266 result.append(" (beneficiary1: "); 212 result.append(" (beneficiary1: ");
267 result.append(beneficiary1); 213 result.append(beneficiary1);
268 result.append(", is_beneficiary_eligible: ");
269 result.append(is_beneficiary_eligible);
270 result.append(", is_donation_reported: "); 214 result.append(", is_donation_reported: ");
271 result.append(is_donation_reported); 215 result.append(is_donation_reported);
272 result.append(')'); 216 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;
27 * The following features are implemented: 27 * The following features are implemented:
28 * </p> 28 * </p>
29 * <ul> 29 * <ul>
30 * <li>{@link Taxation.impl.External_AllowanceImpl#getAmount <em>Amount</em>}</li>
31 * <li>{@link Taxation.impl.External_AllowanceImpl#getGrantor <em>Grantor</em>}</li> 30 * <li>{@link Taxation.impl.External_AllowanceImpl#getGrantor <em>Grantor</em>}</li>
32 * <li>{@link Taxation.impl.External_AllowanceImpl#getStarting_year <em>Starting year</em>}</li> 31 * <li>{@link Taxation.impl.External_AllowanceImpl#getStarting_year <em>Starting year</em>}</li>
33 * <li>{@link Taxation.impl.External_AllowanceImpl#getEnding_year <em>Ending year</em>}</li> 32 * <li>{@link Taxation.impl.External_AllowanceImpl#getEnding_year <em>Ending year</em>}</li>
@@ -40,26 +39,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
40 */ 39 */
41public class External_AllowanceImpl extends MinimalEObjectImpl.Container implements External_Allowance { 40public class External_AllowanceImpl extends MinimalEObjectImpl.Container implements External_Allowance {
42 /** 41 /**
43 * The default value of the '{@link #getAmount() <em>Amount</em>}' attribute.
44 * <!-- begin-user-doc -->
45 * <!-- end-user-doc -->
46 * @see #getAmount()
47 * @generated
48 * @ordered
49 */
50 protected static final double AMOUNT_EDEFAULT = 0.0;
51
52 /**
53 * The cached value of the '{@link #getAmount() <em>Amount</em>}' attribute.
54 * <!-- begin-user-doc -->
55 * <!-- end-user-doc -->
56 * @see #getAmount()
57 * @generated
58 * @ordered
59 */
60 protected double amount = AMOUNT_EDEFAULT;
61
62 /**
63 * The default value of the '{@link #getGrantor() <em>Grantor</em>}' attribute. 42 * The default value of the '{@link #getGrantor() <em>Grantor</em>}' attribute.
64 * <!-- begin-user-doc --> 43 * <!-- begin-user-doc -->
65 * <!-- end-user-doc --> 44 * <!-- end-user-doc -->
@@ -174,29 +153,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
174 * @generated 153 * @generated
175 */ 154 */
176 @Override 155 @Override
177 public double getAmount() {
178 return amount;
179 }
180
181 /**
182 * <!-- begin-user-doc -->
183 * <!-- end-user-doc -->
184 * @generated
185 */
186 @Override
187 public void setAmount(double newAmount) {
188 double oldAmount = amount;
189 amount = newAmount;
190 if (eNotificationRequired())
191 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT, oldAmount, amount));
192 }
193
194 /**
195 * <!-- begin-user-doc -->
196 * <!-- end-user-doc -->
197 * @generated
198 */
199 @Override
200 public Grantor getGrantor() { 156 public Grantor getGrantor() {
201 return grantor; 157 return grantor;
202 } 158 }
@@ -418,8 +374,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
418 @Override 374 @Override
419 public Object eGet(int featureID, boolean resolve, boolean coreType) { 375 public Object eGet(int featureID, boolean resolve, boolean coreType) {
420 switch (featureID) { 376 switch (featureID) {
421 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
422 return getAmount();
423 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 377 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
424 return getGrantor(); 378 return getGrantor();
425 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR: 379 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
@@ -445,9 +399,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
445 @Override 399 @Override
446 public void eSet(int featureID, Object newValue) { 400 public void eSet(int featureID, Object newValue) {
447 switch (featureID) { 401 switch (featureID) {
448 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
449 setAmount((Double)newValue);
450 return;
451 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 402 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
452 setGrantor((Grantor)newValue); 403 setGrantor((Grantor)newValue);
453 return; 404 return;
@@ -478,9 +429,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
478 @Override 429 @Override
479 public void eUnset(int featureID) { 430 public void eUnset(int featureID) {
480 switch (featureID) { 431 switch (featureID) {
481 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
482 setAmount(AMOUNT_EDEFAULT);
483 return;
484 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 432 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
485 setGrantor(GRANTOR_EDEFAULT); 433 setGrantor(GRANTOR_EDEFAULT);
486 return; 434 return;
@@ -511,8 +459,6 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
511 @Override 459 @Override
512 public boolean eIsSet(int featureID) { 460 public boolean eIsSet(int featureID) {
513 switch (featureID) { 461 switch (featureID) {
514 case TaxationPackage.EXTERNAL_ALLOWANCE__AMOUNT:
515 return amount != AMOUNT_EDEFAULT;
516 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR: 462 case TaxationPackage.EXTERNAL_ALLOWANCE__GRANTOR:
517 return grantor != GRANTOR_EDEFAULT; 463 return grantor != GRANTOR_EDEFAULT;
518 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR: 464 case TaxationPackage.EXTERNAL_ALLOWANCE__STARTING_YEAR:
@@ -539,9 +485,7 @@ public class External_AllowanceImpl extends MinimalEObjectImpl.Container impleme
539 if (eIsProxy()) return super.toString(); 485 if (eIsProxy()) return super.toString();
540 486
541 StringBuilder result = new StringBuilder(super.toString()); 487 StringBuilder result = new StringBuilder(super.toString());
542 result.append(" (amount: "); 488 result.append(" (grantor: ");
543 result.append(amount);
544 result.append(", grantor: ");
545 result.append(grantor); 489 result.append(grantor);
546 result.append(", starting_year: "); 490 result.append(", starting_year: ");
547 result.append(starting_year); 491 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;
20 * </p> 20 * </p>
21 * <ul> 21 * <ul>
22 * <li>{@link Taxation.impl.FDImpl#getDistance_declared_in_january <em>Distance declared in january</em>}</li> 22 * <li>{@link Taxation.impl.FDImpl#getDistance_declared_in_january <em>Distance declared in january</em>}</li>
23 * <li>{@link Taxation.impl.FDImpl#getCalculated_distance <em>Calculated distance</em>}</li>
24 * </ul> 23 * </ul>
25 * 24 *
26 * @generated 25 * @generated
@@ -47,26 +46,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
47 protected double distance_declared_in_january = DISTANCE_DECLARED_IN_JANUARY_EDEFAULT; 46 protected double distance_declared_in_january = DISTANCE_DECLARED_IN_JANUARY_EDEFAULT;
48 47
49 /** 48 /**
50 * The default value of the '{@link #getCalculated_distance() <em>Calculated distance</em>}' attribute.
51 * <!-- begin-user-doc -->
52 * <!-- end-user-doc -->
53 * @see #getCalculated_distance()
54 * @generated
55 * @ordered
56 */
57 protected static final double CALCULATED_DISTANCE_EDEFAULT = 0.0;
58
59 /**
60 * The cached value of the '{@link #getCalculated_distance() <em>Calculated distance</em>}' attribute.
61 * <!-- begin-user-doc -->
62 * <!-- end-user-doc -->
63 * @see #getCalculated_distance()
64 * @generated
65 * @ordered
66 */
67 protected double calculated_distance = CALCULATED_DISTANCE_EDEFAULT;
68
69 /**
70 * <!-- begin-user-doc --> 49 * <!-- begin-user-doc -->
71 * <!-- end-user-doc --> 50 * <!-- end-user-doc -->
72 * @generated 51 * @generated
@@ -114,35 +93,10 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
114 * @generated 93 * @generated
115 */ 94 */
116 @Override 95 @Override
117 public double getCalculated_distance() {
118 return calculated_distance;
119 }
120
121 /**
122 * <!-- begin-user-doc -->
123 * <!-- end-user-doc -->
124 * @generated
125 */
126 @Override
127 public void setCalculated_distance(double newCalculated_distance) {
128 double oldCalculated_distance = calculated_distance;
129 calculated_distance = newCalculated_distance;
130 if (eNotificationRequired())
131 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.FD__CALCULATED_DISTANCE, oldCalculated_distance, calculated_distance));
132 }
133
134 /**
135 * <!-- begin-user-doc -->
136 * <!-- end-user-doc -->
137 * @generated
138 */
139 @Override
140 public Object eGet(int featureID, boolean resolve, boolean coreType) { 96 public Object eGet(int featureID, boolean resolve, boolean coreType) {
141 switch (featureID) { 97 switch (featureID) {
142 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 98 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
143 return getDistance_declared_in_january(); 99 return getDistance_declared_in_january();
144 case TaxationPackage.FD__CALCULATED_DISTANCE:
145 return getCalculated_distance();
146 } 100 }
147 return super.eGet(featureID, resolve, coreType); 101 return super.eGet(featureID, resolve, coreType);
148 } 102 }
@@ -158,9 +112,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
158 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 112 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
159 setDistance_declared_in_january((Double)newValue); 113 setDistance_declared_in_january((Double)newValue);
160 return; 114 return;
161 case TaxationPackage.FD__CALCULATED_DISTANCE:
162 setCalculated_distance((Double)newValue);
163 return;
164 } 115 }
165 super.eSet(featureID, newValue); 116 super.eSet(featureID, newValue);
166 } 117 }
@@ -176,9 +127,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
176 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 127 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
177 setDistance_declared_in_january(DISTANCE_DECLARED_IN_JANUARY_EDEFAULT); 128 setDistance_declared_in_january(DISTANCE_DECLARED_IN_JANUARY_EDEFAULT);
178 return; 129 return;
179 case TaxationPackage.FD__CALCULATED_DISTANCE:
180 setCalculated_distance(CALCULATED_DISTANCE_EDEFAULT);
181 return;
182 } 130 }
183 super.eUnset(featureID); 131 super.eUnset(featureID);
184 } 132 }
@@ -193,8 +141,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
193 switch (featureID) { 141 switch (featureID) {
194 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY: 142 case TaxationPackage.FD__DISTANCE_DECLARED_IN_JANUARY:
195 return distance_declared_in_january != DISTANCE_DECLARED_IN_JANUARY_EDEFAULT; 143 return distance_declared_in_january != DISTANCE_DECLARED_IN_JANUARY_EDEFAULT;
196 case TaxationPackage.FD__CALCULATED_DISTANCE:
197 return calculated_distance != CALCULATED_DISTANCE_EDEFAULT;
198 } 144 }
199 return super.eIsSet(featureID); 145 return super.eIsSet(featureID);
200 } 146 }
@@ -211,8 +157,6 @@ public class FDImpl extends Professional_Expenses_DeductionImpl implements FD {
211 StringBuilder result = new StringBuilder(super.toString()); 157 StringBuilder result = new StringBuilder(super.toString());
212 result.append(" (distance_declared_in_january: "); 158 result.append(" (distance_declared_in_january: ");
213 result.append(distance_declared_in_january); 159 result.append(distance_declared_in_january);
214 result.append(", calculated_distance: ");
215 result.append(calculated_distance);
216 result.append(')'); 160 result.append(')');
217 return result.toString(); 161 return result.toString();
218 } 162 }
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,49 +4,17 @@ package Taxation.impl;
4 4
5import Taxation.FO; 5import Taxation.FO;
6import Taxation.TaxationPackage; 6import Taxation.TaxationPackage;
7import Taxation.Type_of_Rate;
8
9import org.eclipse.emf.common.notify.Notification;
10
11import org.eclipse.emf.ecore.EClass; 7import org.eclipse.emf.ecore.EClass;
12 8
13import org.eclipse.emf.ecore.impl.ENotificationImpl;
14
15/** 9/**
16 * <!-- begin-user-doc --> 10 * <!-- begin-user-doc -->
17 * An implementation of the model object '<em><b>FO</b></em>'. 11 * An implementation of the model object '<em><b>FO</b></em>'.
18 * <!-- end-user-doc --> 12 * <!-- end-user-doc -->
19 * <p>
20 * The following features are implemented:
21 * </p>
22 * <ul>
23 * <li>{@link Taxation.impl.FOImpl#getRate_type_for_FO <em>Rate type for FO</em>}</li>
24 * </ul>
25 * 13 *
26 * @generated 14 * @generated
27 */ 15 */
28public class FOImpl extends Professional_Expenses_DeductionImpl implements FO { 16public class FOImpl extends Professional_Expenses_DeductionImpl implements FO {
29 /** 17 /**
30 * The default value of the '{@link #getRate_type_for_FO() <em>Rate type for FO</em>}' attribute.
31 * <!-- begin-user-doc -->
32 * <!-- end-user-doc -->
33 * @see #getRate_type_for_FO()
34 * @generated
35 * @ordered
36 */
37 protected static final Type_of_Rate RATE_TYPE_FOR_FO_EDEFAULT = Type_of_Rate.REGULAR;
38
39 /**
40 * The cached value of the '{@link #getRate_type_for_FO() <em>Rate type for FO</em>}' attribute.
41 * <!-- begin-user-doc -->
42 * <!-- end-user-doc -->
43 * @see #getRate_type_for_FO()
44 * @generated
45 * @ordered
46 */
47 protected Type_of_Rate rate_type_for_FO = RATE_TYPE_FOR_FO_EDEFAULT;
48
49 /**
50 * <!-- begin-user-doc --> 18 * <!-- begin-user-doc -->
51 * <!-- end-user-doc --> 19 * <!-- end-user-doc -->
52 * @generated 20 * @generated
@@ -65,101 +33,4 @@ public class FOImpl extends Professional_Expenses_DeductionImpl implements FO {
65 return TaxationPackage.Literals.FO; 33 return TaxationPackage.Literals.FO;
66 } 34 }
67 35
68 /**
69 * <!-- begin-user-doc -->
70 * <!-- end-user-doc -->
71 * @generated
72 */
73 @Override
74 public Type_of_Rate getRate_type_for_FO() {
75 return rate_type_for_FO;
76 }
77
78 /**
79 * <!-- begin-user-doc -->
80 * <!-- end-user-doc -->
81 * @generated
82 */
83 @Override
84 public void setRate_type_for_FO(Type_of_Rate newRate_type_for_FO) {
85 Type_of_Rate oldRate_type_for_FO = rate_type_for_FO;
86 rate_type_for_FO = newRate_type_for_FO == null ? RATE_TYPE_FOR_FO_EDEFAULT : newRate_type_for_FO;
87 if (eNotificationRequired())
88 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.FO__RATE_TYPE_FOR_FO, oldRate_type_for_FO, rate_type_for_FO));
89 }
90
91 /**
92 * <!-- begin-user-doc -->
93 * <!-- end-user-doc -->
94 * @generated
95 */
96 @Override
97 public Object eGet(int featureID, boolean resolve, boolean coreType) {
98 switch (featureID) {
99 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
100 return getRate_type_for_FO();
101 }
102 return super.eGet(featureID, resolve, coreType);
103 }
104
105 /**
106 * <!-- begin-user-doc -->
107 * <!-- end-user-doc -->
108 * @generated
109 */
110 @Override
111 public void eSet(int featureID, Object newValue) {
112 switch (featureID) {
113 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
114 setRate_type_for_FO((Type_of_Rate)newValue);
115 return;
116 }
117 super.eSet(featureID, newValue);
118 }
119
120 /**
121 * <!-- begin-user-doc -->
122 * <!-- end-user-doc -->
123 * @generated
124 */
125 @Override
126 public void eUnset(int featureID) {
127 switch (featureID) {
128 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
129 setRate_type_for_FO(RATE_TYPE_FOR_FO_EDEFAULT);
130 return;
131 }
132 super.eUnset(featureID);
133 }
134
135 /**
136 * <!-- begin-user-doc -->
137 * <!-- end-user-doc -->
138 * @generated
139 */
140 @Override
141 public boolean eIsSet(int featureID) {
142 switch (featureID) {
143 case TaxationPackage.FO__RATE_TYPE_FOR_FO:
144 return rate_type_for_FO != RATE_TYPE_FOR_FO_EDEFAULT;
145 }
146 return super.eIsSet(featureID);
147 }
148
149 /**
150 * <!-- begin-user-doc -->
151 * <!-- end-user-doc -->
152 * @generated
153 */
154 @Override
155 public String toString() {
156 if (eIsProxy()) return super.toString();
157
158 StringBuilder result = new StringBuilder(super.toString());
159 result.append(" (rate_type_for_FO: ");
160 result.append(rate_type_for_FO);
161 result.append(')');
162 return result.toString();
163 }
164
165} //FOImpl 36} //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;
25 * The following features are implemented: 25 * The following features are implemented:
26 * </p> 26 * </p>
27 * <ul> 27 * <ul>
28 * <li>{@link Taxation.impl.Income_TypeImpl#isSubjectToWithholdingTax <em>Subject To Withholding Tax</em>}</li>
29 * <li>{@link Taxation.impl.Income_TypeImpl#getId8 <em>Id8</em>}</li> 28 * <li>{@link Taxation.impl.Income_TypeImpl#getId8 <em>Id8</em>}</li>
30 * <li>{@link Taxation.impl.Income_TypeImpl#getIncome <em>Income</em>}</li> 29 * <li>{@link Taxation.impl.Income_TypeImpl#getIncome <em>Income</em>}</li>
31 * </ul> 30 * </ul>
@@ -34,26 +33,6 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
34 */ 33 */
35public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container implements Income_Type { 34public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container implements Income_Type {
36 /** 35 /**
37 * The default value of the '{@link #isSubjectToWithholdingTax() <em>Subject To Withholding Tax</em>}' attribute.
38 * <!-- begin-user-doc -->
39 * <!-- end-user-doc -->
40 * @see #isSubjectToWithholdingTax()
41 * @generated
42 * @ordered
43 */
44 protected static final boolean SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT = false;
45
46 /**
47 * The cached value of the '{@link #isSubjectToWithholdingTax() <em>Subject To Withholding Tax</em>}' attribute.
48 * <!-- begin-user-doc -->
49 * <!-- end-user-doc -->
50 * @see #isSubjectToWithholdingTax()
51 * @generated
52 * @ordered
53 */
54 protected boolean subjectToWithholdingTax = SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT;
55
56 /**
57 * The default value of the '{@link #getId8() <em>Id8</em>}' attribute. 36 * The default value of the '{@link #getId8() <em>Id8</em>}' attribute.
58 * <!-- begin-user-doc --> 37 * <!-- begin-user-doc -->
59 * <!-- end-user-doc --> 38 * <!-- end-user-doc -->
@@ -98,29 +77,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
98 * @generated 77 * @generated
99 */ 78 */
100 @Override 79 @Override
101 public boolean isSubjectToWithholdingTax() {
102 return subjectToWithholdingTax;
103 }
104
105 /**
106 * <!-- begin-user-doc -->
107 * <!-- end-user-doc -->
108 * @generated
109 */
110 @Override
111 public void setSubjectToWithholdingTax(boolean newSubjectToWithholdingTax) {
112 boolean oldSubjectToWithholdingTax = subjectToWithholdingTax;
113 subjectToWithholdingTax = newSubjectToWithholdingTax;
114 if (eNotificationRequired())
115 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX, oldSubjectToWithholdingTax, subjectToWithholdingTax));
116 }
117
118 /**
119 * <!-- begin-user-doc -->
120 * <!-- end-user-doc -->
121 * @generated
122 */
123 @Override
124 public String getId8() { 80 public String getId8() {
125 return id8; 81 return id8;
126 } 82 }
@@ -233,8 +189,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
233 @Override 189 @Override
234 public Object eGet(int featureID, boolean resolve, boolean coreType) { 190 public Object eGet(int featureID, boolean resolve, boolean coreType) {
235 switch (featureID) { 191 switch (featureID) {
236 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
237 return isSubjectToWithholdingTax();
238 case TaxationPackage.INCOME_TYPE__ID8: 192 case TaxationPackage.INCOME_TYPE__ID8:
239 return getId8(); 193 return getId8();
240 case TaxationPackage.INCOME_TYPE__INCOME: 194 case TaxationPackage.INCOME_TYPE__INCOME:
@@ -251,9 +205,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
251 @Override 205 @Override
252 public void eSet(int featureID, Object newValue) { 206 public void eSet(int featureID, Object newValue) {
253 switch (featureID) { 207 switch (featureID) {
254 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
255 setSubjectToWithholdingTax((Boolean)newValue);
256 return;
257 case TaxationPackage.INCOME_TYPE__ID8: 208 case TaxationPackage.INCOME_TYPE__ID8:
258 setId8((String)newValue); 209 setId8((String)newValue);
259 return; 210 return;
@@ -272,9 +223,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
272 @Override 223 @Override
273 public void eUnset(int featureID) { 224 public void eUnset(int featureID) {
274 switch (featureID) { 225 switch (featureID) {
275 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
276 setSubjectToWithholdingTax(SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT);
277 return;
278 case TaxationPackage.INCOME_TYPE__ID8: 226 case TaxationPackage.INCOME_TYPE__ID8:
279 setId8(ID8_EDEFAULT); 227 setId8(ID8_EDEFAULT);
280 return; 228 return;
@@ -293,8 +241,6 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
293 @Override 241 @Override
294 public boolean eIsSet(int featureID) { 242 public boolean eIsSet(int featureID) {
295 switch (featureID) { 243 switch (featureID) {
296 case TaxationPackage.INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX:
297 return subjectToWithholdingTax != SUBJECT_TO_WITHHOLDING_TAX_EDEFAULT;
298 case TaxationPackage.INCOME_TYPE__ID8: 244 case TaxationPackage.INCOME_TYPE__ID8:
299 return ID8_EDEFAULT == null ? id8 != null : !ID8_EDEFAULT.equals(id8); 245 return ID8_EDEFAULT == null ? id8 != null : !ID8_EDEFAULT.equals(id8);
300 case TaxationPackage.INCOME_TYPE__INCOME: 246 case TaxationPackage.INCOME_TYPE__INCOME:
@@ -313,9 +259,7 @@ public abstract class Income_TypeImpl extends MinimalEObjectImpl.Container imple
313 if (eIsProxy()) return super.toString(); 259 if (eIsProxy()) return super.toString();
314 260
315 StringBuilder result = new StringBuilder(super.toString()); 261 StringBuilder result = new StringBuilder(super.toString());
316 result.append(" (subjectToWithholdingTax: "); 262 result.append(" (id8: ");
317 result.append(subjectToWithholdingTax);
318 result.append(", id8: ");
319 result.append(id8); 263 result.append(id8);
320 result.append(')'); 264 result.append(')');
321 return result.toString(); 265 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,111 +4,17 @@ package Taxation.impl;
4 4
5import Taxation.Loss_Carryforward; 5import Taxation.Loss_Carryforward;
6import Taxation.TaxationPackage; 6import Taxation.TaxationPackage;
7
8import org.eclipse.emf.common.notify.Notification;
9
10import org.eclipse.emf.ecore.EClass; 7import org.eclipse.emf.ecore.EClass;
11 8
12import org.eclipse.emf.ecore.impl.ENotificationImpl;
13
14/** 9/**
15 * <!-- begin-user-doc --> 10 * <!-- begin-user-doc -->
16 * An implementation of the model object '<em><b>Loss Carryforward</b></em>'. 11 * An implementation of the model object '<em><b>Loss Carryforward</b></em>'.
17 * <!-- end-user-doc --> 12 * <!-- end-user-doc -->
18 * <p>
19 * The following features are implemented:
20 * </p>
21 * <ul>
22 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isRegular_accountability <em>Regular accountability</em>}</li>
23 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isCompensation_by_other_means <em>Compensation by other means</em>}</li>
24 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isTax_payer_has_inherited_business_ownership <em>Tax payer has inherited business ownership</em>}</li>
25 * <li>{@link Taxation.impl.Loss_CarryforwardImpl#isTax_payer_has_been_partner_in_business <em>Tax payer has been partner in business</em>}</li>
26 * </ul>
27 * 13 *
28 * @generated 14 * @generated
29 */ 15 */
30public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Loss_Carryforward { 16public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Loss_Carryforward {
31 /** 17 /**
32 * The default value of the '{@link #isRegular_accountability() <em>Regular accountability</em>}' attribute.
33 * <!-- begin-user-doc -->
34 * <!-- end-user-doc -->
35 * @see #isRegular_accountability()
36 * @generated
37 * @ordered
38 */
39 protected static final boolean REGULAR_ACCOUNTABILITY_EDEFAULT = false;
40
41 /**
42 * The cached value of the '{@link #isRegular_accountability() <em>Regular accountability</em>}' attribute.
43 * <!-- begin-user-doc -->
44 * <!-- end-user-doc -->
45 * @see #isRegular_accountability()
46 * @generated
47 * @ordered
48 */
49 protected boolean regular_accountability = REGULAR_ACCOUNTABILITY_EDEFAULT;
50
51 /**
52 * The default value of the '{@link #isCompensation_by_other_means() <em>Compensation by other means</em>}' attribute.
53 * <!-- begin-user-doc -->
54 * <!-- end-user-doc -->
55 * @see #isCompensation_by_other_means()
56 * @generated
57 * @ordered
58 */
59 protected static final boolean COMPENSATION_BY_OTHER_MEANS_EDEFAULT = false;
60
61 /**
62 * The cached value of the '{@link #isCompensation_by_other_means() <em>Compensation by other means</em>}' attribute.
63 * <!-- begin-user-doc -->
64 * <!-- end-user-doc -->
65 * @see #isCompensation_by_other_means()
66 * @generated
67 * @ordered
68 */
69 protected boolean compensation_by_other_means = COMPENSATION_BY_OTHER_MEANS_EDEFAULT;
70
71 /**
72 * The default value of the '{@link #isTax_payer_has_inherited_business_ownership() <em>Tax payer has inherited business ownership</em>}' attribute.
73 * <!-- begin-user-doc -->
74 * <!-- end-user-doc -->
75 * @see #isTax_payer_has_inherited_business_ownership()
76 * @generated
77 * @ordered
78 */
79 protected static final boolean TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT = false;
80
81 /**
82 * The cached value of the '{@link #isTax_payer_has_inherited_business_ownership() <em>Tax payer has inherited business ownership</em>}' attribute.
83 * <!-- begin-user-doc -->
84 * <!-- end-user-doc -->
85 * @see #isTax_payer_has_inherited_business_ownership()
86 * @generated
87 * @ordered
88 */
89 protected boolean tax_payer_has_inherited_business_ownership = TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT;
90
91 /**
92 * The default value of the '{@link #isTax_payer_has_been_partner_in_business() <em>Tax payer has been partner in business</em>}' attribute.
93 * <!-- begin-user-doc -->
94 * <!-- end-user-doc -->
95 * @see #isTax_payer_has_been_partner_in_business()
96 * @generated
97 * @ordered
98 */
99 protected static final boolean TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT = true;
100
101 /**
102 * The cached value of the '{@link #isTax_payer_has_been_partner_in_business() <em>Tax payer has been partner in business</em>}' attribute.
103 * <!-- begin-user-doc -->
104 * <!-- end-user-doc -->
105 * @see #isTax_payer_has_been_partner_in_business()
106 * @generated
107 * @ordered
108 */
109 protected boolean tax_payer_has_been_partner_in_business = TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT;
110
111 /**
112 * <!-- begin-user-doc --> 18 * <!-- begin-user-doc -->
113 * <!-- end-user-doc --> 19 * <!-- end-user-doc -->
114 * @generated 20 * @generated
@@ -127,206 +33,4 @@ public class Loss_CarryforwardImpl extends Special_Expense_DSImpl implements Los
127 return TaxationPackage.Literals.LOSS_CARRYFORWARD; 33 return TaxationPackage.Literals.LOSS_CARRYFORWARD;
128 } 34 }
129 35
130 /**
131 * <!-- begin-user-doc -->
132 * <!-- end-user-doc -->
133 * @generated
134 */
135 @Override
136 public boolean isRegular_accountability() {
137 return regular_accountability;
138 }
139
140 /**
141 * <!-- begin-user-doc -->
142 * <!-- end-user-doc -->
143 * @generated
144 */
145 @Override
146 public void setRegular_accountability(boolean newRegular_accountability) {
147 boolean oldRegular_accountability = regular_accountability;
148 regular_accountability = newRegular_accountability;
149 if (eNotificationRequired())
150 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY, oldRegular_accountability, regular_accountability));
151 }
152
153 /**
154 * <!-- begin-user-doc -->
155 * <!-- end-user-doc -->
156 * @generated
157 */
158 @Override
159 public boolean isCompensation_by_other_means() {
160 return compensation_by_other_means;
161 }
162
163 /**
164 * <!-- begin-user-doc -->
165 * <!-- end-user-doc -->
166 * @generated
167 */
168 @Override
169 public void setCompensation_by_other_means(boolean newCompensation_by_other_means) {
170 boolean oldCompensation_by_other_means = compensation_by_other_means;
171 compensation_by_other_means = newCompensation_by_other_means;
172 if (eNotificationRequired())
173 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS, oldCompensation_by_other_means, compensation_by_other_means));
174 }
175
176 /**
177 * <!-- begin-user-doc -->
178 * <!-- end-user-doc -->
179 * @generated
180 */
181 @Override
182 public boolean isTax_payer_has_inherited_business_ownership() {
183 return tax_payer_has_inherited_business_ownership;
184 }
185
186 /**
187 * <!-- begin-user-doc -->
188 * <!-- end-user-doc -->
189 * @generated
190 */
191 @Override
192 public void setTax_payer_has_inherited_business_ownership(boolean newTax_payer_has_inherited_business_ownership) {
193 boolean oldTax_payer_has_inherited_business_ownership = tax_payer_has_inherited_business_ownership;
194 tax_payer_has_inherited_business_ownership = newTax_payer_has_inherited_business_ownership;
195 if (eNotificationRequired())
196 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));
197 }
198
199 /**
200 * <!-- begin-user-doc -->
201 * <!-- end-user-doc -->
202 * @generated
203 */
204 @Override
205 public boolean isTax_payer_has_been_partner_in_business() {
206 return tax_payer_has_been_partner_in_business;
207 }
208
209 /**
210 * <!-- begin-user-doc -->
211 * <!-- end-user-doc -->
212 * @generated
213 */
214 @Override
215 public void setTax_payer_has_been_partner_in_business(boolean newTax_payer_has_been_partner_in_business) {
216 boolean oldTax_payer_has_been_partner_in_business = tax_payer_has_been_partner_in_business;
217 tax_payer_has_been_partner_in_business = newTax_payer_has_been_partner_in_business;
218 if (eNotificationRequired())
219 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));
220 }
221
222 /**
223 * <!-- begin-user-doc -->
224 * <!-- end-user-doc -->
225 * @generated
226 */
227 @Override
228 public Object eGet(int featureID, boolean resolve, boolean coreType) {
229 switch (featureID) {
230 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
231 return isRegular_accountability();
232 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
233 return isCompensation_by_other_means();
234 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
235 return isTax_payer_has_inherited_business_ownership();
236 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
237 return isTax_payer_has_been_partner_in_business();
238 }
239 return super.eGet(featureID, resolve, coreType);
240 }
241
242 /**
243 * <!-- begin-user-doc -->
244 * <!-- end-user-doc -->
245 * @generated
246 */
247 @Override
248 public void eSet(int featureID, Object newValue) {
249 switch (featureID) {
250 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
251 setRegular_accountability((Boolean)newValue);
252 return;
253 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
254 setCompensation_by_other_means((Boolean)newValue);
255 return;
256 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
257 setTax_payer_has_inherited_business_ownership((Boolean)newValue);
258 return;
259 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
260 setTax_payer_has_been_partner_in_business((Boolean)newValue);
261 return;
262 }
263 super.eSet(featureID, newValue);
264 }
265
266 /**
267 * <!-- begin-user-doc -->
268 * <!-- end-user-doc -->
269 * @generated
270 */
271 @Override
272 public void eUnset(int featureID) {
273 switch (featureID) {
274 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
275 setRegular_accountability(REGULAR_ACCOUNTABILITY_EDEFAULT);
276 return;
277 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
278 setCompensation_by_other_means(COMPENSATION_BY_OTHER_MEANS_EDEFAULT);
279 return;
280 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
281 setTax_payer_has_inherited_business_ownership(TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT);
282 return;
283 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
284 setTax_payer_has_been_partner_in_business(TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT);
285 return;
286 }
287 super.eUnset(featureID);
288 }
289
290 /**
291 * <!-- begin-user-doc -->
292 * <!-- end-user-doc -->
293 * @generated
294 */
295 @Override
296 public boolean eIsSet(int featureID) {
297 switch (featureID) {
298 case TaxationPackage.LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY:
299 return regular_accountability != REGULAR_ACCOUNTABILITY_EDEFAULT;
300 case TaxationPackage.LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS:
301 return compensation_by_other_means != COMPENSATION_BY_OTHER_MEANS_EDEFAULT;
302 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP:
303 return tax_payer_has_inherited_business_ownership != TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP_EDEFAULT;
304 case TaxationPackage.LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS:
305 return tax_payer_has_been_partner_in_business != TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS_EDEFAULT;
306 }
307 return super.eIsSet(featureID);
308 }
309
310 /**
311 * <!-- begin-user-doc -->
312 * <!-- end-user-doc -->
313 * @generated
314 */
315 @Override
316 public String toString() {
317 if (eIsProxy()) return super.toString();
318
319 StringBuilder result = new StringBuilder(super.toString());
320 result.append(" (regular_accountability: ");
321 result.append(regular_accountability);
322 result.append(", compensation_by_other_means: ");
323 result.append(compensation_by_other_means);
324 result.append(", tax_payer_has_inherited_business_ownership: ");
325 result.append(tax_payer_has_inherited_business_ownership);
326 result.append(", tax_payer_has_been_partner_in_business: ");
327 result.append(tax_payer_has_been_partner_in_business);
328 result.append(')');
329 return result.toString();
330 }
331
332} //Loss_CarryforwardImpl 36} //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;
21 * </p> 21 * </p>
22 * <ul> 22 * <ul>
23 * <li>{@link Taxation.impl.Permanent_ExpenseImpl#getCategory <em>Category</em>}</li> 23 * <li>{@link Taxation.impl.Permanent_ExpenseImpl#getCategory <em>Category</em>}</li>
24 * <li>{@link Taxation.impl.Permanent_ExpenseImpl#isIs_eligible_for_deduction <em>Is eligible for deduction</em>}</li>
25 * </ul> 24 * </ul>
26 * 25 *
27 * @generated 26 * @generated
@@ -48,26 +47,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
48 protected Category_of_Permanent_Expense category = CATEGORY_EDEFAULT; 47 protected Category_of_Permanent_Expense category = CATEGORY_EDEFAULT;
49 48
50 /** 49 /**
51 * The default value of the '{@link #isIs_eligible_for_deduction() <em>Is eligible for deduction</em>}' attribute.
52 * <!-- begin-user-doc -->
53 * <!-- end-user-doc -->
54 * @see #isIs_eligible_for_deduction()
55 * @generated
56 * @ordered
57 */
58 protected static final boolean IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT = false;
59
60 /**
61 * The cached value of the '{@link #isIs_eligible_for_deduction() <em>Is eligible for deduction</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @see #isIs_eligible_for_deduction()
65 * @generated
66 * @ordered
67 */
68 protected boolean is_eligible_for_deduction = IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
69
70 /**
71 * <!-- begin-user-doc --> 50 * <!-- begin-user-doc -->
72 * <!-- end-user-doc --> 51 * <!-- end-user-doc -->
73 * @generated 52 * @generated
@@ -115,35 +94,10 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
115 * @generated 94 * @generated
116 */ 95 */
117 @Override 96 @Override
118 public boolean isIs_eligible_for_deduction() {
119 return is_eligible_for_deduction;
120 }
121
122 /**
123 * <!-- begin-user-doc -->
124 * <!-- end-user-doc -->
125 * @generated
126 */
127 @Override
128 public void setIs_eligible_for_deduction(boolean newIs_eligible_for_deduction) {
129 boolean oldIs_eligible_for_deduction = is_eligible_for_deduction;
130 is_eligible_for_deduction = newIs_eligible_for_deduction;
131 if (eNotificationRequired())
132 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION, oldIs_eligible_for_deduction, is_eligible_for_deduction));
133 }
134
135 /**
136 * <!-- begin-user-doc -->
137 * <!-- end-user-doc -->
138 * @generated
139 */
140 @Override
141 public Object eGet(int featureID, boolean resolve, boolean coreType) { 97 public Object eGet(int featureID, boolean resolve, boolean coreType) {
142 switch (featureID) { 98 switch (featureID) {
143 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 99 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
144 return getCategory(); 100 return getCategory();
145 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
146 return isIs_eligible_for_deduction();
147 } 101 }
148 return super.eGet(featureID, resolve, coreType); 102 return super.eGet(featureID, resolve, coreType);
149 } 103 }
@@ -159,9 +113,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
159 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 113 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
160 setCategory((Category_of_Permanent_Expense)newValue); 114 setCategory((Category_of_Permanent_Expense)newValue);
161 return; 115 return;
162 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
163 setIs_eligible_for_deduction((Boolean)newValue);
164 return;
165 } 116 }
166 super.eSet(featureID, newValue); 117 super.eSet(featureID, newValue);
167 } 118 }
@@ -177,9 +128,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
177 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 128 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
178 setCategory(CATEGORY_EDEFAULT); 129 setCategory(CATEGORY_EDEFAULT);
179 return; 130 return;
180 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
181 setIs_eligible_for_deduction(IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT);
182 return;
183 } 131 }
184 super.eUnset(featureID); 132 super.eUnset(featureID);
185 } 133 }
@@ -194,8 +142,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
194 switch (featureID) { 142 switch (featureID) {
195 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY: 143 case TaxationPackage.PERMANENT_EXPENSE__CATEGORY:
196 return category != CATEGORY_EDEFAULT; 144 return category != CATEGORY_EDEFAULT;
197 case TaxationPackage.PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION:
198 return is_eligible_for_deduction != IS_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
199 } 145 }
200 return super.eIsSet(featureID); 146 return super.eIsSet(featureID);
201 } 147 }
@@ -212,8 +158,6 @@ public class Permanent_ExpenseImpl extends Special_Expense_DSImpl implements Per
212 StringBuilder result = new StringBuilder(super.toString()); 158 StringBuilder result = new StringBuilder(super.toString());
213 result.append(" (category: "); 159 result.append(" (category: ");
214 result.append(category); 160 result.append(category);
215 result.append(", is_eligible_for_deduction: ");
216 result.append(is_eligible_for_deduction);
217 result.append(')'); 161 result.append(')');
218 return result.toString(); 162 return result.toString();
219 } 163 }
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;
32 * The following features are implemented: 32 * The following features are implemented:
33 * </p> 33 * </p>
34 * <ul> 34 * <ul>
35 * <li>{@link Taxation.impl.Physical_PersonImpl#isIs_assisting_spouse <em>Is assisting spouse</em>}</li>
36 * <li>{@link Taxation.impl.Physical_PersonImpl#getSSNo <em>SS No</em>}</li> 35 * <li>{@link Taxation.impl.Physical_PersonImpl#getSSNo <em>SS No</em>}</li>
37 * <li>{@link Taxation.impl.Physical_PersonImpl#getAddresses <em>Addresses</em>}</li> 36 * <li>{@link Taxation.impl.Physical_PersonImpl#getAddresses <em>Addresses</em>}</li>
38 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_year <em>Birth year</em>}</li> 37 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_year <em>Birth year</em>}</li>
39 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_percentage <em>Disability percentage</em>}</li> 38 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_percentage <em>Disability percentage</em>}</li>
40 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_type <em>Disability type</em>}</li> 39 * <li>{@link Taxation.impl.Physical_PersonImpl#getDisability_type <em>Disability type</em>}</li>
41 * <li>{@link Taxation.impl.Physical_PersonImpl#isIs_affiliated_personnaly_to_social_security <em>Is affiliated personnaly to social security</em>}</li>
42 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_month <em>Birth month</em>}</li> 40 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_month <em>Birth month</em>}</li>
43 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_day <em>Birth day</em>}</li> 41 * <li>{@link Taxation.impl.Physical_PersonImpl#getBirth_day <em>Birth day</em>}</li>
44 * <li>{@link Taxation.impl.Physical_PersonImpl#getExpenses <em>Expenses</em>}</li> 42 * <li>{@link Taxation.impl.Physical_PersonImpl#getExpenses <em>Expenses</em>}</li>
@@ -49,26 +47,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
49 */ 47 */
50public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements Physical_Person { 48public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements Physical_Person {
51 /** 49 /**
52 * The default value of the '{@link #isIs_assisting_spouse() <em>Is assisting spouse</em>}' attribute.
53 * <!-- begin-user-doc -->
54 * <!-- end-user-doc -->
55 * @see #isIs_assisting_spouse()
56 * @generated
57 * @ordered
58 */
59 protected static final boolean IS_ASSISTING_SPOUSE_EDEFAULT = false;
60
61 /**
62 * The cached value of the '{@link #isIs_assisting_spouse() <em>Is assisting spouse</em>}' attribute.
63 * <!-- begin-user-doc -->
64 * <!-- end-user-doc -->
65 * @see #isIs_assisting_spouse()
66 * @generated
67 * @ordered
68 */
69 protected boolean is_assisting_spouse = IS_ASSISTING_SPOUSE_EDEFAULT;
70
71 /**
72 * The default value of the '{@link #getSSNo() <em>SS No</em>}' attribute. 50 * The default value of the '{@link #getSSNo() <em>SS No</em>}' attribute.
73 * <!-- begin-user-doc --> 51 * <!-- begin-user-doc -->
74 * <!-- end-user-doc --> 52 * <!-- end-user-doc -->
@@ -159,26 +137,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
159 protected Disability_Types disability_type = DISABILITY_TYPE_EDEFAULT; 137 protected Disability_Types disability_type = DISABILITY_TYPE_EDEFAULT;
160 138
161 /** 139 /**
162 * The default value of the '{@link #isIs_affiliated_personnaly_to_social_security() <em>Is affiliated personnaly to social security</em>}' attribute.
163 * <!-- begin-user-doc -->
164 * <!-- end-user-doc -->
165 * @see #isIs_affiliated_personnaly_to_social_security()
166 * @generated
167 * @ordered
168 */
169 protected static final boolean IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT = false;
170
171 /**
172 * The cached value of the '{@link #isIs_affiliated_personnaly_to_social_security() <em>Is affiliated personnaly to social security</em>}' attribute.
173 * <!-- begin-user-doc -->
174 * <!-- end-user-doc -->
175 * @see #isIs_affiliated_personnaly_to_social_security()
176 * @generated
177 * @ordered
178 */
179 protected boolean is_affiliated_personnaly_to_social_security = IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT;
180
181 /**
182 * The default value of the '{@link #getBirth_month() <em>Birth month</em>}' attribute. 140 * The default value of the '{@link #getBirth_month() <em>Birth month</em>}' attribute.
183 * <!-- begin-user-doc --> 141 * <!-- begin-user-doc -->
184 * <!-- end-user-doc --> 142 * <!-- end-user-doc -->
@@ -273,29 +231,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
273 * @generated 231 * @generated
274 */ 232 */
275 @Override 233 @Override
276 public boolean isIs_assisting_spouse() {
277 return is_assisting_spouse;
278 }
279
280 /**
281 * <!-- begin-user-doc -->
282 * <!-- end-user-doc -->
283 * @generated
284 */
285 @Override
286 public void setIs_assisting_spouse(boolean newIs_assisting_spouse) {
287 boolean oldIs_assisting_spouse = is_assisting_spouse;
288 is_assisting_spouse = newIs_assisting_spouse;
289 if (eNotificationRequired())
290 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE, oldIs_assisting_spouse, is_assisting_spouse));
291 }
292
293 /**
294 * <!-- begin-user-doc -->
295 * <!-- end-user-doc -->
296 * @generated
297 */
298 @Override
299 public String getSSNo() { 234 public String getSSNo() {
300 return ssNo; 235 return ssNo;
301 } 236 }
@@ -401,29 +336,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
401 * @generated 336 * @generated
402 */ 337 */
403 @Override 338 @Override
404 public boolean isIs_affiliated_personnaly_to_social_security() {
405 return is_affiliated_personnaly_to_social_security;
406 }
407
408 /**
409 * <!-- begin-user-doc -->
410 * <!-- end-user-doc -->
411 * @generated
412 */
413 @Override
414 public void setIs_affiliated_personnaly_to_social_security(boolean newIs_affiliated_personnaly_to_social_security) {
415 boolean oldIs_affiliated_personnaly_to_social_security = is_affiliated_personnaly_to_social_security;
416 is_affiliated_personnaly_to_social_security = newIs_affiliated_personnaly_to_social_security;
417 if (eNotificationRequired())
418 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));
419 }
420
421 /**
422 * <!-- begin-user-doc -->
423 * <!-- end-user-doc -->
424 * @generated
425 */
426 @Override
427 public int getBirth_month() { 339 public int getBirth_month() {
428 return birth_month; 340 return birth_month;
429 } 341 }
@@ -541,8 +453,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
541 @Override 453 @Override
542 public Object eGet(int featureID, boolean resolve, boolean coreType) { 454 public Object eGet(int featureID, boolean resolve, boolean coreType) {
543 switch (featureID) { 455 switch (featureID) {
544 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
545 return isIs_assisting_spouse();
546 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 456 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
547 return getSSNo(); 457 return getSSNo();
548 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES: 458 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES:
@@ -553,8 +463,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
553 return getDisability_percentage(); 463 return getDisability_percentage();
554 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 464 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
555 return getDisability_type(); 465 return getDisability_type();
556 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
557 return isIs_affiliated_personnaly_to_social_security();
558 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 466 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
559 return getBirth_month(); 467 return getBirth_month();
560 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY: 468 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY:
@@ -576,9 +484,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
576 @Override 484 @Override
577 public void eSet(int featureID, Object newValue) { 485 public void eSet(int featureID, Object newValue) {
578 switch (featureID) { 486 switch (featureID) {
579 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
580 setIs_assisting_spouse((Boolean)newValue);
581 return;
582 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 487 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
583 setSSNo((String)newValue); 488 setSSNo((String)newValue);
584 return; 489 return;
@@ -595,9 +500,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
595 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 500 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
596 setDisability_type((Disability_Types)newValue); 501 setDisability_type((Disability_Types)newValue);
597 return; 502 return;
598 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
599 setIs_affiliated_personnaly_to_social_security((Boolean)newValue);
600 return;
601 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 503 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
602 setBirth_month((Integer)newValue); 504 setBirth_month((Integer)newValue);
603 return; 505 return;
@@ -623,9 +525,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
623 @Override 525 @Override
624 public void eUnset(int featureID) { 526 public void eUnset(int featureID) {
625 switch (featureID) { 527 switch (featureID) {
626 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
627 setIs_assisting_spouse(IS_ASSISTING_SPOUSE_EDEFAULT);
628 return;
629 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 528 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
630 setSSNo(SS_NO_EDEFAULT); 529 setSSNo(SS_NO_EDEFAULT);
631 return; 530 return;
@@ -641,9 +540,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
641 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 540 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
642 setDisability_type(DISABILITY_TYPE_EDEFAULT); 541 setDisability_type(DISABILITY_TYPE_EDEFAULT);
643 return; 542 return;
644 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
645 setIs_affiliated_personnaly_to_social_security(IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT);
646 return;
647 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 543 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
648 setBirth_month(BIRTH_MONTH_EDEFAULT); 544 setBirth_month(BIRTH_MONTH_EDEFAULT);
649 return; 545 return;
@@ -668,8 +564,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
668 @Override 564 @Override
669 public boolean eIsSet(int featureID) { 565 public boolean eIsSet(int featureID) {
670 switch (featureID) { 566 switch (featureID) {
671 case TaxationPackage.PHYSICAL_PERSON__IS_ASSISTING_SPOUSE:
672 return is_assisting_spouse != IS_ASSISTING_SPOUSE_EDEFAULT;
673 case TaxationPackage.PHYSICAL_PERSON__SS_NO: 567 case TaxationPackage.PHYSICAL_PERSON__SS_NO:
674 return SS_NO_EDEFAULT == null ? ssNo != null : !SS_NO_EDEFAULT.equals(ssNo); 568 return SS_NO_EDEFAULT == null ? ssNo != null : !SS_NO_EDEFAULT.equals(ssNo);
675 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES: 569 case TaxationPackage.PHYSICAL_PERSON__ADDRESSES:
@@ -680,8 +574,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
680 return disability_percentage != DISABILITY_PERCENTAGE_EDEFAULT; 574 return disability_percentage != DISABILITY_PERCENTAGE_EDEFAULT;
681 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE: 575 case TaxationPackage.PHYSICAL_PERSON__DISABILITY_TYPE:
682 return disability_type != DISABILITY_TYPE_EDEFAULT; 576 return disability_type != DISABILITY_TYPE_EDEFAULT;
683 case TaxationPackage.PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY:
684 return is_affiliated_personnaly_to_social_security != IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY_EDEFAULT;
685 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH: 577 case TaxationPackage.PHYSICAL_PERSON__BIRTH_MONTH:
686 return birth_month != BIRTH_MONTH_EDEFAULT; 578 return birth_month != BIRTH_MONTH_EDEFAULT;
687 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY: 579 case TaxationPackage.PHYSICAL_PERSON__BIRTH_DAY:
@@ -704,9 +596,7 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
704 if (eIsProxy()) return super.toString(); 596 if (eIsProxy()) return super.toString();
705 597
706 StringBuilder result = new StringBuilder(super.toString()); 598 StringBuilder result = new StringBuilder(super.toString());
707 result.append(" (is_assisting_spouse: "); 599 result.append(" (SSNo: ");
708 result.append(is_assisting_spouse);
709 result.append(", SSNo: ");
710 result.append(ssNo); 600 result.append(ssNo);
711 result.append(", birth_year: "); 601 result.append(", birth_year: ");
712 result.append(birth_year); 602 result.append(birth_year);
@@ -714,8 +604,6 @@ public class Physical_PersonImpl extends MinimalEObjectImpl.Container implements
714 result.append(disability_percentage); 604 result.append(disability_percentage);
715 result.append(", disability_type: "); 605 result.append(", disability_type: ");
716 result.append(disability_type); 606 result.append(disability_type);
717 result.append(", is_affiliated_personnaly_to_social_security: ");
718 result.append(is_affiliated_personnaly_to_social_security);
719 result.append(", birth_month: "); 607 result.append(", birth_month: ");
720 result.append(birth_month); 608 result.append(birth_month);
721 result.append(", birth_day: "); 609 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;
22 * <ul> 22 * <ul>
23 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getCategory <em>Category</em>}</li> 23 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getCategory <em>Category</em>}</li>
24 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getDuration_of_contract <em>Duration of contract</em>}</li> 24 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#getDuration_of_contract <em>Duration of contract</em>}</li>
25 * <li>{@link Taxation.impl.Private_Insurance_and_PlanImpl#isIs_private_insurance_and_plan_eligible_for_deduction <em>Is private insurance and plan eligible for deduction</em>}</li>
26 * </ul> 25 * </ul>
27 * 26 *
28 * @generated 27 * @generated
@@ -69,26 +68,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
69 protected int duration_of_contract = DURATION_OF_CONTRACT_EDEFAULT; 68 protected int duration_of_contract = DURATION_OF_CONTRACT_EDEFAULT;
70 69
71 /** 70 /**
72 * The default value of the '{@link #isIs_private_insurance_and_plan_eligible_for_deduction() <em>Is private insurance and plan eligible for deduction</em>}' attribute.
73 * <!-- begin-user-doc -->
74 * <!-- end-user-doc -->
75 * @see #isIs_private_insurance_and_plan_eligible_for_deduction()
76 * @generated
77 * @ordered
78 */
79 protected static final boolean IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT = false;
80
81 /**
82 * The cached value of the '{@link #isIs_private_insurance_and_plan_eligible_for_deduction() <em>Is private insurance and plan eligible for deduction</em>}' attribute.
83 * <!-- begin-user-doc -->
84 * <!-- end-user-doc -->
85 * @see #isIs_private_insurance_and_plan_eligible_for_deduction()
86 * @generated
87 * @ordered
88 */
89 protected boolean is_private_insurance_and_plan_eligible_for_deduction = IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
90
91 /**
92 * <!-- begin-user-doc --> 71 * <!-- begin-user-doc -->
93 * <!-- end-user-doc --> 72 * <!-- end-user-doc -->
94 * @generated 73 * @generated
@@ -159,37 +138,12 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
159 * @generated 138 * @generated
160 */ 139 */
161 @Override 140 @Override
162 public boolean isIs_private_insurance_and_plan_eligible_for_deduction() {
163 return is_private_insurance_and_plan_eligible_for_deduction;
164 }
165
166 /**
167 * <!-- begin-user-doc -->
168 * <!-- end-user-doc -->
169 * @generated
170 */
171 @Override
172 public void setIs_private_insurance_and_plan_eligible_for_deduction(boolean newIs_private_insurance_and_plan_eligible_for_deduction) {
173 boolean oldIs_private_insurance_and_plan_eligible_for_deduction = is_private_insurance_and_plan_eligible_for_deduction;
174 is_private_insurance_and_plan_eligible_for_deduction = newIs_private_insurance_and_plan_eligible_for_deduction;
175 if (eNotificationRequired())
176 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));
177 }
178
179 /**
180 * <!-- begin-user-doc -->
181 * <!-- end-user-doc -->
182 * @generated
183 */
184 @Override
185 public Object eGet(int featureID, boolean resolve, boolean coreType) { 141 public Object eGet(int featureID, boolean resolve, boolean coreType) {
186 switch (featureID) { 142 switch (featureID) {
187 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY: 143 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__CATEGORY:
188 return getCategory(); 144 return getCategory();
189 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 145 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
190 return getDuration_of_contract(); 146 return getDuration_of_contract();
191 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
192 return isIs_private_insurance_and_plan_eligible_for_deduction();
193 } 147 }
194 return super.eGet(featureID, resolve, coreType); 148 return super.eGet(featureID, resolve, coreType);
195 } 149 }
@@ -208,9 +162,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
208 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 162 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
209 setDuration_of_contract((Integer)newValue); 163 setDuration_of_contract((Integer)newValue);
210 return; 164 return;
211 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
212 setIs_private_insurance_and_plan_eligible_for_deduction((Boolean)newValue);
213 return;
214 } 165 }
215 super.eSet(featureID, newValue); 166 super.eSet(featureID, newValue);
216 } 167 }
@@ -229,9 +180,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
229 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 180 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
230 setDuration_of_contract(DURATION_OF_CONTRACT_EDEFAULT); 181 setDuration_of_contract(DURATION_OF_CONTRACT_EDEFAULT);
231 return; 182 return;
232 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
233 setIs_private_insurance_and_plan_eligible_for_deduction(IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT);
234 return;
235 } 183 }
236 super.eUnset(featureID); 184 super.eUnset(featureID);
237 } 185 }
@@ -248,8 +196,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
248 return category != CATEGORY_EDEFAULT; 196 return category != CATEGORY_EDEFAULT;
249 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT: 197 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT:
250 return duration_of_contract != DURATION_OF_CONTRACT_EDEFAULT; 198 return duration_of_contract != DURATION_OF_CONTRACT_EDEFAULT;
251 case TaxationPackage.PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION:
252 return is_private_insurance_and_plan_eligible_for_deduction != IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION_EDEFAULT;
253 } 199 }
254 return super.eIsSet(featureID); 200 return super.eIsSet(featureID);
255 } 201 }
@@ -268,8 +214,6 @@ public class Private_Insurance_and_PlanImpl extends Special_Expense_DSImpl imple
268 result.append(category); 214 result.append(category);
269 result.append(", duration_of_contract: "); 215 result.append(", duration_of_contract: ");
270 result.append(duration_of_contract); 216 result.append(duration_of_contract);
271 result.append(", is_private_insurance_and_plan_eligible_for_deduction: ");
272 result.append(is_private_insurance_and_plan_eligible_for_deduction);
273 result.append(')'); 217 result.append(')');
274 return result.toString(); 218 return result.toString();
275 } 219 }
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;
7import Taxation.Income_Tax_Credit; 7import Taxation.Income_Tax_Credit;
8import Taxation.Job_Activity; 8import Taxation.Job_Activity;
9import Taxation.Tax_Card; 9import Taxation.Tax_Card;
10import Taxation.Tax_Card_Type;
11import Taxation.Tax_Office; 10import Taxation.Tax_Office;
12import Taxation.TaxationPackage; 11import Taxation.TaxationPackage;
13import Taxation.Town; 12import Taxation.Town;
@@ -39,7 +38,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
39 * </p> 38 * </p>
40 * <ul> 39 * <ul>
41 * <li>{@link Taxation.impl.Tax_CardImpl#getCard_identifier <em>Card identifier</em>}</li> 40 * <li>{@link Taxation.impl.Tax_CardImpl#getCard_identifier <em>Card identifier</em>}</li>
42 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_card_type <em>Tax card type</em>}</li>
43 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_office <em>Tax office</em>}</li> 41 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_office <em>Tax office</em>}</li>
44 * <li>{@link Taxation.impl.Tax_CardImpl#getPercentage_of_witholding <em>Percentage of witholding</em>}</li> 42 * <li>{@link Taxation.impl.Tax_CardImpl#getPercentage_of_witholding <em>Percentage of witholding</em>}</li>
45 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_payers_name_surname <em>Tax payers name surname</em>}</li> 43 * <li>{@link Taxation.impl.Tax_CardImpl#getTax_payers_name_surname <em>Tax payers name surname</em>}</li>
@@ -99,26 +97,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
99 protected String card_identifier = CARD_IDENTIFIER_EDEFAULT; 97 protected String card_identifier = CARD_IDENTIFIER_EDEFAULT;
100 98
101 /** 99 /**
102 * The default value of the '{@link #getTax_card_type() <em>Tax card type</em>}' attribute.
103 * <!-- begin-user-doc -->
104 * <!-- end-user-doc -->
105 * @see #getTax_card_type()
106 * @generated
107 * @ordered
108 */
109 protected static final Tax_Card_Type TAX_CARD_TYPE_EDEFAULT = Tax_Card_Type.PRINCIPAL;
110
111 /**
112 * The cached value of the '{@link #getTax_card_type() <em>Tax card type</em>}' attribute.
113 * <!-- begin-user-doc -->
114 * <!-- end-user-doc -->
115 * @see #getTax_card_type()
116 * @generated
117 * @ordered
118 */
119 protected Tax_Card_Type tax_card_type = TAX_CARD_TYPE_EDEFAULT;
120
121 /**
122 * The default value of the '{@link #getTax_office() <em>Tax office</em>}' attribute. 100 * The default value of the '{@link #getTax_office() <em>Tax office</em>}' attribute.
123 * <!-- begin-user-doc --> 101 * <!-- begin-user-doc -->
124 * <!-- end-user-doc --> 102 * <!-- end-user-doc -->
@@ -746,29 +724,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
746 * @generated 724 * @generated
747 */ 725 */
748 @Override 726 @Override
749 public Tax_Card_Type getTax_card_type() {
750 return tax_card_type;
751 }
752
753 /**
754 * <!-- begin-user-doc -->
755 * <!-- end-user-doc -->
756 * @generated
757 */
758 @Override
759 public void setTax_card_type(Tax_Card_Type newTax_card_type) {
760 Tax_Card_Type oldTax_card_type = tax_card_type;
761 tax_card_type = newTax_card_type == null ? TAX_CARD_TYPE_EDEFAULT : newTax_card_type;
762 if (eNotificationRequired())
763 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_CARD__TAX_CARD_TYPE, oldTax_card_type, tax_card_type));
764 }
765
766 /**
767 * <!-- begin-user-doc -->
768 * <!-- end-user-doc -->
769 * @generated
770 */
771 @Override
772 public Tax_Office getTax_office() { 727 public Tax_Office getTax_office() {
773 return tax_office; 728 return tax_office;
774 } 729 }
@@ -1678,8 +1633,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
1678 switch (featureID) { 1633 switch (featureID) {
1679 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1634 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
1680 return getCard_identifier(); 1635 return getCard_identifier();
1681 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
1682 return getTax_card_type();
1683 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1636 case TaxationPackage.TAX_CARD__TAX_OFFICE:
1684 return getTax_office(); 1637 return getTax_office();
1685 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: 1638 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
@@ -1765,9 +1718,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
1765 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1718 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
1766 setCard_identifier((String)newValue); 1719 setCard_identifier((String)newValue);
1767 return; 1720 return;
1768 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
1769 setTax_card_type((Tax_Card_Type)newValue);
1770 return;
1771 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1721 case TaxationPackage.TAX_CARD__TAX_OFFICE:
1772 setTax_office((Tax_Office)newValue); 1722 setTax_office((Tax_Office)newValue);
1773 return; 1723 return;
@@ -1885,9 +1835,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
1885 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1835 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
1886 setCard_identifier(CARD_IDENTIFIER_EDEFAULT); 1836 setCard_identifier(CARD_IDENTIFIER_EDEFAULT);
1887 return; 1837 return;
1888 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
1889 setTax_card_type(TAX_CARD_TYPE_EDEFAULT);
1890 return;
1891 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1838 case TaxationPackage.TAX_CARD__TAX_OFFICE:
1892 setTax_office(TAX_OFFICE_EDEFAULT); 1839 setTax_office(TAX_OFFICE_EDEFAULT);
1893 return; 1840 return;
@@ -2001,8 +1948,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
2001 switch (featureID) { 1948 switch (featureID) {
2002 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER: 1949 case TaxationPackage.TAX_CARD__CARD_IDENTIFIER:
2003 return CARD_IDENTIFIER_EDEFAULT == null ? card_identifier != null : !CARD_IDENTIFIER_EDEFAULT.equals(card_identifier); 1950 return CARD_IDENTIFIER_EDEFAULT == null ? card_identifier != null : !CARD_IDENTIFIER_EDEFAULT.equals(card_identifier);
2004 case TaxationPackage.TAX_CARD__TAX_CARD_TYPE:
2005 return tax_card_type != TAX_CARD_TYPE_EDEFAULT;
2006 case TaxationPackage.TAX_CARD__TAX_OFFICE: 1951 case TaxationPackage.TAX_CARD__TAX_OFFICE:
2007 return tax_office != TAX_OFFICE_EDEFAULT; 1952 return tax_office != TAX_OFFICE_EDEFAULT;
2008 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING: 1953 case TaxationPackage.TAX_CARD__PERCENTAGE_OF_WITHOLDING:
@@ -2085,8 +2030,6 @@ public class Tax_CardImpl extends MinimalEObjectImpl.Container implements Tax_Ca
2085 StringBuilder result = new StringBuilder(super.toString()); 2030 StringBuilder result = new StringBuilder(super.toString());
2086 result.append(" (card_identifier: "); 2031 result.append(" (card_identifier: ");
2087 result.append(card_identifier); 2032 result.append(card_identifier);
2088 result.append(", tax_card_type: ");
2089 result.append(tax_card_type);
2090 result.append(", tax_office: "); 2033 result.append(", tax_office: ");
2091 result.append(tax_office); 2034 result.append(tax_office);
2092 result.append(", percentage_of_witholding: "); 2035 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;
36 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_agent <em>From agent</em>}</li> 36 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_agent <em>From agent</em>}</li>
37 * <li>{@link Taxation.impl.Tax_PayerImpl#getIncomes <em>Incomes</em>}</li> 37 * <li>{@link Taxation.impl.Tax_PayerImpl#getIncomes <em>Incomes</em>}</li>
38 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_law <em>From law</em>}</li> 38 * <li>{@link Taxation.impl.Tax_PayerImpl#getFrom_law <em>From law</em>}</li>
39 * <li>{@link Taxation.impl.Tax_PayerImpl#getTaxesDue <em>Taxes Due</em>}</li>
40 * </ul> 39 * </ul>
41 * 40 *
42 * @generated 41 * @generated
@@ -83,26 +82,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
83 protected FromLaw from_law; 82 protected FromLaw from_law;
84 83
85 /** 84 /**
86 * The default value of the '{@link #getTaxesDue() <em>Taxes Due</em>}' attribute.
87 * <!-- begin-user-doc -->
88 * <!-- end-user-doc -->
89 * @see #getTaxesDue()
90 * @generated
91 * @ordered
92 */
93 protected static final double TAXES_DUE_EDEFAULT = 0.0;
94
95 /**
96 * The cached value of the '{@link #getTaxesDue() <em>Taxes Due</em>}' attribute.
97 * <!-- begin-user-doc -->
98 * <!-- end-user-doc -->
99 * @see #getTaxesDue()
100 * @generated
101 * @ordered
102 */
103 protected double taxesDue = TAXES_DUE_EDEFAULT;
104
105 /**
106 * <!-- begin-user-doc --> 85 * <!-- begin-user-doc -->
107 * <!-- end-user-doc --> 86 * <!-- end-user-doc -->
108 * @generated 87 * @generated
@@ -242,29 +221,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
242 * <!-- end-user-doc --> 221 * <!-- end-user-doc -->
243 * @generated 222 * @generated
244 */ 223 */
245 @Override
246 public double getTaxesDue() {
247 return taxesDue;
248 }
249
250 /**
251 * <!-- begin-user-doc -->
252 * <!-- end-user-doc -->
253 * @generated
254 */
255 @Override
256 public void setTaxesDue(double newTaxesDue) {
257 double oldTaxesDue = taxesDue;
258 taxesDue = newTaxesDue;
259 if (eNotificationRequired())
260 eNotify(new ENotificationImpl(this, Notification.SET, TaxationPackage.TAX_PAYER__TAXES_DUE, oldTaxesDue, taxesDue));
261 }
262
263 /**
264 * <!-- begin-user-doc -->
265 * <!-- end-user-doc -->
266 * @generated
267 */
268 @SuppressWarnings("unchecked") 224 @SuppressWarnings("unchecked")
269 @Override 225 @Override
270 public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { 226 public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -321,8 +277,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
321 return getIncomes(); 277 return getIncomes();
322 case TaxationPackage.TAX_PAYER__FROM_LAW: 278 case TaxationPackage.TAX_PAYER__FROM_LAW:
323 return getFrom_law(); 279 return getFrom_law();
324 case TaxationPackage.TAX_PAYER__TAXES_DUE:
325 return getTaxesDue();
326 } 280 }
327 return super.eGet(featureID, resolve, coreType); 281 return super.eGet(featureID, resolve, coreType);
328 } 282 }
@@ -350,9 +304,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
350 case TaxationPackage.TAX_PAYER__FROM_LAW: 304 case TaxationPackage.TAX_PAYER__FROM_LAW:
351 setFrom_law((FromLaw)newValue); 305 setFrom_law((FromLaw)newValue);
352 return; 306 return;
353 case TaxationPackage.TAX_PAYER__TAXES_DUE:
354 setTaxesDue((Double)newValue);
355 return;
356 } 307 }
357 super.eSet(featureID, newValue); 308 super.eSet(featureID, newValue);
358 } 309 }
@@ -377,9 +328,6 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
377 case TaxationPackage.TAX_PAYER__FROM_LAW: 328 case TaxationPackage.TAX_PAYER__FROM_LAW:
378 setFrom_law((FromLaw)null); 329 setFrom_law((FromLaw)null);
379 return; 330 return;
380 case TaxationPackage.TAX_PAYER__TAXES_DUE:
381 setTaxesDue(TAXES_DUE_EDEFAULT);
382 return;
383 } 331 }
384 super.eUnset(featureID); 332 super.eUnset(featureID);
385 } 333 }
@@ -400,26 +348,8 @@ public abstract class Tax_PayerImpl extends Physical_PersonImpl implements Tax_P
400 return incomes != null && !incomes.isEmpty(); 348 return incomes != null && !incomes.isEmpty();
401 case TaxationPackage.TAX_PAYER__FROM_LAW: 349 case TaxationPackage.TAX_PAYER__FROM_LAW:
402 return from_law != null; 350 return from_law != null;
403 case TaxationPackage.TAX_PAYER__TAXES_DUE:
404 return taxesDue != TAXES_DUE_EDEFAULT;
405 } 351 }
406 return super.eIsSet(featureID); 352 return super.eIsSet(featureID);
407 } 353 }
408 354
409 /**
410 * <!-- begin-user-doc -->
411 * <!-- end-user-doc -->
412 * @generated
413 */
414 @Override
415 public String toString() {
416 if (eIsProxy()) return super.toString();
417
418 StringBuilder result = new StringBuilder(super.toString());
419 result.append(" (taxesDue: ");
420 result.append(taxesDue);
421 result.append(')');
422 return result.toString();
423 }
424
425} //Tax_PayerImpl 355} //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
128 return createDisability_TypesFromString(eDataType, initialValue); 128 return createDisability_TypesFromString(eDataType, initialValue);
129 case TaxationPackage.COUNTRY: 129 case TaxationPackage.COUNTRY:
130 return createCountryFromString(eDataType, initialValue); 130 return createCountryFromString(eDataType, initialValue);
131 case TaxationPackage.TAX_CARD_TYPE:
132 return createTax_Card_TypeFromString(eDataType, initialValue);
133 case TaxationPackage.TAX_OFFICE: 131 case TaxationPackage.TAX_OFFICE:
134 return createTax_OfficeFromString(eDataType, initialValue); 132 return createTax_OfficeFromString(eDataType, initialValue);
135 case TaxationPackage.TAX_CLASS_CATEGORY: 133 case TaxationPackage.TAX_CLASS_CATEGORY:
@@ -138,8 +136,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
138 return createJob_ActivityFromString(eDataType, initialValue); 136 return createJob_ActivityFromString(eDataType, initialValue);
139 case TaxationPackage.TOWN: 137 case TaxationPackage.TOWN:
140 return createTownFromString(eDataType, initialValue); 138 return createTownFromString(eDataType, initialValue);
141 case TaxationPackage.TYPE_OF_RATE:
142 return createType_of_RateFromString(eDataType, initialValue);
143 case TaxationPackage.CE_TYPE: 139 case TaxationPackage.CE_TYPE:
144 return createCE_TypeFromString(eDataType, initialValue); 140 return createCE_TypeFromString(eDataType, initialValue);
145 case TaxationPackage.EXPENSE_PURPOSE: 141 case TaxationPackage.EXPENSE_PURPOSE:
@@ -175,8 +171,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
175 return convertDisability_TypesToString(eDataType, instanceValue); 171 return convertDisability_TypesToString(eDataType, instanceValue);
176 case TaxationPackage.COUNTRY: 172 case TaxationPackage.COUNTRY:
177 return convertCountryToString(eDataType, instanceValue); 173 return convertCountryToString(eDataType, instanceValue);
178 case TaxationPackage.TAX_CARD_TYPE:
179 return convertTax_Card_TypeToString(eDataType, instanceValue);
180 case TaxationPackage.TAX_OFFICE: 174 case TaxationPackage.TAX_OFFICE:
181 return convertTax_OfficeToString(eDataType, instanceValue); 175 return convertTax_OfficeToString(eDataType, instanceValue);
182 case TaxationPackage.TAX_CLASS_CATEGORY: 176 case TaxationPackage.TAX_CLASS_CATEGORY:
@@ -185,8 +179,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
185 return convertJob_ActivityToString(eDataType, instanceValue); 179 return convertJob_ActivityToString(eDataType, instanceValue);
186 case TaxationPackage.TOWN: 180 case TaxationPackage.TOWN:
187 return convertTownToString(eDataType, instanceValue); 181 return convertTownToString(eDataType, instanceValue);
188 case TaxationPackage.TYPE_OF_RATE:
189 return convertType_of_RateToString(eDataType, instanceValue);
190 case TaxationPackage.CE_TYPE: 182 case TaxationPackage.CE_TYPE:
191 return convertCE_TypeToString(eDataType, instanceValue); 183 return convertCE_TypeToString(eDataType, instanceValue);
192 case TaxationPackage.EXPENSE_PURPOSE: 184 case TaxationPackage.EXPENSE_PURPOSE:
@@ -845,26 +837,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
845 * <!-- end-user-doc --> 837 * <!-- end-user-doc -->
846 * @generated 838 * @generated
847 */ 839 */
848 public Tax_Card_Type createTax_Card_TypeFromString(EDataType eDataType, String initialValue) {
849 Tax_Card_Type result = Tax_Card_Type.get(initialValue);
850 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
851 return result;
852 }
853
854 /**
855 * <!-- begin-user-doc -->
856 * <!-- end-user-doc -->
857 * @generated
858 */
859 public String convertTax_Card_TypeToString(EDataType eDataType, Object instanceValue) {
860 return instanceValue == null ? null : instanceValue.toString();
861 }
862
863 /**
864 * <!-- begin-user-doc -->
865 * <!-- end-user-doc -->
866 * @generated
867 */
868 public Tax_Office createTax_OfficeFromString(EDataType eDataType, String initialValue) { 840 public Tax_Office createTax_OfficeFromString(EDataType eDataType, String initialValue) {
869 Tax_Office result = Tax_Office.get(initialValue); 841 Tax_Office result = Tax_Office.get(initialValue);
870 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 842 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
@@ -945,26 +917,6 @@ public class TaxationFactoryImpl extends EFactoryImpl implements TaxationFactory
945 * <!-- end-user-doc --> 917 * <!-- end-user-doc -->
946 * @generated 918 * @generated
947 */ 919 */
948 public Type_of_Rate createType_of_RateFromString(EDataType eDataType, String initialValue) {
949 Type_of_Rate result = Type_of_Rate.get(initialValue);
950 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
951 return result;
952 }
953
954 /**
955 * <!-- begin-user-doc -->
956 * <!-- end-user-doc -->
957 * @generated
958 */
959 public String convertType_of_RateToString(EDataType eDataType, Object instanceValue) {
960 return instanceValue == null ? null : instanceValue.toString();
961 }
962
963 /**
964 * <!-- begin-user-doc -->
965 * <!-- end-user-doc -->
966 * @generated
967 */
968 public CE_Type createCE_TypeFromString(EDataType eDataType, String initialValue) { 920 public CE_Type createCE_TypeFromString(EDataType eDataType, String initialValue) {
969 CE_Type result = CE_Type.get(initialValue); 921 CE_Type result = CE_Type.get(initialValue);
970 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 922 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
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;
61import Taxation.Special_Expense_DS; 61import Taxation.Special_Expense_DS;
62import Taxation.Spousal_Expense_AC; 62import Taxation.Spousal_Expense_AC;
63import Taxation.Tax_Card; 63import Taxation.Tax_Card;
64import Taxation.Tax_Card_Type;
65import Taxation.Tax_Case; 64import Taxation.Tax_Case;
66import Taxation.Tax_Class_Category; 65import Taxation.Tax_Class_Category;
67import Taxation.Tax_Office; 66import Taxation.Tax_Office;
@@ -72,8 +71,6 @@ import Taxation.TaxationPackage;
72import Taxation.Town; 71import Taxation.Town;
73import Taxation.Trade_and_Business_Income; 72import Taxation.Trade_and_Business_Income;
74import Taxation.Travel_Expense_FD; 73import Taxation.Travel_Expense_FD;
75import Taxation.Type_of_Rate;
76
77import org.eclipse.emf.ecore.EAttribute; 74import org.eclipse.emf.ecore.EAttribute;
78import org.eclipse.emf.ecore.EClass; 75import org.eclipse.emf.ecore.EClass;
79import org.eclipse.emf.ecore.EEnum; 76import org.eclipse.emf.ecore.EEnum;
@@ -521,13 +518,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
521 * <!-- end-user-doc --> 518 * <!-- end-user-doc -->
522 * @generated 519 * @generated
523 */ 520 */
524 private EEnum tax_Card_TypeEEnum = null;
525
526 /**
527 * <!-- begin-user-doc -->
528 * <!-- end-user-doc -->
529 * @generated
530 */
531 private EEnum tax_OfficeEEnum = null; 521 private EEnum tax_OfficeEEnum = null;
532 522
533 /** 523 /**
@@ -556,13 +546,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
556 * <!-- end-user-doc --> 546 * <!-- end-user-doc -->
557 * @generated 547 * @generated
558 */ 548 */
559 private EEnum type_of_RateEEnum = null;
560
561 /**
562 * <!-- begin-user-doc -->
563 * <!-- end-user-doc -->
564 * @generated
565 */
566 private EEnum cE_TypeEEnum = null; 549 private EEnum cE_TypeEEnum = null;
567 550
568 /** 551 /**
@@ -1041,16 +1024,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1041 * @generated 1024 * @generated
1042 */ 1025 */
1043 @Override 1026 @Override
1044 public EAttribute getTax_Payer_TaxesDue() {
1045 return (EAttribute)tax_PayerEClass.getEStructuralFeatures().get(4);
1046 }
1047
1048 /**
1049 * <!-- begin-user-doc -->
1050 * <!-- end-user-doc -->
1051 * @generated
1052 */
1053 @Override
1054 public EClass getPhysical_Person() { 1027 public EClass getPhysical_Person() {
1055 return physical_PersonEClass; 1028 return physical_PersonEClass;
1056 } 1029 }
@@ -1061,18 +1034,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1061 * @generated 1034 * @generated
1062 */ 1035 */
1063 @Override 1036 @Override
1064 public EAttribute getPhysical_Person_Is_assisting_spouse() {
1065 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(0);
1066 }
1067
1068 /**
1069 * <!-- begin-user-doc -->
1070 * <!-- end-user-doc -->
1071 * @generated
1072 */
1073 @Override
1074 public EAttribute getPhysical_Person_SSNo() { 1037 public EAttribute getPhysical_Person_SSNo() {
1075 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(1); 1038 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(0);
1076 } 1039 }
1077 1040
1078 /** 1041 /**
@@ -1082,7 +1045,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1082 */ 1045 */
1083 @Override 1046 @Override
1084 public EReference getPhysical_Person_Addresses() { 1047 public EReference getPhysical_Person_Addresses() {
1085 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(2); 1048 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(1);
1086 } 1049 }
1087 1050
1088 /** 1051 /**
@@ -1092,7 +1055,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1092 */ 1055 */
1093 @Override 1056 @Override
1094 public EAttribute getPhysical_Person_Birth_year() { 1057 public EAttribute getPhysical_Person_Birth_year() {
1095 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(3); 1058 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(2);
1096 } 1059 }
1097 1060
1098 /** 1061 /**
@@ -1102,7 +1065,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1102 */ 1065 */
1103 @Override 1066 @Override
1104 public EAttribute getPhysical_Person_Disability_percentage() { 1067 public EAttribute getPhysical_Person_Disability_percentage() {
1105 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(4); 1068 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(3);
1106 } 1069 }
1107 1070
1108 /** 1071 /**
@@ -1112,17 +1075,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1112 */ 1075 */
1113 @Override 1076 @Override
1114 public EAttribute getPhysical_Person_Disability_type() { 1077 public EAttribute getPhysical_Person_Disability_type() {
1115 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(5); 1078 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(4);
1116 }
1117
1118 /**
1119 * <!-- begin-user-doc -->
1120 * <!-- end-user-doc -->
1121 * @generated
1122 */
1123 @Override
1124 public EAttribute getPhysical_Person_Is_affiliated_personnaly_to_social_security() {
1125 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(6);
1126 } 1079 }
1127 1080
1128 /** 1081 /**
@@ -1132,7 +1085,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1132 */ 1085 */
1133 @Override 1086 @Override
1134 public EAttribute getPhysical_Person_Birth_month() { 1087 public EAttribute getPhysical_Person_Birth_month() {
1135 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(7); 1088 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(5);
1136 } 1089 }
1137 1090
1138 /** 1091 /**
@@ -1142,7 +1095,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1142 */ 1095 */
1143 @Override 1096 @Override
1144 public EAttribute getPhysical_Person_Birth_day() { 1097 public EAttribute getPhysical_Person_Birth_day() {
1145 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(8); 1098 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(6);
1146 } 1099 }
1147 1100
1148 /** 1101 /**
@@ -1152,7 +1105,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1152 */ 1105 */
1153 @Override 1106 @Override
1154 public EReference getPhysical_Person_Expenses() { 1107 public EReference getPhysical_Person_Expenses() {
1155 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(9); 1108 return (EReference)physical_PersonEClass.getEStructuralFeatures().get(7);
1156 } 1109 }
1157 1110
1158 /** 1111 /**
@@ -1162,7 +1115,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1162 */ 1115 */
1163 @Override 1116 @Override
1164 public EAttribute getPhysical_Person_Is_widower() { 1117 public EAttribute getPhysical_Person_Is_widower() {
1165 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(10); 1118 return (EAttribute)physical_PersonEClass.getEStructuralFeatures().get(8);
1166 } 1119 }
1167 1120
1168 /** 1121 /**
@@ -1411,18 +1364,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1411 * @generated 1364 * @generated
1412 */ 1365 */
1413 @Override 1366 @Override
1414 public EAttribute getExternal_Allowance_Amount() {
1415 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(0);
1416 }
1417
1418 /**
1419 * <!-- begin-user-doc -->
1420 * <!-- end-user-doc -->
1421 * @generated
1422 */
1423 @Override
1424 public EAttribute getExternal_Allowance_Grantor() { 1367 public EAttribute getExternal_Allowance_Grantor() {
1425 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(1); 1368 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(0);
1426 } 1369 }
1427 1370
1428 /** 1371 /**
@@ -1432,7 +1375,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1432 */ 1375 */
1433 @Override 1376 @Override
1434 public EAttribute getExternal_Allowance_Starting_year() { 1377 public EAttribute getExternal_Allowance_Starting_year() {
1435 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(2); 1378 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(1);
1436 } 1379 }
1437 1380
1438 /** 1381 /**
@@ -1442,7 +1385,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1442 */ 1385 */
1443 @Override 1386 @Override
1444 public EAttribute getExternal_Allowance_Ending_year() { 1387 public EAttribute getExternal_Allowance_Ending_year() {
1445 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(3); 1388 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(2);
1446 } 1389 }
1447 1390
1448 /** 1391 /**
@@ -1452,7 +1395,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1452 */ 1395 */
1453 @Override 1396 @Override
1454 public EReference getExternal_Allowance_Reciver() { 1397 public EReference getExternal_Allowance_Reciver() {
1455 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(4); 1398 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(3);
1456 } 1399 }
1457 1400
1458 /** 1401 /**
@@ -1462,7 +1405,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1462 */ 1405 */
1463 @Override 1406 @Override
1464 public EAttribute getExternal_Allowance_Id5() { 1407 public EAttribute getExternal_Allowance_Id5() {
1465 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(5); 1408 return (EAttribute)external_AllowanceEClass.getEStructuralFeatures().get(4);
1466 } 1409 }
1467 1410
1468 /** 1411 /**
@@ -1472,7 +1415,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1472 */ 1415 */
1473 @Override 1416 @Override
1474 public EReference getExternal_Allowance_Person() { 1417 public EReference getExternal_Allowance_Person() {
1475 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(6); 1418 return (EReference)external_AllowanceEClass.getEStructuralFeatures().get(5);
1476 } 1419 }
1477 1420
1478 /** 1421 /**
@@ -1831,18 +1774,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1831 * @generated 1774 * @generated
1832 */ 1775 */
1833 @Override 1776 @Override
1834 public EAttribute getIncome_Type_SubjectToWithholdingTax() {
1835 return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(0);
1836 }
1837
1838 /**
1839 * <!-- begin-user-doc -->
1840 * <!-- end-user-doc -->
1841 * @generated
1842 */
1843 @Override
1844 public EAttribute getIncome_Type_Id8() { 1777 public EAttribute getIncome_Type_Id8() {
1845 return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(1); 1778 return (EAttribute)income_TypeEClass.getEStructuralFeatures().get(0);
1846 } 1779 }
1847 1780
1848 /** 1781 /**
@@ -1852,7 +1785,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1852 */ 1785 */
1853 @Override 1786 @Override
1854 public EReference getIncome_Type_Income() { 1787 public EReference getIncome_Type_Income() {
1855 return (EReference)income_TypeEClass.getEStructuralFeatures().get(2); 1788 return (EReference)income_TypeEClass.getEStructuralFeatures().get(1);
1856 } 1789 }
1857 1790
1858 /** 1791 /**
@@ -1881,18 +1814,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1881 * @generated 1814 * @generated
1882 */ 1815 */
1883 @Override 1816 @Override
1884 public EAttribute getTax_Card_Tax_card_type() {
1885 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(1);
1886 }
1887
1888 /**
1889 * <!-- begin-user-doc -->
1890 * <!-- end-user-doc -->
1891 * @generated
1892 */
1893 @Override
1894 public EAttribute getTax_Card_Tax_office() { 1817 public EAttribute getTax_Card_Tax_office() {
1895 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2); 1818 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(1);
1896 } 1819 }
1897 1820
1898 /** 1821 /**
@@ -1902,7 +1825,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1902 */ 1825 */
1903 @Override 1826 @Override
1904 public EAttribute getTax_Card_Percentage_of_witholding() { 1827 public EAttribute getTax_Card_Percentage_of_witholding() {
1905 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3); 1828 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(2);
1906 } 1829 }
1907 1830
1908 /** 1831 /**
@@ -1912,7 +1835,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1912 */ 1835 */
1913 @Override 1836 @Override
1914 public EAttribute getTax_Card_Tax_payers_name_surname() { 1837 public EAttribute getTax_Card_Tax_payers_name_surname() {
1915 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4); 1838 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(3);
1916 } 1839 }
1917 1840
1918 /** 1841 /**
@@ -1922,7 +1845,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1922 */ 1845 */
1923 @Override 1846 @Override
1924 public EAttribute getTax_Card_Tax_payers_partner_name_surname() { 1847 public EAttribute getTax_Card_Tax_payers_partner_name_surname() {
1925 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(5); 1848 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(4);
1926 } 1849 }
1927 1850
1928 /** 1851 /**
@@ -1932,7 +1855,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1932 */ 1855 */
1933 @Override 1856 @Override
1934 public EReference getTax_Card_Tax_payers_address() { 1857 public EReference getTax_Card_Tax_payers_address() {
1935 return (EReference)tax_CardEClass.getEStructuralFeatures().get(6); 1858 return (EReference)tax_CardEClass.getEStructuralFeatures().get(5);
1936 } 1859 }
1937 1860
1938 /** 1861 /**
@@ -1942,7 +1865,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1942 */ 1865 */
1943 @Override 1866 @Override
1944 public EAttribute getTax_Card_Jobs_Employer_SSNo() { 1867 public EAttribute getTax_Card_Jobs_Employer_SSNo() {
1945 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7); 1868 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(6);
1946 } 1869 }
1947 1870
1948 /** 1871 /**
@@ -1952,7 +1875,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1952 */ 1875 */
1953 @Override 1876 @Override
1954 public EAttribute getTax_Card_Jobs_employers_name() { 1877 public EAttribute getTax_Card_Jobs_employers_name() {
1955 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8); 1878 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(7);
1956 } 1879 }
1957 1880
1958 /** 1881 /**
@@ -1962,7 +1885,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1962 */ 1885 */
1963 @Override 1886 @Override
1964 public EAttribute getTax_Card_Jobs_activity_type() { 1887 public EAttribute getTax_Card_Jobs_activity_type() {
1965 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9); 1888 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(8);
1966 } 1889 }
1967 1890
1968 /** 1891 /**
@@ -1972,7 +1895,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1972 */ 1895 */
1973 @Override 1896 @Override
1974 public EAttribute getTax_Card_Jobs_place_of_work() { 1897 public EAttribute getTax_Card_Jobs_place_of_work() {
1975 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10); 1898 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(9);
1976 } 1899 }
1977 1900
1978 /** 1901 /**
@@ -1982,7 +1905,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1982 */ 1905 */
1983 @Override 1906 @Override
1984 public EAttribute getTax_Card_Deduction_FD_daily() { 1907 public EAttribute getTax_Card_Deduction_FD_daily() {
1985 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11); 1908 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(10);
1986 } 1909 }
1987 1910
1988 /** 1911 /**
@@ -1992,7 +1915,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
1992 */ 1915 */
1993 @Override 1916 @Override
1994 public EAttribute getTax_Card_Deduction_FD_monthly() { 1917 public EAttribute getTax_Card_Deduction_FD_monthly() {
1995 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12); 1918 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(11);
1996 } 1919 }
1997 1920
1998 /** 1921 /**
@@ -2002,7 +1925,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2002 */ 1925 */
2003 @Override 1926 @Override
2004 public EAttribute getTax_Card_Deduction_AC_daily() { 1927 public EAttribute getTax_Card_Deduction_AC_daily() {
2005 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13); 1928 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(12);
2006 } 1929 }
2007 1930
2008 /** 1931 /**
@@ -2012,7 +1935,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2012 */ 1935 */
2013 @Override 1936 @Override
2014 public EAttribute getTax_Card_Deduction_AC_monthly() { 1937 public EAttribute getTax_Card_Deduction_AC_monthly() {
2015 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14); 1938 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(13);
2016 } 1939 }
2017 1940
2018 /** 1941 /**
@@ -2022,7 +1945,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2022 */ 1945 */
2023 @Override 1946 @Override
2024 public EAttribute getTax_Card_Deduction_AC_yearly() { 1947 public EAttribute getTax_Card_Deduction_AC_yearly() {
2025 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15); 1948 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(14);
2026 } 1949 }
2027 1950
2028 /** 1951 /**
@@ -2032,7 +1955,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2032 */ 1955 */
2033 @Override 1956 @Override
2034 public EAttribute getTax_Card_Deduction_CE_daily() { 1957 public EAttribute getTax_Card_Deduction_CE_daily() {
2035 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16); 1958 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(15);
2036 } 1959 }
2037 1960
2038 /** 1961 /**
@@ -2042,7 +1965,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2042 */ 1965 */
2043 @Override 1966 @Override
2044 public EAttribute getTax_Card_Deduction_CE_monthly() { 1967 public EAttribute getTax_Card_Deduction_CE_monthly() {
2045 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17); 1968 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(16);
2046 } 1969 }
2047 1970
2048 /** 1971 /**
@@ -2052,7 +1975,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2052 */ 1975 */
2053 @Override 1976 @Override
2054 public EAttribute getTax_Card_Deduction_CE_yearly() { 1977 public EAttribute getTax_Card_Deduction_CE_yearly() {
2055 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18); 1978 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(17);
2056 } 1979 }
2057 1980
2058 /** 1981 /**
@@ -2062,7 +1985,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2062 */ 1985 */
2063 @Override 1986 @Override
2064 public EAttribute getTax_Card_Deduction_DS_daily() { 1987 public EAttribute getTax_Card_Deduction_DS_daily() {
2065 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19); 1988 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(18);
2066 } 1989 }
2067 1990
2068 /** 1991 /**
@@ -2072,7 +1995,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2072 */ 1995 */
2073 @Override 1996 @Override
2074 public EAttribute getTax_Card_Deduction_DS_monthly() { 1997 public EAttribute getTax_Card_Deduction_DS_monthly() {
2075 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20); 1998 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(19);
2076 } 1999 }
2077 2000
2078 /** 2001 /**
@@ -2082,7 +2005,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2082 */ 2005 */
2083 @Override 2006 @Override
2084 public EAttribute getTax_Card_Deduction_FO_daily() { 2007 public EAttribute getTax_Card_Deduction_FO_daily() {
2085 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21); 2008 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(20);
2086 } 2009 }
2087 2010
2088 /** 2011 /**
@@ -2092,7 +2015,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2092 */ 2015 */
2093 @Override 2016 @Override
2094 public EAttribute getTax_Card_Deduction_FO_monthly() { 2017 public EAttribute getTax_Card_Deduction_FO_monthly() {
2095 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22); 2018 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(21);
2096 } 2019 }
2097 2020
2098 /** 2021 /**
@@ -2102,7 +2025,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2102 */ 2025 */
2103 @Override 2026 @Override
2104 public EAttribute getTax_Card_Deduction_FO_yearly() { 2027 public EAttribute getTax_Card_Deduction_FO_yearly() {
2105 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23); 2028 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(22);
2106 } 2029 }
2107 2030
2108 /** 2031 /**
@@ -2112,7 +2035,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2112 */ 2035 */
2113 @Override 2036 @Override
2114 public EAttribute getTax_Card_Credit_CIS_daily() { 2037 public EAttribute getTax_Card_Credit_CIS_daily() {
2115 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24); 2038 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(23);
2116 } 2039 }
2117 2040
2118 /** 2041 /**
@@ -2122,7 +2045,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2122 */ 2045 */
2123 @Override 2046 @Override
2124 public EAttribute getTax_Card_Credit_CIS_monthly() { 2047 public EAttribute getTax_Card_Credit_CIS_monthly() {
2125 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25); 2048 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(24);
2126 } 2049 }
2127 2050
2128 /** 2051 /**
@@ -2132,7 +2055,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2132 */ 2055 */
2133 @Override 2056 @Override
2134 public EAttribute getTax_Card_Credit_CIM_daily() { 2057 public EAttribute getTax_Card_Credit_CIM_daily() {
2135 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26); 2058 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(25);
2136 } 2059 }
2137 2060
2138 /** 2061 /**
@@ -2142,7 +2065,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2142 */ 2065 */
2143 @Override 2066 @Override
2144 public EAttribute getTax_Card_Validity() { 2067 public EAttribute getTax_Card_Validity() {
2145 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(27); 2068 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(26);
2146 } 2069 }
2147 2070
2148 /** 2071 /**
@@ -2152,7 +2075,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2152 */ 2075 */
2153 @Override 2076 @Override
2154 public EReference getTax_Card_Income_Tax_Credit() { 2077 public EReference getTax_Card_Income_Tax_Credit() {
2155 return (EReference)tax_CardEClass.getEStructuralFeatures().get(28); 2078 return (EReference)tax_CardEClass.getEStructuralFeatures().get(27);
2156 } 2079 }
2157 2080
2158 /** 2081 /**
@@ -2162,7 +2085,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2162 */ 2085 */
2163 @Override 2086 @Override
2164 public EReference getTax_Card_Previous() { 2087 public EReference getTax_Card_Previous() {
2165 return (EReference)tax_CardEClass.getEStructuralFeatures().get(29); 2088 return (EReference)tax_CardEClass.getEStructuralFeatures().get(28);
2166 } 2089 }
2167 2090
2168 /** 2091 /**
@@ -2172,7 +2095,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2172 */ 2095 */
2173 @Override 2096 @Override
2174 public EReference getTax_Card_Current_tax_card() { 2097 public EReference getTax_Card_Current_tax_card() {
2175 return (EReference)tax_CardEClass.getEStructuralFeatures().get(30); 2098 return (EReference)tax_CardEClass.getEStructuralFeatures().get(29);
2176 } 2099 }
2177 2100
2178 /** 2101 /**
@@ -2182,7 +2105,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2182 */ 2105 */
2183 @Override 2106 @Override
2184 public EAttribute getTax_Card_Credit_CIM_yearly() { 2107 public EAttribute getTax_Card_Credit_CIM_yearly() {
2185 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31); 2108 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(30);
2186 } 2109 }
2187 2110
2188 /** 2111 /**
@@ -2192,7 +2115,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2192 */ 2115 */
2193 @Override 2116 @Override
2194 public EAttribute getTax_Card_Deduction_DS_Alimony_yearly() { 2117 public EAttribute getTax_Card_Deduction_DS_Alimony_yearly() {
2195 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32); 2118 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(31);
2196 } 2119 }
2197 2120
2198 /** 2121 /**
@@ -2202,7 +2125,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2202 */ 2125 */
2203 @Override 2126 @Override
2204 public EAttribute getTax_Card_Deduction_DS_Debt_yearly() { 2127 public EAttribute getTax_Card_Deduction_DS_Debt_yearly() {
2205 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(33); 2128 return (EAttribute)tax_CardEClass.getEStructuralFeatures().get(32);
2206 } 2129 }
2207 2130
2208 /** 2131 /**
@@ -2212,7 +2135,7 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2212 */ 2135 */
2213 @Override 2136 @Override
2214 public EReference getTax_Card_Income() { 2137 public EReference getTax_Card_Income() {
2215 return (EReference)tax_CardEClass.getEStructuralFeatures().get(34); 2138 return (EReference)tax_CardEClass.getEStructuralFeatures().get(33);
2216 } 2139 }
2217 2140
2218 /** 2141 /**
@@ -2641,16 +2564,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2641 * @generated 2564 * @generated
2642 */ 2565 */
2643 @Override 2566 @Override
2644 public EAttribute getFD_Calculated_distance() {
2645 return (EAttribute)fdEClass.getEStructuralFeatures().get(1);
2646 }
2647
2648 /**
2649 * <!-- begin-user-doc -->
2650 * <!-- end-user-doc -->
2651 * @generated
2652 */
2653 @Override
2654 public EClass getProfessional_Expenses_Deduction() { 2567 public EClass getProfessional_Expenses_Deduction() {
2655 return professional_Expenses_DeductionEClass; 2568 return professional_Expenses_DeductionEClass;
2656 } 2569 }
@@ -2671,16 +2584,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2671 * @generated 2584 * @generated
2672 */ 2585 */
2673 @Override 2586 @Override
2674 public EAttribute getFO_Rate_type_for_FO() {
2675 return (EAttribute)foEClass.getEStructuralFeatures().get(0);
2676 }
2677
2678 /**
2679 * <!-- begin-user-doc -->
2680 * <!-- end-user-doc -->
2681 * @generated
2682 */
2683 @Override
2684 public EClass getDS_for_Permanent_Expense() { 2587 public EClass getDS_for_Permanent_Expense() {
2685 return dS_for_Permanent_ExpenseEClass; 2588 return dS_for_Permanent_ExpenseEClass;
2686 } 2589 }
@@ -2781,36 +2684,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2781 * @generated 2684 * @generated
2782 */ 2685 */
2783 @Override 2686 @Override
2784 public EAttribute getDS_for_Private_Insurance_and_Plan_Increase_for_life_insurance() {
2785 return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(1);
2786 }
2787
2788 /**
2789 * <!-- begin-user-doc -->
2790 * <!-- end-user-doc -->
2791 * @generated
2792 */
2793 @Override
2794 public EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_private_insurance() {
2795 return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(2);
2796 }
2797
2798 /**
2799 * <!-- begin-user-doc -->
2800 * <!-- end-user-doc -->
2801 * @generated
2802 */
2803 @Override
2804 public EAttribute getDS_for_Private_Insurance_and_Plan_Maximum_deductible_amount_for_old_age_pension_plan() {
2805 return (EAttribute)dS_for_Private_Insurance_and_PlanEClass.getEStructuralFeatures().get(3);
2806 }
2807
2808 /**
2809 * <!-- begin-user-doc -->
2810 * <!-- end-user-doc -->
2811 * @generated
2812 */
2813 @Override
2814 public EClass getDS_for_Loss_Carryforward() { 2687 public EClass getDS_for_Loss_Carryforward() {
2815 return dS_for_Loss_CarryforwardEClass; 2688 return dS_for_Loss_CarryforwardEClass;
2816 } 2689 }
@@ -2851,16 +2724,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2851 * @generated 2724 * @generated
2852 */ 2725 */
2853 @Override 2726 @Override
2854 public EAttribute getPermanent_Expense_Is_eligible_for_deduction() {
2855 return (EAttribute)permanent_ExpenseEClass.getEStructuralFeatures().get(1);
2856 }
2857
2858 /**
2859 * <!-- begin-user-doc -->
2860 * <!-- end-user-doc -->
2861 * @generated
2862 */
2863 @Override
2864 public EClass getSpecial_Expense_DS() { 2727 public EClass getSpecial_Expense_DS() {
2865 return special_Expense_DSEClass; 2728 return special_Expense_DSEClass;
2866 } 2729 }
@@ -2911,16 +2774,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2911 * @generated 2774 * @generated
2912 */ 2775 */
2913 @Override 2776 @Override
2914 public EAttribute getPrivate_Insurance_and_Plan_Is_private_insurance_and_plan_eligible_for_deduction() {
2915 return (EAttribute)private_Insurance_and_PlanEClass.getEStructuralFeatures().get(2);
2916 }
2917
2918 /**
2919 * <!-- begin-user-doc -->
2920 * <!-- end-user-doc -->
2921 * @generated
2922 */
2923 @Override
2924 public EClass getHealth_and_Pension_Insurance() { 2777 public EClass getHealth_and_Pension_Insurance() {
2925 return health_and_Pension_InsuranceEClass; 2778 return health_and_Pension_InsuranceEClass;
2926 } 2779 }
@@ -2971,18 +2824,8 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
2971 * @generated 2824 * @generated
2972 */ 2825 */
2973 @Override 2826 @Override
2974 public EAttribute getDonation_Is_beneficiary_eligible() {
2975 return (EAttribute)donationEClass.getEStructuralFeatures().get(1);
2976 }
2977
2978 /**
2979 * <!-- begin-user-doc -->
2980 * <!-- end-user-doc -->
2981 * @generated
2982 */
2983 @Override
2984 public EAttribute getDonation_Is_donation_reported() { 2827 public EAttribute getDonation_Is_donation_reported() {
2985 return (EAttribute)donationEClass.getEStructuralFeatures().get(2); 2828 return (EAttribute)donationEClass.getEStructuralFeatures().get(1);
2986 } 2829 }
2987 2830
2988 /** 2831 /**
@@ -3001,46 +2844,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3001 * @generated 2844 * @generated
3002 */ 2845 */
3003 @Override 2846 @Override
3004 public EAttribute getLoss_Carryforward_Regular_accountability() {
3005 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(0);
3006 }
3007
3008 /**
3009 * <!-- begin-user-doc -->
3010 * <!-- end-user-doc -->
3011 * @generated
3012 */
3013 @Override
3014 public EAttribute getLoss_Carryforward_Compensation_by_other_means() {
3015 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(1);
3016 }
3017
3018 /**
3019 * <!-- begin-user-doc -->
3020 * <!-- end-user-doc -->
3021 * @generated
3022 */
3023 @Override
3024 public EAttribute getLoss_Carryforward_Tax_payer_has_inherited_business_ownership() {
3025 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(2);
3026 }
3027
3028 /**
3029 * <!-- begin-user-doc -->
3030 * <!-- end-user-doc -->
3031 * @generated
3032 */
3033 @Override
3034 public EAttribute getLoss_Carryforward_Tax_payer_has_been_partner_in_business() {
3035 return (EAttribute)loss_CarryforwardEClass.getEStructuralFeatures().get(3);
3036 }
3037
3038 /**
3039 * <!-- begin-user-doc -->
3040 * <!-- end-user-doc -->
3041 * @generated
3042 */
3043 @Override
3044 public EClass getSpousal_Expense_AC() { 2847 public EClass getSpousal_Expense_AC() {
3045 return spousal_Expense_ACEClass; 2848 return spousal_Expense_ACEClass;
3046 } 2849 }
@@ -3141,16 +2944,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3141 * @generated 2944 * @generated
3142 */ 2945 */
3143 @Override 2946 @Override
3144 public EEnum getTax_Card_Type() {
3145 return tax_Card_TypeEEnum;
3146 }
3147
3148 /**
3149 * <!-- begin-user-doc -->
3150 * <!-- end-user-doc -->
3151 * @generated
3152 */
3153 @Override
3154 public EEnum getTax_Office() { 2947 public EEnum getTax_Office() {
3155 return tax_OfficeEEnum; 2948 return tax_OfficeEEnum;
3156 } 2949 }
@@ -3191,16 +2984,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3191 * @generated 2984 * @generated
3192 */ 2985 */
3193 @Override 2986 @Override
3194 public EEnum getType_of_Rate() {
3195 return type_of_RateEEnum;
3196 }
3197
3198 /**
3199 * <!-- begin-user-doc -->
3200 * <!-- end-user-doc -->
3201 * @generated
3202 */
3203 @Override
3204 public EEnum getCE_Type() { 2987 public EEnum getCE_Type() {
3205 return cE_TypeEEnum; 2988 return cE_TypeEEnum;
3206 } 2989 }
@@ -3342,16 +3125,13 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3342 createEReference(tax_PayerEClass, TAX_PAYER__FROM_AGENT); 3125 createEReference(tax_PayerEClass, TAX_PAYER__FROM_AGENT);
3343 createEReference(tax_PayerEClass, TAX_PAYER__INCOMES); 3126 createEReference(tax_PayerEClass, TAX_PAYER__INCOMES);
3344 createEReference(tax_PayerEClass, TAX_PAYER__FROM_LAW); 3127 createEReference(tax_PayerEClass, TAX_PAYER__FROM_LAW);
3345 createEAttribute(tax_PayerEClass, TAX_PAYER__TAXES_DUE);
3346 3128
3347 physical_PersonEClass = createEClass(PHYSICAL_PERSON); 3129 physical_PersonEClass = createEClass(PHYSICAL_PERSON);
3348 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_ASSISTING_SPOUSE);
3349 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__SS_NO); 3130 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__SS_NO);
3350 createEReference(physical_PersonEClass, PHYSICAL_PERSON__ADDRESSES); 3131 createEReference(physical_PersonEClass, PHYSICAL_PERSON__ADDRESSES);
3351 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_YEAR); 3132 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_YEAR);
3352 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_PERCENTAGE); 3133 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_PERCENTAGE);
3353 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_TYPE); 3134 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__DISABILITY_TYPE);
3354 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__IS_AFFILIATED_PERSONNALY_TO_SOCIAL_SECURITY);
3355 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_MONTH); 3135 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_MONTH);
3356 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_DAY); 3136 createEAttribute(physical_PersonEClass, PHYSICAL_PERSON__BIRTH_DAY);
3357 createEReference(physical_PersonEClass, PHYSICAL_PERSON__EXPENSES); 3137 createEReference(physical_PersonEClass, PHYSICAL_PERSON__EXPENSES);
@@ -3384,7 +3164,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3384 createEReference(dependentEClass, DEPENDENT__EXPENSE); 3164 createEReference(dependentEClass, DEPENDENT__EXPENSE);
3385 3165
3386 external_AllowanceEClass = createEClass(EXTERNAL_ALLOWANCE); 3166 external_AllowanceEClass = createEClass(EXTERNAL_ALLOWANCE);
3387 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__AMOUNT);
3388 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__GRANTOR); 3167 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__GRANTOR);
3389 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__STARTING_YEAR); 3168 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__STARTING_YEAR);
3390 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__ENDING_YEAR); 3169 createEAttribute(external_AllowanceEClass, EXTERNAL_ALLOWANCE__ENDING_YEAR);
@@ -3433,13 +3212,11 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3433 createEReference(incomeEClass, INCOME__EXPENSES); 3212 createEReference(incomeEClass, INCOME__EXPENSES);
3434 3213
3435 income_TypeEClass = createEClass(INCOME_TYPE); 3214 income_TypeEClass = createEClass(INCOME_TYPE);
3436 createEAttribute(income_TypeEClass, INCOME_TYPE__SUBJECT_TO_WITHHOLDING_TAX);
3437 createEAttribute(income_TypeEClass, INCOME_TYPE__ID8); 3215 createEAttribute(income_TypeEClass, INCOME_TYPE__ID8);
3438 createEReference(income_TypeEClass, INCOME_TYPE__INCOME); 3216 createEReference(income_TypeEClass, INCOME_TYPE__INCOME);
3439 3217
3440 tax_CardEClass = createEClass(TAX_CARD); 3218 tax_CardEClass = createEClass(TAX_CARD);
3441 createEAttribute(tax_CardEClass, TAX_CARD__CARD_IDENTIFIER); 3219 createEAttribute(tax_CardEClass, TAX_CARD__CARD_IDENTIFIER);
3442 createEAttribute(tax_CardEClass, TAX_CARD__TAX_CARD_TYPE);
3443 createEAttribute(tax_CardEClass, TAX_CARD__TAX_OFFICE); 3220 createEAttribute(tax_CardEClass, TAX_CARD__TAX_OFFICE);
3444 createEAttribute(tax_CardEClass, TAX_CARD__PERCENTAGE_OF_WITHOLDING); 3221 createEAttribute(tax_CardEClass, TAX_CARD__PERCENTAGE_OF_WITHOLDING);
3445 createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_NAME_SURNAME); 3222 createEAttribute(tax_CardEClass, TAX_CARD__TAX_PAYERS_NAME_SURNAME);
@@ -3536,12 +3313,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3536 3313
3537 fdEClass = createEClass(FD); 3314 fdEClass = createEClass(FD);
3538 createEAttribute(fdEClass, FD__DISTANCE_DECLARED_IN_JANUARY); 3315 createEAttribute(fdEClass, FD__DISTANCE_DECLARED_IN_JANUARY);
3539 createEAttribute(fdEClass, FD__CALCULATED_DISTANCE);
3540 3316
3541 professional_Expenses_DeductionEClass = createEClass(PROFESSIONAL_EXPENSES_DEDUCTION); 3317 professional_Expenses_DeductionEClass = createEClass(PROFESSIONAL_EXPENSES_DEDUCTION);
3542 3318
3543 foEClass = createEClass(FO); 3319 foEClass = createEClass(FO);
3544 createEAttribute(foEClass, FO__RATE_TYPE_FOR_FO);
3545 3320
3546 dS_for_Permanent_ExpenseEClass = createEClass(DS_FOR_PERMANENT_EXPENSE); 3321 dS_for_Permanent_ExpenseEClass = createEClass(DS_FOR_PERMANENT_EXPENSE);
3547 createEAttribute(dS_for_Permanent_ExpenseEClass, DS_FOR_PERMANENT_EXPENSE__PERMANENT_EXPENSE_CATEGORY); 3322 createEAttribute(dS_for_Permanent_ExpenseEClass, DS_FOR_PERMANENT_EXPENSE__PERMANENT_EXPENSE_CATEGORY);
@@ -3557,9 +3332,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3557 3332
3558 dS_for_Private_Insurance_and_PlanEClass = createEClass(DS_FOR_PRIVATE_INSURANCE_AND_PLAN); 3333 dS_for_Private_Insurance_and_PlanEClass = createEClass(DS_FOR_PRIVATE_INSURANCE_AND_PLAN);
3559 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY); 3334 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__PRIVATE_INSURANCE_AND_PLAN_CATEGORY);
3560 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__INCREASE_FOR_LIFE_INSURANCE);
3561 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_PRIVATE_INSURANCE);
3562 createEAttribute(dS_for_Private_Insurance_and_PlanEClass, DS_FOR_PRIVATE_INSURANCE_AND_PLAN__MAXIMUM_DEDUCTIBLE_AMOUNT_FOR_OLD_AGE_PENSION_PLAN);
3563 3335
3564 dS_for_Loss_CarryforwardEClass = createEClass(DS_FOR_LOSS_CARRYFORWARD); 3336 dS_for_Loss_CarryforwardEClass = createEClass(DS_FOR_LOSS_CARRYFORWARD);
3565 3337
@@ -3567,7 +3339,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3567 3339
3568 permanent_ExpenseEClass = createEClass(PERMANENT_EXPENSE); 3340 permanent_ExpenseEClass = createEClass(PERMANENT_EXPENSE);
3569 createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__CATEGORY); 3341 createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__CATEGORY);
3570 createEAttribute(permanent_ExpenseEClass, PERMANENT_EXPENSE__IS_ELIGIBLE_FOR_DEDUCTION);
3571 3342
3572 special_Expense_DSEClass = createEClass(SPECIAL_EXPENSE_DS); 3343 special_Expense_DSEClass = createEClass(SPECIAL_EXPENSE_DS);
3573 3344
@@ -3576,7 +3347,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3576 private_Insurance_and_PlanEClass = createEClass(PRIVATE_INSURANCE_AND_PLAN); 3347 private_Insurance_and_PlanEClass = createEClass(PRIVATE_INSURANCE_AND_PLAN);
3577 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__CATEGORY); 3348 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__CATEGORY);
3578 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT); 3349 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__DURATION_OF_CONTRACT);
3579 createEAttribute(private_Insurance_and_PlanEClass, PRIVATE_INSURANCE_AND_PLAN__IS_PRIVATE_INSURANCE_AND_PLAN_ELIGIBLE_FOR_DEDUCTION);
3580 3350
3581 health_and_Pension_InsuranceEClass = createEClass(HEALTH_AND_PENSION_INSURANCE); 3351 health_and_Pension_InsuranceEClass = createEClass(HEALTH_AND_PENSION_INSURANCE);
3582 createEAttribute(health_and_Pension_InsuranceEClass, HEALTH_AND_PENSION_INSURANCE__CATEGORY); 3352 createEAttribute(health_and_Pension_InsuranceEClass, HEALTH_AND_PENSION_INSURANCE__CATEGORY);
@@ -3584,14 +3354,9 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3584 3354
3585 donationEClass = createEClass(DONATION); 3355 donationEClass = createEClass(DONATION);
3586 createEAttribute(donationEClass, DONATION__BENEFICIARY1); 3356 createEAttribute(donationEClass, DONATION__BENEFICIARY1);
3587 createEAttribute(donationEClass, DONATION__IS_BENEFICIARY_ELIGIBLE);
3588 createEAttribute(donationEClass, DONATION__IS_DONATION_REPORTED); 3357 createEAttribute(donationEClass, DONATION__IS_DONATION_REPORTED);
3589 3358
3590 loss_CarryforwardEClass = createEClass(LOSS_CARRYFORWARD); 3359 loss_CarryforwardEClass = createEClass(LOSS_CARRYFORWARD);
3591 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__REGULAR_ACCOUNTABILITY);
3592 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__COMPENSATION_BY_OTHER_MEANS);
3593 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__TAX_PAYER_HAS_INHERITED_BUSINESS_OWNERSHIP);
3594 createEAttribute(loss_CarryforwardEClass, LOSS_CARRYFORWARD__TAX_PAYER_HAS_BEEN_PARTNER_IN_BUSINESS);
3595 3360
3596 spousal_Expense_ACEClass = createEClass(SPOUSAL_EXPENSE_AC); 3361 spousal_Expense_ACEClass = createEClass(SPOUSAL_EXPENSE_AC);
3597 3362
@@ -3609,12 +3374,10 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3609 grantorEEnum = createEEnum(GRANTOR); 3374 grantorEEnum = createEEnum(GRANTOR);
3610 disability_TypesEEnum = createEEnum(DISABILITY_TYPES); 3375 disability_TypesEEnum = createEEnum(DISABILITY_TYPES);
3611 countryEEnum = createEEnum(COUNTRY); 3376 countryEEnum = createEEnum(COUNTRY);
3612 tax_Card_TypeEEnum = createEEnum(TAX_CARD_TYPE);
3613 tax_OfficeEEnum = createEEnum(TAX_OFFICE); 3377 tax_OfficeEEnum = createEEnum(TAX_OFFICE);
3614 tax_Class_CategoryEEnum = createEEnum(TAX_CLASS_CATEGORY); 3378 tax_Class_CategoryEEnum = createEEnum(TAX_CLASS_CATEGORY);
3615 job_ActivityEEnum = createEEnum(JOB_ACTIVITY); 3379 job_ActivityEEnum = createEEnum(JOB_ACTIVITY);
3616 townEEnum = createEEnum(TOWN); 3380 townEEnum = createEEnum(TOWN);
3617 type_of_RateEEnum = createEEnum(TYPE_OF_RATE);
3618 cE_TypeEEnum = createEEnum(CE_TYPE); 3381 cE_TypeEEnum = createEEnum(CE_TYPE);
3619 expense_PurposeEEnum = createEEnum(EXPENSE_PURPOSE); 3382 expense_PurposeEEnum = createEEnum(EXPENSE_PURPOSE);
3620 dependent_TypeEEnum = createEEnum(DEPENDENT_TYPE); 3383 dependent_TypeEEnum = createEEnum(DEPENDENT_TYPE);
@@ -3734,16 +3497,13 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3734 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); 3497 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);
3735 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); 3498 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);
3736 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); 3499 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);
3737 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);
3738 3500
3739 initEClass(physical_PersonEClass, Physical_Person.class, "Physical_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3501 initEClass(physical_PersonEClass, Physical_Person.class, "Physical_Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3740 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);
3741 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); 3502 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);
3742 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); 3503 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);
3743 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); 3504 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);
3744 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); 3505 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);
3745 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); 3506 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);
3746 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);
3747 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); 3507 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);
3748 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); 3508 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);
3749 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); 3509 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
3776 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); 3536 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);
3777 3537
3778 initEClass(external_AllowanceEClass, External_Allowance.class, "External_Allowance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3538 initEClass(external_AllowanceEClass, External_Allowance.class, "External_Allowance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3779 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);
3780 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); 3539 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);
3781 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); 3540 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);
3782 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); 3541 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
3825 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); 3584 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);
3826 3585
3827 initEClass(income_TypeEClass, Income_Type.class, "Income_Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3586 initEClass(income_TypeEClass, Income_Type.class, "Income_Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3828 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);
3829 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); 3587 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);
3830 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); 3588 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);
3831 3589
3832 initEClass(tax_CardEClass, Tax_Card.class, "Tax_Card", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3590 initEClass(tax_CardEClass, Tax_Card.class, "Tax_Card", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3833 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); 3591 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);
3834 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);
3835 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); 3592 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);
3836 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); 3593 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);
3837 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); 3594 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
3928 3685
3929 initEClass(fdEClass, Taxation.FD.class, "FD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3686 initEClass(fdEClass, Taxation.FD.class, "FD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3930 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); 3687 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);
3931 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);
3932 3688
3933 initEClass(professional_Expenses_DeductionEClass, Professional_Expenses_Deduction.class, "Professional_Expenses_Deduction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3689 initEClass(professional_Expenses_DeductionEClass, Professional_Expenses_Deduction.class, "Professional_Expenses_Deduction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3934 3690
3935 initEClass(foEClass, Taxation.FO.class, "FO", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3691 initEClass(foEClass, Taxation.FO.class, "FO", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3936 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);
3937 3692
3938 initEClass(dS_for_Permanent_ExpenseEClass, DS_for_Permanent_Expense.class, "DS_for_Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3693 initEClass(dS_for_Permanent_ExpenseEClass, DS_for_Permanent_Expense.class, "DS_for_Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3939 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); 3694 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
3949 3704
3950 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); 3705 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);
3951 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); 3706 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);
3952 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);
3953 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);
3954 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);
3955 3707
3956 initEClass(dS_for_Loss_CarryforwardEClass, DS_for_Loss_Carryforward.class, "DS_for_Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3708 initEClass(dS_for_Loss_CarryforwardEClass, DS_for_Loss_Carryforward.class, "DS_for_Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3957 3709
@@ -3959,7 +3711,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3959 3711
3960 initEClass(permanent_ExpenseEClass, Permanent_Expense.class, "Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3712 initEClass(permanent_ExpenseEClass, Permanent_Expense.class, "Permanent_Expense", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3961 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); 3713 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);
3962 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);
3963 3714
3964 initEClass(special_Expense_DSEClass, Special_Expense_DS.class, "Special_Expense_DS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3715 initEClass(special_Expense_DSEClass, Special_Expense_DS.class, "Special_Expense_DS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3965 3716
@@ -3968,7 +3719,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
3968 initEClass(private_Insurance_and_PlanEClass, Private_Insurance_and_Plan.class, "Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3719 initEClass(private_Insurance_and_PlanEClass, Private_Insurance_and_Plan.class, "Private_Insurance_and_Plan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3969 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); 3720 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);
3970 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); 3721 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);
3971 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);
3972 3722
3973 initEClass(health_and_Pension_InsuranceEClass, Health_and_Pension_Insurance.class, "Health_and_Pension_Insurance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3723 initEClass(health_and_Pension_InsuranceEClass, Health_and_Pension_Insurance.class, "Health_and_Pension_Insurance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3974 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); 3724 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
3976 3726
3977 initEClass(donationEClass, Donation.class, "Donation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3727 initEClass(donationEClass, Donation.class, "Donation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3978 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); 3728 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);
3979 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);
3980 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); 3729 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);
3981 3730
3982 initEClass(loss_CarryforwardEClass, Loss_Carryforward.class, "Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3731 initEClass(loss_CarryforwardEClass, Loss_Carryforward.class, "Loss_Carryforward", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3983 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);
3984 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);
3985 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);
3986 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);
3987 3732
3988 initEClass(spousal_Expense_ACEClass, Spousal_Expense_AC.class, "Spousal_Expense_AC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 3733 initEClass(spousal_Expense_ACEClass, Spousal_Expense_AC.class, "Spousal_Expense_AC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
3989 3734
@@ -4024,10 +3769,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
4024 addEEnumLiteral(countryEEnum, Country.NN); 3769 addEEnumLiteral(countryEEnum, Country.NN);
4025 addEEnumLiteral(countryEEnum, Country.OTHER); 3770 addEEnumLiteral(countryEEnum, Country.OTHER);
4026 3771
4027 initEEnum(tax_Card_TypeEEnum, Tax_Card_Type.class, "Tax_Card_Type");
4028 addEEnumLiteral(tax_Card_TypeEEnum, Tax_Card_Type.PRINCIPAL);
4029 addEEnumLiteral(tax_Card_TypeEEnum, Tax_Card_Type.ADDITIONAL);
4030
4031 initEEnum(tax_OfficeEEnum, Tax_Office.class, "Tax_Office"); 3772 initEEnum(tax_OfficeEEnum, Tax_Office.class, "Tax_Office");
4032 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_2); 3773 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_2);
4033 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_3); 3774 addEEnumLiteral(tax_OfficeEEnum, Tax_Office.RTS_3);
@@ -4051,10 +3792,6 @@ public class TaxationPackageImpl extends EPackageImpl implements TaxationPackage
4051 addEEnumLiteral(townEEnum, Town.TT); 3792 addEEnumLiteral(townEEnum, Town.TT);
4052 addEEnumLiteral(townEEnum, Town.OTHER); 3793 addEEnumLiteral(townEEnum, Town.OTHER);
4053 3794
4054 initEEnum(type_of_RateEEnum, Type_of_Rate.class, "Type_of_Rate");
4055 addEEnumLiteral(type_of_RateEEnum, Type_of_Rate.REGULAR);
4056 addEEnumLiteral(type_of_RateEEnum, Type_of_Rate.REAL_COST);
4057
4058 initEEnum(cE_TypeEEnum, CE_Type.class, "CE_Type"); 3795 initEEnum(cE_TypeEEnum, CE_Type.class, "CE_Type");
4059 addEEnumLiteral(cE_TypeEEnum, CE_Type.INALIDITY_AND_INFIRMITY); 3796 addEEnumLiteral(cE_TypeEEnum, CE_Type.INALIDITY_AND_INFIRMITY);
4060 addEEnumLiteral(cE_TypeEEnum, CE_Type.DEPENDENCE_AND_CARE_EXCLUDING_CHLIDREN_NOT_PART_OF_HOUSEHOLD); 3797 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
4183 new String[] { 3920 new String[] {
4184 "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()" 3921 "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()"
4185 }); 3922 });
4186 addAnnotation
4187 (getIncome_Type_SubjectToWithholdingTax(),
4188 source,
4189 new String[] {
4190 "derivation", "\n\t\t\t\tself.income.tax_card->notEmpty()\n\t\t\t\t"
4191 });
4192 addAnnotation
4193 (getTax_Card_Tax_card_type(),
4194 source,
4195 new String[] {
4196 "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"
4197 });
4198 } 3923 }
4199 3924
4200} //TaxationPackageImpl 3925} //TaxationPackageImpl
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-23 15:54:54 +0000