Skip to content

Commit beab62e

Browse files
ivan-gomesivan-gomes
authored
Merge pull request #127 from Systems-Modeling/feature/ST5AS-246
ST5AS-246 update to 2025-02 metamodel baseline
2 parents 91d6748 + ebacd89 commit beab62e

580 files changed

Lines changed: 677041 additions & 646607 deletions

File tree

Some content is hidden

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

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
@MetaValue(value = "ConnectorAsUsage", targetEntity = ConnectorAsUsageImpl.class),
6767
@MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class),
6868
@MetaValue(value = "ConstraintUsage", targetEntity = ConstraintUsageImpl.class),
69+
@MetaValue(value = "ConstructorExpression", targetEntity = ConstructorExpressionImpl.class),
6970
@MetaValue(value = "ControlNode", targetEntity = ControlNodeImpl.class),
7071
@MetaValue(value = "CrossSubsetting", targetEntity = CrossSubsettingImpl.class),
7172
@MetaValue(value = "DataType", targetEntity = DataTypeImpl.class),
@@ -92,9 +93,10 @@
9293
@MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class),
9394
@MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class),
9495
@MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.class),
95-
@MetaValue(value = "Featuring", targetEntity = FeaturingImpl.class),
96-
@MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class),
97-
@MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class),
96+
@MetaValue(value = "Flow", targetEntity = FlowImpl.class),
97+
@MetaValue(value = "FlowDefinition", targetEntity = FlowDefinitionImpl.class),
98+
@MetaValue(value = "FlowEnd", targetEntity = FlowEndImpl.class),
99+
@MetaValue(value = "FlowUsage", targetEntity = FlowUsageImpl.class),
98100
@MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class),
99101
@MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class),
100102
@MetaValue(value = "FramedConcernMembership", targetEntity = FramedConcernMembershipImpl.class),
@@ -103,20 +105,17 @@
103105
@MetaValue(value = "Import", targetEntity = ImportImpl.class),
104106
@MetaValue(value = "IncludeUseCaseUsage", targetEntity = IncludeUseCaseUsageImpl.class),
105107
@MetaValue(value = "IndexExpression", targetEntity = IndexExpressionImpl.class),
108+
@MetaValue(value = "InstantiationExpression", targetEntity = InstantiationExpressionImpl.class),
106109
@MetaValue(value = "Interaction", targetEntity = InteractionImpl.class),
107110
@MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class),
108111
@MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class),
109112
@MetaValue(value = "Intersecting", targetEntity = IntersectingImpl.class),
110113
@MetaValue(value = "Invariant", targetEntity = InvariantImpl.class),
111114
@MetaValue(value = "InvocationExpression", targetEntity = InvocationExpressionImpl.class),
112115
@MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class),
113-
@MetaValue(value = "ItemFeature", targetEntity = ItemFeatureImpl.class),
114-
@MetaValue(value = "ItemFlow", targetEntity = ItemFlowImpl.class),
115-
@MetaValue(value = "ItemFlowEnd", targetEntity = ItemFlowEndImpl.class),
116116
@MetaValue(value = "ItemUsage", targetEntity = ItemUsageImpl.class),
117117
@MetaValue(value = "JoinNode", targetEntity = JoinNodeImpl.class),
118118
@MetaValue(value = "LibraryPackage", targetEntity = LibraryPackageImpl.class),
119-
@MetaValue(value = "LifeClass", targetEntity = LifeClassImpl.class),
120119
@MetaValue(value = "LiteralBoolean", targetEntity = LiteralBooleanImpl.class),
121120
@MetaValue(value = "LiteralExpression", targetEntity = LiteralExpressionImpl.class),
122121
@MetaValue(value = "LiteralInfinity", targetEntity = LiteralInfinityImpl.class),
@@ -148,6 +147,7 @@
148147
@MetaValue(value = "ParameterMembership", targetEntity = ParameterMembershipImpl.class),
149148
@MetaValue(value = "PartDefinition", targetEntity = PartDefinitionImpl.class),
150149
@MetaValue(value = "PartUsage", targetEntity = PartUsageImpl.class),
150+
@MetaValue(value = "PayloadFeature", targetEntity = PayloadFeatureImpl.class),
151151
@MetaValue(value = "PerformActionUsage", targetEntity = PerformActionUsageImpl.class),
152152
@MetaValue(value = "PortConjugation", targetEntity = PortConjugationImpl.class),
153153
@MetaValue(value = "PortDefinition", targetEntity = PortDefinitionImpl.class),
@@ -180,8 +180,8 @@
180180
@MetaValue(value = "Subsetting", targetEntity = SubsettingImpl.class),
181181
@MetaValue(value = "Succession", targetEntity = SuccessionImpl.class),
182182
@MetaValue(value = "SuccessionAsUsage", targetEntity = SuccessionAsUsageImpl.class),
183-
@MetaValue(value = "SuccessionFlowConnectionUsage", targetEntity = SuccessionFlowConnectionUsageImpl.class),
184-
@MetaValue(value = "SuccessionItemFlow", targetEntity = SuccessionItemFlowImpl.class),
183+
@MetaValue(value = "SuccessionFlow", targetEntity = SuccessionFlowImpl.class),
184+
@MetaValue(value = "SuccessionFlowUsage", targetEntity = SuccessionFlowUsageImpl.class),
185185
@MetaValue(value = "TerminateActionUsage", targetEntity = TerminateActionUsageImpl.class),
186186
@MetaValue(value = "TextualRepresentation", targetEntity = TextualRepresentationImpl.class),
187187
@MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class),

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

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

1111
List<? extends Feature> getConnectorEnd();
1212

13+
Type getDefaultFeaturingType();
14+
1315
List<? extends Feature> getRelatedFeature();
1416

1517
Feature getSourceFeature();

app/org/omg/sysml/metamodel/LifeClass.java renamed to app/org/omg/sysml/metamodel/ConstructorExpression.java

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

8-
public interface LifeClass extends Class, SysMLType {
9-
@Override
10-
Boolean getIsSufficient();
11-
}
8+
public interface ConstructorExpression extends InstantiationExpression, SysMLType {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface Definition extends Classifier, SysMLType {
3030

3131
List<? extends EnumerationUsage> getOwnedEnumeration();
3232

33-
Collection<? extends FlowConnectionUsage> getOwnedFlow();
33+
Collection<? extends FlowUsage> getOwnedFlow();
3434

3535
List<? extends InterfaceUsage> getOwnedInterface();
3636

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public interface Feature extends Type, SysMLType {
2020

2121
Boolean getIsComposite();
2222

23+
Boolean getIsConstant();
24+
2325
Boolean getIsDerived();
2426

2527
Boolean getIsEnd();
@@ -28,10 +30,10 @@ public interface Feature extends Type, SysMLType {
2830

2931
Boolean getIsPortion();
3032

31-
Boolean getIsReadOnly();
32-
3333
Boolean getIsUnique();
3434

35+
Boolean getIsVariable();
36+
3537
CrossSubsetting getOwnedCrossSubsetting();
3638

3739
List<? extends FeatureChaining> getOwnedFeatureChaining();

‎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 Featuring, OwningMembership, SysMLType {
8+
public interface FeatureMembership extends OwningMembership, SysMLType {
99
Feature getOwnedMemberFeature();
1010

1111
Type getOwningType();

app/org/omg/sysml/metamodel/ItemFlow.java renamed to app/org/omg/sysml/metamodel/Flow.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import java.util.List;
66
import java.util.Set;
77

8-
public interface ItemFlow extends Connector, Step, SysMLType {
9-
List<? extends Interaction> getInteraction();
8+
public interface Flow extends Connector, Step, SysMLType {
9+
List<? extends FlowEnd> getFlowEnd();
1010

11-
ItemFeature getItemFeature();
11+
List<? extends Interaction> getInteraction();
1212

13-
List<? extends ItemFlowEnd> getItemFlowEnd();
13+
PayloadFeature getPayloadFeature();
1414

15-
List<? extends Classifier> getItemType();
15+
List<? extends Classifier> getPayloadType();
1616

1717
Feature getSourceOutputFeature();
1818

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

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/org/omg/sysml/metamodel/Featuring.java renamed to app/org/omg/sysml/metamodel/FlowDefinition.java

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

8-
public interface Featuring extends Relationship, SysMLType {
9-
Feature getFeature();
10-
11-
Type getType();
8+
public interface FlowDefinition extends Interaction, ActionDefinition, SysMLType {
9+
Collection<? extends Usage> getFlowEnd();
1210
}

app/org/omg/sysml/metamodel/ItemFlowEnd.java renamed to app/org/omg/sysml/metamodel/FlowEnd.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 ItemFlowEnd extends Feature, SysMLType {}
8+
public interface FlowEnd extends Feature, SysMLType {}

0 commit comments

Comments
 (0)