Skip to content

Commit 21fa2ed

Browse files
committed
ST6RI-799 Marked semantic constraint related code with comments
- Semantic constraints marked from SysmlV2 abstract syntax from 8.3.6.2 to 8.3.16.13
1 parent fddff6b commit 21fa2ed

18 files changed

Lines changed: 125 additions & 8 deletions

org.omg.sysml/src/org/omg/sysml/adapter/AcceptActionUsageAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void computeImplicitGeneralTypes() {
4545
@Override
4646
public void addDefaultGeneralType() {
4747
// Don't add a default type for a transition trigger action because such
48-
// an action will always redefine TransitionAction::accepter anyway.
48+
// an action will always redefine TransitionAction::accepter anyway: checkAcceptActionUsageTriggerActionSpecialization
4949
if (!isTriggerAction()) {
5050
super.addDefaultGeneralType();
5151
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,18 @@ protected boolean isSuboccurrence() {
7474
}
7575

7676
protected String getSubactionType() {
77+
//TODO checkAcceptActionUsageSpecialization?
78+
79+
//checkAcceptActionUsageSubactionSpecialization
80+
//checkActionUsageSubactionSpecialization
81+
//checkDecisionNodeSpecialization
82+
//checkForkNodeSpecialization
83+
//checkForLoopActionUsageSubactionSpecialization
84+
//checkIfActionUsageSubactionSpecialization
85+
//checkJoinNodeSpecialization
86+
//checkMergeNodeSpecialization
7787
return isActionOwnedComposite()? "subaction":
88+
//checkActionUsageOwnedActionSpecialization
7889
isPartOwnedComposite()? "ownedAction":
7990
null;
8091
}
@@ -92,6 +103,7 @@ public boolean isPerformedAction() {
92103
*/
93104
@Override
94105
public boolean isComputeRedefinitions() {
106+
//checkActionUsageStateActionRedefinition
95107
String redefinedFeature = getRedefinedFeature(getTarget());
96108
return redefinedFeature != null? isComputeRedefinitions:
97109
super.isComputeRedefinitions();

org.omg.sysml/src/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public AssignmentActionUsage getTarget() {
3636

3737
protected void addTargetRedefinitions() {
3838
AssignmentActionUsage target = getTarget();
39+
//checkAssignmentActionUsageAccessedFeatureRedefinition
3940
addFeatureWriteTypes(TypeUtil.getOwnedParametersOf(target), target.getReferent());
4041
}
4142

org.omg.sysml/src/org/omg/sysml/adapter/AttributeUsageAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public AttributeUsage getTarget() {
3535

3636
@Override
3737
public void doTransform() {
38+
//checkAttributeUsageSpecialization -> TypeAdapter.computeImplicitGeneralTypes
3839
super.doTransform();
3940
addDefaultMultiplicity();
4041
}

org.omg.sysml/src/org/omg/sysml/adapter/ConnectionDefinitionAdapter.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,14 @@ public ConnectionDefinition getTarget() {
3636

3737
@Override
3838
protected String getDefaultSupertype() {
39-
return getTarget().getOwnedEndFeature().size() != 2 ?
39+
return getTarget().getOwnedEndFeature().size() != 2 ?
40+
//checkConnectionDefinitionSpecializations
41+
//checkInterfaceDefinitionSpecialization
42+
//checkAllocationDefinitionSpecialization
4043
getDefaultSupertype("base") :
44+
//checkConnectionDefinitionBinarySpecialization
45+
//checkInterfaceDefinitionBinarySpecialization
46+
//checkAllocationDefinitionSpecialization
4147
getDefaultSupertype("binary");
4248
}
4349

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@ public ConnectionUsage getTarget() {
3939
@Override
4040
protected String getDefaultSupertype() {
4141
int numEnds = TypeUtil.getOwnedEndFeaturesOf(getTarget()).size();
42-
return numEnds != 2?
42+
return numEnds != 2?
43+
//checkConnectionUsageSpecialization
44+
//checkAllocationUsageSpecialization
4345
getDefaultSupertype("base"):
46+
//checkConnectionUsageBinarySpecialization
47+
//checkAllocationUsageSpecialization
4448
getDefaultSupertype("binary");
4549
}
4650

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void addDefaultGeneralType() {
4848

4949
@Override
5050
protected String getDefaultSupertype() {
51+
//checkEventOccurrenceUsageSpecialization
5152
return isSuboccurrence()?
5253
getDefaultSupertype("suboccurrence"):
5354
super.getDefaultSupertype();

org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ protected void addFeatureWriteTypes(List<Feature> parameters, Feature referent)
567567
features = startingAtFeature.getOwnedFeature();
568568
if (!features.isEmpty()) {
569569
Feature accessedFeature = features.get(0);
570+
//checkAssignmentActionUsageAccessedFeatureRedefinition
570571
TypeUtil.addDefaultGeneralTypeTo(accessedFeature, SysMLPackage.eINSTANCE.getRedefinition(), getDefaultSupertype("accessedFeature"));
571572
if (referent != null) {
572573
TypeUtil.addImplicitGeneralTypeTo(accessedFeature, SysMLPackage.eINSTANCE.getRedefinition(), referent);

org.omg.sysml/src/org/omg/sysml/adapter/FlowConnectionUsageAdapter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public void addDefaultGeneralType() {
5959

6060
@Override
6161
protected String getDefaultSupertype() {
62+
//checkFlowConnectionUsageSpecialization
6263
return UsageUtil.isMessageConnection(getTarget())?
6364
getDefaultSupertype("message"):
6465
getDefaultSupertype("base");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public void transformLoopVariable() {
5959
@Override
6060
public void doTransform() {
6161
super.doTransform();
62+
//checkForLoopActionUsageVarRedefinition
6263
transformLoopVariable();
6364
}
6465

0 commit comments

Comments
 (0)