Skip to content

Commit e7d5d35

Browse files
TheKorposTheKorpos
committed
ST6RI-843 Annotated more semantic constraints in adapters
1 parent 9ba4b19 commit e7d5d35

26 files changed

Lines changed: 138 additions & 60 deletions

‎org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.java‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,18 @@ public ActionUsage getTarget() {
4848

4949
// Implicit Generalization
5050

51+
/**
52+
* @satisfies checkAcceptActionUsageTriggerActionSpecialization
53+
* @satisfies checkStepEnclosedPerformanceSpecialization
54+
* @satisfies checkStepOwnedPerformanceSpecialization
55+
* @satisfies checkStepSubperformanceSpecialization
56+
*/
5157
@Override
5258
public void addDefaultGeneralType() {
5359
super.addDefaultGeneralType();
5460

5561
String subactionType = getSubactionType();
5662
if (subactionType != null) {
57-
//checkAcceptActionUsageTriggerActionSpecialization
5863
addDefaultGeneralType(subactionType);
5964
}
6065

@@ -68,11 +73,13 @@ public void addDefaultGeneralType() {
6873
}
6974
}
7075

76+
/**
77+
* @satisfies checkAcceptActionUsageSpecialization
78+
* @satisfies checkSendActionUsageSpecialization
79+
* @satisfies checkWhileLoopActionUsageSpecialization
80+
*/
7181
@Override
7282
protected String getDefaultSupertype() {
73-
//checkAcceptActionUsageSpecialization
74-
//checkSendActionUsageSpecialization
75-
//checkWhileLoopActionUsageSpecialization
7683
return getDefaultSupertype("base");
7784
}
7885

@@ -81,21 +88,24 @@ protected boolean isSuboccurrence() {
8188
return super.isSuboccurrence() && !isActionOwnedComposite();
8289
}
8390

91+
/**
92+
* @satisfies checkActionUsageSubactionSpecialization
93+
* @satisfies checkAcceptActionUsageSubactionSpecialization
94+
* @satisfies checkDecisionNodeSpecialization
95+
* @satisfies checkForkNodeSpecialization
96+
* @satisfies checkForLoopActionUsageSubactionSpecialization
97+
* @satisfies checkIfActionUsageSubactionSpecialization
98+
* @satisfies checkJoinNodeSpecialization
99+
* @satisfies checkMergeNodeSpecialization
100+
* @satisfies checkAssignmentActionUsageSubactionSpecialization
101+
* @satisfies checkSendActionUsageSubactionSpecialization
102+
* @satisfies checkWhileLoopActionUsageSubactionSpecialization
103+
* @satisfies checkActionUsageOwnedActionSpecialization
104+
* @satisfies checkStateUsageOwnedStateSpecialization
105+
*
106+
*/
84107
protected String getSubactionType() {
85-
//checkAcceptActionUsageSubactionSpecialization
86-
//checkActionUsageSubactionSpecialization
87-
//checkDecisionNodeSpecialization
88-
//checkForkNodeSpecialization
89-
//checkForLoopActionUsageSubactionSpecialization
90-
//checkIfActionUsageSubactionSpecialization
91-
//checkJoinNodeSpecialization
92-
//checkMergeNodeSpecialization
93-
//checkAssignmentActionUsageSubactionSpecialization
94-
//checkSendActionUsageSubactionSpecialization
95-
//checkWhileLoopActionUsageSubactionSpecialization
96108
return isActionOwnedComposite()? "subaction":
97-
//checkActionUsageOwnedActionSpecialization
98-
//checkStateUsageOwnedStateSpecialization
99109
isPartOwnedComposite()? "ownedAction":
100110
null;
101111
}
@@ -128,8 +138,10 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
128138
Collections.singletonList((Feature)getLibraryType(redefinedFeature));
129139
}
130140

141+
/**
142+
* @satisfies checkTransitionUsageTransitionFeatureSpecialization
143+
*/
131144
protected static String getRedefinedFeature(Feature target) {
132-
//checkTransitionUsageTransitionFeatureSpecialization
133145
FeatureMembership membership = target.getOwningFeatureMembership();
134146
String kind =
135147
membership instanceof StateSubactionMembership?

‎org.omg.sysml/src/org/omg/sysml/adapter/ConcernUsageAdapter.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ public ConcernUsage getTarget() {
3535
return (ConcernUsage)super.getTarget();
3636
}
3737

38+
/**
39+
* @satisfies checkRequirementUsageSubrequirementSpecialization
40+
*/
3841
@Override
3942
public void addDefaultGeneralType() {
4043
super.addDefaultGeneralType();
@@ -43,6 +46,9 @@ public void addDefaultGeneralType() {
4346
}
4447
}
4548

49+
/**
50+
* @satisfies checkConcernUsageSpecialization
51+
*/
4652
@Override
4753
protected String getDefaultSupertype() {
4854
return getDefaultSupertype("base");

‎org.omg.sysml/src/org/omg/sysml/adapter/ConnectionUsageAdapter.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,20 @@ public ConnectionUsageAdapter(ConnectionUsage element) {
3535
public ConnectionUsage getTarget() {
3636
return (ConnectionUsage)super.getTarget();
3737
}
38-
38+
39+
/**
40+
* @satisfies checkConnectionUsageSpecialization
41+
* @satisfies checkAllocationUsageSpecialization
42+
* @satisfies checkInterfaceDefinitionSpecialization
43+
* @satisfies checkConnectionUsageBinarySpecialization
44+
* @satisfies checkAllocationUsageSpecialization
45+
* @satisfies checkInterfaceDefinitionBinarySpecialization
46+
*/
3947
@Override
4048
protected String getDefaultSupertype() {
4149
int numEnds = TypeUtil.getOwnedEndFeaturesOf(getTarget()).size();
4250
return numEnds != 2?
43-
//checkConnectionUsageSpecialization
44-
//checkAllocationUsageSpecialization
45-
//checkInterfaceDefinitionSpecialization
4651
getDefaultSupertype("base"):
47-
//checkConnectionUsageBinarySpecialization
48-
//checkAllocationUsageSpecialization
49-
//checkInterfaceDefinitionBinarySpecialization
5052
getDefaultSupertype("binary");
5153
}
5254

‎org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.omg.sysml.lang.sysml.ItemDefinition;
2727
import org.omg.sysml.lang.sysml.ItemUsage;
2828
import org.omg.sysml.lang.sysml.RequirementConstraintKind;
29-
import org.omg.sysml.lang.sysml.SysMLPackage;
3029
import org.omg.sysml.lang.sysml.Type;
3130
import org.omg.sysml.util.UsageUtil;
3231

@@ -48,6 +47,9 @@ public ConstraintUsage getTarget() {
4847
/**
4948
* @satisfies checkConstraintUsageRequirementConstraintSpecialization
5049
* @satisfies checkConstraintUsageCheckedConstraintSpecialization
50+
* @satisfies checkStepEnclosedPerformanceSpecialization
51+
* @satisfies checkStepOwnedPerformanceSpecialization
52+
* @satisfies checkStepSubperformanceSpecialization
5153
*/
5254
@Override
5355
public void computeImplicitGeneralTypes() {
@@ -74,6 +76,9 @@ public void addRequirementConstraintSubsetting() {
7476
}
7577
}
7678

79+
/**
80+
* @satisfies checkConstraintUsageSpecialization
81+
*/
7782
@Override
7883
protected String getDefaultSupertype() {
7984
return getDefaultSupertype("base");

‎org.omg.sysml/src/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ public EventOccurrenceUsageAdapter(EventOccurrenceUsage element) {
3636
public EventOccurrenceUsage getTarget() {
3737
return (EventOccurrenceUsage)super.getTarget();
3838
}
39-
39+
40+
/**
41+
* @satisfies checkOccurrenceUsageSuboccurrenceSpecialization
42+
*/
4043
@Override
4144
public void addDefaultGeneralType() {
4245
super.addDefaultGeneralType();
@@ -46,6 +49,9 @@ public void addDefaultGeneralType() {
4649
}
4750
}
4851

52+
/**
53+
* @satisfies checkOccurrenceUsageSuboccurrenceSpecialization
54+
*/
4955
@Override
5056
protected String getDefaultSupertype() {
5157
return isSuboccurrence()?

‎org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ public void addDefaultGeneralType() {
6161
}
6262
}
6363

64+
/**
65+
* @satisfies checkExpressionSpecialization
66+
*/
6467
@Override
6568
protected String getDefaultSupertype() {
66-
//checkExpressionSpecialization
6769
return getDefaultSupertype("base");
6870
}
6971

@@ -90,17 +92,19 @@ protected List<Type> getGeneralTypes(Type type, Element skip) {
9092
}
9193

9294
// Transformation
93-
95+
96+
/**
97+
* @satisfies checkExpressionTypeFeaturing
98+
* @satisfies checkExpressionResultBindingConnector
99+
*/
94100
@Override
95101
public void doTransform() {
96102
Expression expression = getTarget();
97103
super.doTransform();
98104
if (expression.getOwningNamespace() instanceof Multiplicity ||
99105
expression.getOwningMembership() instanceof FeatureValue) {
100-
//checkExpressionTypeFeaturing
101106
addImplicitFeaturingTypesIfNecessary();
102107
}
103-
////checkExpressionResultBindingConnector
104108
createResultConnector(expression.getResult());
105109
}
106110

‎org.omg.sysml/src/org/omg/sysml/adapter/FeatureChainExpressionAdapter.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ public void addAdditionalMembers() {
6969
}
7070
}
7171

72+
/**
73+
* @satisfies checkFeatureChainExpressionTargetRedefinition
74+
* @satisfies checkFeatureChainExpressionSourceTargetRedefinition
75+
*/
7276
protected void addTargetRedefinition() {
7377
FeatureChainExpression target = getTarget();
7478
Feature sourceParameter = TypeUtil.getOwnedParameterOf(target, 0, Feature.class);
@@ -88,8 +92,6 @@ protected void addTargetRedefinition() {
8892
@Override
8993
public void doTransform() {
9094
super.doTransform();
91-
//checkFeatureChainExpressionSourceTargetRedefinition
92-
//checkFeatureChainExpressionTargetRedefinition
9395
addTargetRedefinition();
9496
}
9597

‎org.omg.sysml/src/org/omg/sysml/adapter/FlowEndAdapter.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public void addItemFlowEndSubsetting() {
7575
}
7676
}
7777

78+
/**
79+
* @satisfies checkFeatureFlowFeatureRedefinition
80+
*/
7881
public void addItemFlowFeatureRedefinition() {
7982
FlowEnd target = getTarget();
8083
Element owner = target.getOwner();

‎org.omg.sysml/src/org/omg/sysml/adapter/FlowUsageAdapter.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ public FlowUsage getTarget() {
3838
return (FlowUsage)super.getTarget();
3939
}
4040

41+
/**
42+
* @satisfies checkActionUsageOwnedActionSpecialization
43+
* @satisfies checkActionUsageSubactionSpecialization
44+
* @satisfies checkStepEnclosedPerformanceSpecialization
45+
* @satisfies checkStepOwnedPerformanceSpecialization
46+
* @satisfies checkStepSubperformanceSpecialization
47+
* @satisfies checkOccurrenceUsageTimeSliceSpecialization
48+
* @satisfies checkOccurrenceUsageSnapshotSpecialization
49+
* @satisfies checkOccurrenceUsageSuboccurrenceSpecialization
50+
*/
4151
@Override
4252
public void addDefaultGeneralType() {
4353
super.addDefaultGeneralType();
@@ -77,7 +87,11 @@ protected boolean isSuboccurrence() {
7787
target.isComposite() &&
7888
target.getOwningType() instanceof OccurrenceUsage;
7989
}
80-
90+
91+
/**
92+
* @satisfies checkFlowUsageFlowSpecialization
93+
* @satisfies checkFlowUsageSpecialization
94+
*/
8195
@Override
8296
protected String getDefaultSupertype() {
8397
return UsageUtil.isMessageConnection(getTarget())?

‎org.omg.sysml/src/org/omg/sysml/adapter/ForLoopActionUsageAdapter.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public ForLoopActionUsage getTarget() {
3838
return (ForLoopActionUsage)super.getTarget();
3939
}
4040

41+
/**
42+
* @satisfies checkForLoopActionUsageVarRedefinition
43+
*/
4144
public void transformLoopVariable() {
4245
ForLoopActionUsage target = getTarget();
4346
ReferenceUsage loopVariable = target.getLoopVariable();
@@ -59,7 +62,6 @@ public void transformLoopVariable() {
5962
@Override
6063
public void doTransform() {
6164
super.doTransform();
62-
//checkForLoopActionUsageVarRedefinition
6365
transformLoopVariable();
6466
}
6567

0 commit comments

Comments
 (0)