Skip to content

Commit 3c16bdc

Browse files
ivan-gomesivan-gomes
committed
Merge branch 'release/2024-12'
2 parents a23cf0c + 2cd183b commit 3c16bdc

File tree

326 files changed

+355710
-319459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+355710
-319459
lines changed

‎app/org/omg/sysml/lifecycle/impl/package-info.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
@MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class),
6868
@MetaValue(value = "ConstraintUsage", targetEntity = ConstraintUsageImpl.class),
6969
@MetaValue(value = "ControlNode", targetEntity = ControlNodeImpl.class),
70+
@MetaValue(value = "CrossSubsetting", targetEntity = CrossSubsettingImpl.class),
7071
@MetaValue(value = "DataType", targetEntity = DataTypeImpl.class),
7172
@MetaValue(value = "DecisionNode", targetEntity = DecisionNodeImpl.class),
7273
@MetaValue(value = "Definition", targetEntity = DefinitionImpl.class),
@@ -101,6 +102,7 @@
101102
@MetaValue(value = "IfActionUsage", targetEntity = IfActionUsageImpl.class),
102103
@MetaValue(value = "Import", targetEntity = ImportImpl.class),
103104
@MetaValue(value = "IncludeUseCaseUsage", targetEntity = IncludeUseCaseUsageImpl.class),
105+
@MetaValue(value = "IndexExpression", targetEntity = IndexExpressionImpl.class),
104106
@MetaValue(value = "Interaction", targetEntity = InteractionImpl.class),
105107
@MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class),
106108
@MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class),

‎app/org/omg/sysml/metamodel/AnnotatingElement.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ public interface AnnotatingElement extends Element, SysMLType {
1010

1111
List<? extends Annotation> getAnnotation();
1212

13-
Collection<? extends Annotation> getOwnedAnnotatingRelationship();
13+
List<? extends Annotation> getOwnedAnnotatingRelationship();
14+
15+
Annotation getOwningAnnotatingRelationship();
1416
}

‎app/org/omg/sysml/metamodel/Annotation.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ public interface Annotation extends Relationship, SysMLType {
1010

1111
AnnotatingElement getAnnotatingElement();
1212

13+
AnnotatingElement getOwnedAnnotatingElement();
14+
1315
Element getOwningAnnotatedElement();
1416

1517
AnnotatingElement getOwningAnnotatingElement();

‎app/org/omg/sysml/metamodel/AssociationStructure.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
public interface AssociationStructure extends Structure, Association, SysMLType {}
8+
public interface AssociationStructure extends Association, Structure, SysMLType {}

‎app/org/omg/sysml/metamodel/ConnectionDefinition.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77

88
public interface ConnectionDefinition extends AssociationStructure, PartDefinition, SysMLType {
99
List<? extends Usage> getConnectionEnd();
10+
11+
@Override
12+
Boolean getIsSufficient();
1013
}

‎app/org/omg/sysml/metamodel/CrossSubsetting.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
package org.omg.sysml.metamodel;
3+
4+
import java.util.Collection;
5+
import java.util.List;
6+
import java.util.Set;
7+
8+
public interface CrossSubsetting extends Subsetting, SysMLType {
9+
Feature getCrossedFeature();
10+
11+
Feature getCrossingFeature();
12+
}

‎app/org/omg/sysml/metamodel/Feature.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
public interface Feature extends Type, SysMLType {
99
List<? extends Feature> getChainingFeature();
1010

11+
Feature getCrossFeature();
12+
1113
FeatureDirectionKind getDirection();
1214

1315
Type getEndOwningType();
@@ -30,6 +32,8 @@ public interface Feature extends Type, SysMLType {
3032

3133
Boolean getIsUnique();
3234

35+
CrossSubsetting getOwnedCrossSubsetting();
36+
3337
List<? extends FeatureChaining> getOwnedFeatureChaining();
3438

3539
Collection<? extends FeatureInverting> getOwnedFeatureInverting();

‎app/org/omg/sysml/metamodel/FeatureMembership.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
public interface FeatureMembership extends OwningMembership, Featuring, SysMLType {
8+
public interface FeatureMembership extends Featuring, OwningMembership, SysMLType {
99
Feature getOwnedMemberFeature();
1010

1111
Type getOwningType();

‎app/org/omg/sysml/metamodel/FlowConnectionDefinition.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
public interface FlowConnectionDefinition extends Interaction, ConnectionDefinition, ActionDefinition, SysMLType {}
8+
public interface FlowConnectionDefinition extends Interaction, ActionDefinition, SysMLType {
9+
Collection<? extends Usage> getFlowConnectionEnd();
10+
}

‎app/org/omg/sysml/metamodel/FlowConnectionUsage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
public interface FlowConnectionUsage extends ConnectionUsage, ItemFlow, ActionUsage, SysMLType {
8+
public interface FlowConnectionUsage extends ConnectorAsUsage, ItemFlow, ActionUsage, SysMLType {
99
List<? extends Interaction> getFlowConnectionDefinition();
1010
}

‎app/org/omg/sysml/metamodel/IndexExpression.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
package org.omg.sysml.metamodel;
3+
4+
import java.util.Collection;
5+
import java.util.List;
6+
import java.util.Set;
7+
8+
public interface IndexExpression extends OperatorExpression, SysMLType {
9+
@Override
10+
String getOperator();
11+
}

‎app/org/omg/sysml/metamodel/Interaction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
public interface Interaction extends Behavior, Association, SysMLType {}
8+
public interface Interaction extends Association, Behavior, SysMLType {}

‎app/org/omg/sysml/metamodel/SuccessionItemFlow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
public interface SuccessionItemFlow extends Succession, ItemFlow, SysMLType {}
8+
public interface SuccessionItemFlow extends ItemFlow, Succession, SysMLType {}

‎app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,24 @@ public void setChainingFeature(List<Feature> chainingFeature) {
129129
this.chainingFeature = chainingFeature;
130130
}
131131

132+
private Feature crossFeature;
133+
134+
@Override
135+
@JsonGetter
136+
@JsonSerialize(using = DataSerializer.class)
137+
// @javax.persistence.Transient
138+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
139+
@JoinColumn(name = "crossFeature_id", table = "AcceptActionUsage")
140+
public Feature getCrossFeature() {
141+
return crossFeature;
142+
}
143+
144+
@JsonSetter
145+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
146+
public void setCrossFeature(Feature crossFeature) {
147+
this.crossFeature = crossFeature;
148+
}
149+
132150
private String declaredName;
133151

134152
@Override
@@ -1476,6 +1494,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
14761494
this.ownedConjugator = ownedConjugator;
14771495
}
14781496

1497+
private CrossSubsetting ownedCrossSubsetting;
1498+
1499+
@Override
1500+
@JsonGetter
1501+
@JsonSerialize(using = DataSerializer.class)
1502+
// @javax.persistence.Transient
1503+
@Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
1504+
@JoinColumn(name = "ownedCrossSubsetting_id", table = "AcceptActionUsage")
1505+
public CrossSubsetting getOwnedCrossSubsetting() {
1506+
return ownedCrossSubsetting;
1507+
}
1508+
1509+
@JsonSetter
1510+
@JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
1511+
public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
1512+
this.ownedCrossSubsetting = ownedCrossSubsetting;
1513+
}
1514+
14791515
private List<Differencing> ownedDifferencing;
14801516

14811517
@Override

‎app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,24 @@ public void setChainingFeature(List<Feature> chainingFeature) {
129129
this.chainingFeature = chainingFeature;
130130
}
131131

132+
private Feature crossFeature;
133+
134+
@Override
135+
@JsonGetter
136+
@JsonSerialize(using = DataSerializer.class)
137+
// @javax.persistence.Transient
138+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
139+
@JoinColumn(name = "crossFeature_id", table = "ActionUsage")
140+
public Feature getCrossFeature() {
141+
return crossFeature;
142+
}
143+
144+
@JsonSetter
145+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
146+
public void setCrossFeature(Feature crossFeature) {
147+
this.crossFeature = crossFeature;
148+
}
149+
132150
private String declaredName;
133151

134152
@Override
@@ -1476,6 +1494,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
14761494
this.ownedConjugator = ownedConjugator;
14771495
}
14781496

1497+
private CrossSubsetting ownedCrossSubsetting;
1498+
1499+
@Override
1500+
@JsonGetter
1501+
@JsonSerialize(using = DataSerializer.class)
1502+
// @javax.persistence.Transient
1503+
@Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
1504+
@JoinColumn(name = "ownedCrossSubsetting_id", table = "ActionUsage")
1505+
public CrossSubsetting getOwnedCrossSubsetting() {
1506+
return ownedCrossSubsetting;
1507+
}
1508+
1509+
@JsonSetter
1510+
@JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
1511+
public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
1512+
this.ownedCrossSubsetting = ownedCrossSubsetting;
1513+
}
1514+
14791515
private List<Differencing> ownedDifferencing;
14801516

14811517
@Override

‎app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,25 @@ public void setIsSufficient(Boolean isSufficient) {
527527
this.isSufficient = isSufficient;
528528
}
529529

530+
/*
531+
* shadowed by `4d59a8b1-fd56-4252-aac9-8ac40e8a847c`
532+
533+
private Boolean isSufficient;
534+
535+
@Override
536+
@JsonGetter
537+
@javax.persistence.Column(name = "isSufficient", table = "AllocationDefinition")
538+
public Boolean getIsSufficient() {
539+
return isSufficient;
540+
}
541+
542+
@JsonSetter
543+
public void setIsSufficient(Boolean isSufficient) {
544+
this.isSufficient = isSufficient;
545+
}
546+
547+
*/
548+
530549
private Boolean isVariation;
531550

532551
@Override

‎app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,24 @@ public void setConnectorEnd(List<Feature> connectorEnd) {
171171
this.connectorEnd = connectorEnd;
172172
}
173173

174+
private Feature crossFeature;
175+
176+
@Override
177+
@JsonGetter
178+
@JsonSerialize(using = DataSerializer.class)
179+
// @javax.persistence.Transient
180+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
181+
@JoinColumn(name = "crossFeature_id", table = "AllocationUsage")
182+
public Feature getCrossFeature() {
183+
return crossFeature;
184+
}
185+
186+
@JsonSetter
187+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
188+
public void setCrossFeature(Feature crossFeature) {
189+
this.crossFeature = crossFeature;
190+
}
191+
174192
private String declaredName;
175193

176194
@Override
@@ -1553,6 +1571,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
15531571
this.ownedConjugator = ownedConjugator;
15541572
}
15551573

1574+
private CrossSubsetting ownedCrossSubsetting;
1575+
1576+
@Override
1577+
@JsonGetter
1578+
@JsonSerialize(using = DataSerializer.class)
1579+
// @javax.persistence.Transient
1580+
@Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
1581+
@JoinColumn(name = "ownedCrossSubsetting_id", table = "AllocationUsage")
1582+
public CrossSubsetting getOwnedCrossSubsetting() {
1583+
return ownedCrossSubsetting;
1584+
}
1585+
1586+
@JsonSetter
1587+
@JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
1588+
public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
1589+
this.ownedCrossSubsetting = ownedCrossSubsetting;
1590+
}
1591+
15561592
private List<Differencing> ownedDifferencing;
15571593

15581594
@Override

‎app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,24 @@ public void setChainingFeature(List<Feature> chainingFeature) {
204204
this.chainingFeature = chainingFeature;
205205
}
206206

207+
private Feature crossFeature;
208+
209+
@Override
210+
@JsonGetter
211+
@JsonSerialize(using = DataSerializer.class)
212+
// @javax.persistence.Transient
213+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "crossFeature_type"), fetch = FetchType.LAZY)
214+
@JoinColumn(name = "crossFeature_id", table = "AnalysisCaseUsage")
215+
public Feature getCrossFeature() {
216+
return crossFeature;
217+
}
218+
219+
@JsonSetter
220+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
221+
public void setCrossFeature(Feature crossFeature) {
222+
this.crossFeature = crossFeature;
223+
}
224+
207225
private String declaredName;
208226

209227
@Override
@@ -1602,6 +1620,24 @@ public void setOwnedConjugator(Conjugation ownedConjugator) {
16021620
this.ownedConjugator = ownedConjugator;
16031621
}
16041622

1623+
private CrossSubsetting ownedCrossSubsetting;
1624+
1625+
@Override
1626+
@JsonGetter
1627+
@JsonSerialize(using = DataSerializer.class)
1628+
// @javax.persistence.Transient
1629+
@Any(metaDef = "CrossSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedCrossSubsetting_type"), fetch = FetchType.LAZY)
1630+
@JoinColumn(name = "ownedCrossSubsetting_id", table = "AnalysisCaseUsage")
1631+
public CrossSubsetting getOwnedCrossSubsetting() {
1632+
return ownedCrossSubsetting;
1633+
}
1634+
1635+
@JsonSetter
1636+
@JsonDeserialize(using = DataDeserializer.class, as = CrossSubsettingImpl.class)
1637+
public void setOwnedCrossSubsetting(CrossSubsetting ownedCrossSubsetting) {
1638+
this.ownedCrossSubsetting = ownedCrossSubsetting;
1639+
}
1640+
16051641
private List<Differencing> ownedDifferencing;
16061642

16071643
@Override

0 commit comments

Comments
 (0)