Skip to content

Commit 767d519

Browse files
seidewitzseidewitz
authored
Merge pull request #499 from Systems-Modeling/ST6RI-707
ST6RI-707 Defaults are wrong for various "kind" properties
2 parents 3351cef + b390e7c commit 767d519

6 files changed

Lines changed: 61 additions & 17 deletions

‎org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FramedConcernMembershipImpl.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.eclipse.emf.ecore.EClass;
2525
import org.eclipse.emf.ecore.EStructuralFeature;
2626
import org.omg.sysml.lang.sysml.FramedConcernMembership;
27+
import org.omg.sysml.lang.sysml.RequirementConstraintKind;
2728
import org.omg.sysml.lang.sysml.ConcernUsage;
2829
import org.omg.sysml.lang.sysml.ConstraintUsage;
2930
import org.omg.sysml.lang.sysml.SysMLPackage;
@@ -157,6 +158,26 @@ public boolean isSetReferencedConcern() {
157158
return basicGetReferencedConcern() != null;
158159
}
159160

161+
// Additional Overrides
162+
163+
@Override
164+
public RequirementConstraintKind getKind() {
165+
return RequirementConstraintKind.REQUIREMENT;
166+
}
167+
168+
/**
169+
* <!-- begin-user-doc -->
170+
* Consider the "kind" property to never be explicitly "set".
171+
* <!-- end-user-doc -->
172+
* @generated NOT
173+
*/
174+
@Override
175+
public boolean eIsSet(int featureID) {
176+
return featureID != SysMLPackage.REQUIREMENT_CONSTRAINT_MEMBERSHIP__KIND && eIsSetGen(featureID);
177+
}
178+
179+
//
180+
160181
/**
161182
* <!-- begin-user-doc -->
162183
* <!-- end-user-doc -->
@@ -216,8 +237,7 @@ public void eUnset(int featureID) {
216237
* <!-- end-user-doc -->
217238
* @generated
218239
*/
219-
@Override
220-
public boolean eIsSet(int featureID) {
240+
public boolean eIsSetGen(int featureID) {
221241
switch (featureID) {
222242
case SysMLPackage.FRAMED_CONCERN_MEMBERSHIP__OWNED_CONSTRAINT:
223243
return isSetOwnedConstraint();

‎org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RequirementConstraintMembershipImpl.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* SysML 2 Pilot Implementation
3-
* Copyright (c) 2020-2022 Model Driven Solutions, Inc.
3+
* Copyright (c) 2020-2023 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -53,13 +53,14 @@ public class RequirementConstraintMembershipImpl extends FeatureMembershipImpl i
5353
/**
5454
* The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
5555
* <!-- begin-user-doc -->
56+
* Even though the "kind" property is mandatory, the abstract syntax does not specify a default for it.
5657
* <!-- end-user-doc -->
5758
* @see #getKind()
58-
* @generated
59+
* @generated NOT
5960
* @ordered
6061
*/
61-
protected static final RequirementConstraintKind KIND_EDEFAULT = RequirementConstraintKind.ASSUMPTION;
62-
62+
protected static final RequirementConstraintKind KIND_EDEFAULT = null;
63+
6364
/**
6465
* The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
6566
* <!-- begin-user-doc -->

‎org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RequirementVerificationMembershipImpl.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.eclipse.emf.ecore.EClass;
2626
import org.eclipse.emf.ecore.EStructuralFeature;
2727
import org.omg.sysml.lang.sysml.ConstraintUsage;
28+
import org.omg.sysml.lang.sysml.RequirementConstraintKind;
2829
import org.omg.sysml.lang.sysml.RequirementUsage;
2930
import org.omg.sysml.lang.sysml.RequirementVerificationMembership;
3031
import org.omg.sysml.lang.sysml.SysMLPackage;
@@ -240,6 +241,26 @@ public void setReferencedConstraint(ConstraintUsage newReferencedConstraint) {
240241
public boolean isSetReferencedConstraint() {
241242
return false;
242243
}
244+
245+
// Additional Overrides
246+
247+
@Override
248+
public RequirementConstraintKind getKind() {
249+
return RequirementConstraintKind.REQUIREMENT;
250+
}
251+
252+
/**
253+
* <!-- begin-user-doc -->
254+
* Consider the "kind" property to never be explicitly "set".
255+
* <!-- end-user-doc -->
256+
* @generated NOT
257+
*/
258+
@Override
259+
public boolean eIsSet(int featureID) {
260+
return featureID != SysMLPackage.REQUIREMENT_CONSTRAINT_MEMBERSHIP__KIND && eIsSetGen(featureID);
261+
}
262+
263+
//
243264

244265
/**
245266
* <!-- begin-user-doc -->
@@ -300,8 +321,7 @@ public void eUnset(int featureID) {
300321
* <!-- end-user-doc -->
301322
* @generated
302323
*/
303-
@Override
304-
public boolean eIsSet(int featureID) {
324+
public boolean eIsSetGen(int featureID) {
305325
switch (featureID) {
306326
case SysMLPackage.REQUIREMENT_VERIFICATION_MEMBERSHIP__OWNED_CONSTRAINT:
307327
return isSetOwnedConstraint();

‎org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/StateSubactionMembershipImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* SysML 2 Pilot Implementation
3-
* Copyright (c) 2020-2022 Model Driven Solutions, Inc.
3+
* Copyright (c) 2020-2023 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -51,12 +51,13 @@ public class StateSubactionMembershipImpl extends FeatureMembershipImpl implemen
5151
/**
5252
* The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
5353
* <!-- begin-user-doc -->
54+
* Even though the "kind" property is mandatory, the abstract syntax does not specify a default for it.
5455
* <!-- end-user-doc -->
5556
* @see #getKind()
56-
* @generated
57+
* @generated NOT
5758
* @ordered
5859
*/
59-
protected static final StateSubactionKind KIND_EDEFAULT = StateSubactionKind.ENTRY;
60+
protected static final StateSubactionKind KIND_EDEFAULT = null;
6061

6162
/**
6263
* The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

‎org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/TransitionFeatureMembershipImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* SysML 2 Pilot Implementation
3-
* Copyright (c) 2020-2022 Model Driven Solutions, Inc.
3+
* Copyright (c) 2020-2023 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -50,12 +50,13 @@ public class TransitionFeatureMembershipImpl extends FeatureMembershipImpl imple
5050
/**
5151
* The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
5252
* <!-- begin-user-doc -->
53+
* Even though the "kind" property is mandatory, the abstract syntax does not specify a default for it.
5354
* <!-- end-user-doc -->
5455
* @see #getKind()
55-
* @generated
56+
* @generated NOT
5657
* @ordered
5758
*/
58-
protected static final TransitionFeatureKind KIND_EDEFAULT = TransitionFeatureKind.TRIGGER;
59+
protected static final TransitionFeatureKind KIND_EDEFAULT = null;
5960

6061
/**
6162
* The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

‎org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/TriggerInvocationExpressionImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* SysML 2 Pilot Implementation
3-
* Copyright (c) 2022 Model Driven Solutions, Inc.
3+
* Copyright (c) 2022-2023 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -48,12 +48,13 @@ public class TriggerInvocationExpressionImpl extends InvocationExpressionImpl im
4848
/**
4949
* The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
5050
* <!-- begin-user-doc -->
51+
* Even though the "kind" property is mandatory, the abstract syntax does not specify a default for it.
5152
* <!-- end-user-doc -->
5253
* @see #getKind()
53-
* @generated
54+
* @generated NOT
5455
* @ordered
5556
*/
56-
protected static final TriggerKind KIND_EDEFAULT = TriggerKind.WHEN;
57+
protected static final TriggerKind KIND_EDEFAULT = null;
5758

5859
/**
5960
* The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

0 commit comments

Comments
 (0)