Skip to content

Commit fa99167

Browse files
committed
ST6RI-864 Removed spurious implicit gen entry for TerminateActionUsage.
- The extra "put" for TerminateActionUsageImpl_subaction replaced the correct implicit generalization for a TerminateActionUsag subaction. - Also added TerminateActionUsage to SysMLSpecializationTest.
1 parent 5454315 commit fa99167

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

org.omg.sysml.interactive.tests/resources/org/omg/sysml/semantics/tests/sysml-simple-specializations.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ true,checkIfActionUsageSubactionSpecialization,IfActionUsage,Actions::Action::if
6262
true,checkWhileLoopActionUsageSubactionSpecialization,WhileLoopActionUsage,Actions::Action::whileLoops,ActionUsage,FeatureMembership
6363
true,checkForLoopActionUsageSubactionSpecialization,ForLoopActionUsage,Actions::Action::forLoops,ActionUsage,FeatureMembership
6464
true,checkPerformActionUsageSpecialization,PerformActionUsage,Parts::Part::performedActions,PartUsage,FeatureMembership
65+
true,checkTerminateActionUsageSubactionSpecialization,TerminateActionUsage,Actions::Action::terminateSubactions,ActionDefinition,FeatureMembership
66+
true,checkTerminateActionUsageSubactionSpecialization,TerminateActionUsage,Actions::Action::terminateSubactions,ActionUsage,FeatureMembership
6567
true,checkPerformActionUsageSpecialization,PerformActionUsage,Parts::Part::performedActions,PartDefinition,FeatureMembership
6668
true,checkStateUsageSpecialization,StateUsage,States::stateActions,Package,OwningMembership
6769
true,checkStateUsageExclusiveStateSpecialization,StateUsage,States::StateAction::exclusiveStates,StateUsage,FeatureMembership

org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,9 +524,6 @@ protected ImplicitGeneralizationMap() {
524524
//checkTerminateActionUsageSubactionSpecialization
525525
put(TerminateActionUsageImpl.class, "subaction", "Actions::Action::terminateSubactions");
526526

527-
// TODO: Delete this.
528-
put(TerminateActionUsageImpl.class, "subaction", "Actions::Action::terminateWithResultSubactions");
529-
530527
//checkTransitionUsageSpecialization
531528
put(TransitionUsageImpl.class, "base", "Actions::transitionActions");
532529
//checkTransitionUsageActionSpecialization

0 commit comments

Comments
 (0)