Skip to content

Commit 16180a8

Browse files
ivan-gomesivan-gomes
authored
Merge pull request #117 from Systems-Modeling/feature/ST5AS-242
ST5AS-242 update to 2024-07 metamodel baseline
2 parents 8402e26 + 18b62ce commit 16180a8

279 files changed

Lines changed: 375263 additions & 368396 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/metamodel/AnalysisCaseDefinition.java‎

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

88
public interface AnalysisCaseDefinition extends CaseDefinition, SysMLType {
9-
List<? extends ActionUsage> getAnalysisAction();
10-
119
Expression getResultExpression();
1210
}

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

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

88
public interface AnalysisCaseUsage extends CaseUsage, SysMLType {
9-
List<? extends ActionUsage> getAnalysisAction();
10-
119
AnalysisCaseDefinition getAnalysisCaseDefinition();
1210

1311
Expression getResultExpression();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@
88
public interface Expose extends Import, SysMLType {
99
@Override
1010
Boolean getIsImportAll();
11+
12+
@Override
13+
VisibilityKind getVisibility();
1114
}

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

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

1313
Type getEndOwningType();
1414

15+
Feature getFeatureTarget();
16+
1517
List<? extends Type> getFeaturingType();
1618

1719
Boolean getIsComposite();

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,24 @@ public void setFeatureMembership(List<FeatureMembership> featureMembership) {
376376
this.featureMembership = featureMembership;
377377
}
378378

379+
private Feature featureTarget;
380+
381+
@Override
382+
@JsonGetter
383+
@JsonSerialize(using = DataSerializer.class)
384+
// @javax.persistence.Transient
385+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureTarget_type"), fetch = FetchType.LAZY)
386+
@JoinColumn(name = "featureTarget_id", table = "AcceptActionUsage")
387+
public Feature getFeatureTarget() {
388+
return featureTarget;
389+
}
390+
391+
@JsonSetter
392+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
393+
public void setFeatureTarget(Feature featureTarget) {
394+
this.featureTarget = featureTarget;
395+
}
396+
379397
private List<Type> featuringType;
380398

381399
@Override

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,24 @@ public void setFeatureMembership(List<FeatureMembership> featureMembership) {
376376
this.featureMembership = featureMembership;
377377
}
378378

379+
private Feature featureTarget;
380+
381+
@Override
382+
@JsonGetter
383+
@JsonSerialize(using = DataSerializer.class)
384+
// @javax.persistence.Transient
385+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureTarget_type"), fetch = FetchType.LAZY)
386+
@JoinColumn(name = "featureTarget_id", table = "ActionUsage")
387+
public Feature getFeatureTarget() {
388+
return featureTarget;
389+
}
390+
391+
@JsonSetter
392+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
393+
public void setFeatureTarget(Feature featureTarget) {
394+
this.featureTarget = featureTarget;
395+
}
396+
379397
private List<Type> featuringType;
380398

381399
@Override

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,24 @@ public void setFeatureMembership(List<FeatureMembership> featureMembership) {
418418
this.featureMembership = featureMembership;
419419
}
420420

421+
private Feature featureTarget;
422+
423+
@Override
424+
@JsonGetter
425+
@JsonSerialize(using = DataSerializer.class)
426+
// @javax.persistence.Transient
427+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureTarget_type"), fetch = FetchType.LAZY)
428+
@JoinColumn(name = "featureTarget_id", table = "AllocationUsage")
429+
public Feature getFeatureTarget() {
430+
return featureTarget;
431+
}
432+
433+
@JsonSetter
434+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
435+
public void setFeatureTarget(Feature featureTarget) {
436+
this.featureTarget = featureTarget;
437+
}
438+
421439
private List<Type> featuringType;
422440

423441
@Override

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -108,27 +108,6 @@ public void setAliasIds(List<String> aliasIds) {
108108
this.aliasIds = aliasIds;
109109
}
110110

111-
private List<ActionUsage> analysisAction;
112-
113-
@Override
114-
@JsonGetter
115-
@JsonSerialize(contentUsing = DataSerializer.class)
116-
// @javax.persistence.Transient
117-
@ManyToAny(metaDef = "ActionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
118-
@JoinTable(name = "AnalysisCaseDefinition_analysisAction", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id"))
119-
public List<ActionUsage> getAnalysisAction() {
120-
if (analysisAction == null) {
121-
analysisAction = new ArrayList<>();
122-
}
123-
return analysisAction;
124-
}
125-
126-
@JsonSetter
127-
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ActionUsageImpl.class)
128-
public void setAnalysisAction(List<ActionUsage> analysisAction) {
129-
this.analysisAction = analysisAction;
130-
}
131-
132111
private List<CalculationUsage> calculation;
133112

134113
@Override

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

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -108,27 +108,6 @@ public void setAliasIds(List<String> aliasIds) {
108108
this.aliasIds = aliasIds;
109109
}
110110

111-
private List<ActionUsage> analysisAction;
112-
113-
@Override
114-
@JsonGetter
115-
@JsonSerialize(contentUsing = DataSerializer.class)
116-
// @javax.persistence.Transient
117-
@ManyToAny(metaDef = "ActionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY)
118-
@JoinTable(name = "AnalysisCaseUsage_analysisAction", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id"))
119-
public List<ActionUsage> getAnalysisAction() {
120-
if (analysisAction == null) {
121-
analysisAction = new ArrayList<>();
122-
}
123-
return analysisAction;
124-
}
125-
126-
@JsonSetter
127-
@JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ActionUsageImpl.class)
128-
public void setAnalysisAction(List<ActionUsage> analysisAction) {
129-
this.analysisAction = analysisAction;
130-
}
131-
132111
private AnalysisCaseDefinition analysisCaseDefinition;
133112

134113
@Override
@@ -472,6 +451,24 @@ public void setFeatureMembership(List<FeatureMembership> featureMembership) {
472451
this.featureMembership = featureMembership;
473452
}
474453

454+
private Feature featureTarget;
455+
456+
@Override
457+
@JsonGetter
458+
@JsonSerialize(using = DataSerializer.class)
459+
// @javax.persistence.Transient
460+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureTarget_type"), fetch = FetchType.LAZY)
461+
@JoinColumn(name = "featureTarget_id", table = "AnalysisCaseUsage")
462+
public Feature getFeatureTarget() {
463+
return featureTarget;
464+
}
465+
466+
@JsonSetter
467+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
468+
public void setFeatureTarget(Feature featureTarget) {
469+
this.featureTarget = featureTarget;
470+
}
471+
475472
private List<Type> featuringType;
476473

477474
@Override

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,24 @@ public void setFeatureMembership(List<FeatureMembership> featureMembership) {
391391
this.featureMembership = featureMembership;
392392
}
393393

394+
private Feature featureTarget;
395+
396+
@Override
397+
@JsonGetter
398+
@JsonSerialize(using = DataSerializer.class)
399+
// @javax.persistence.Transient
400+
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureTarget_type"), fetch = FetchType.LAZY)
401+
@JoinColumn(name = "featureTarget_id", table = "AssertConstraintUsage")
402+
public Feature getFeatureTarget() {
403+
return featureTarget;
404+
}
405+
406+
@JsonSetter
407+
@JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class)
408+
public void setFeatureTarget(Feature featureTarget) {
409+
this.featureTarget = featureTarget;
410+
}
411+
394412
private List<Type> featuringType;
395413

396414
@Override

0 commit comments

Comments
 (0)