Skip to content

Commit 9d4e353

Browse files
authored
Merge pull request #597 from Systems-Modeling/ST6RI-800
ST6RI-800 Terminate Actions
2 parents fddff6b + 7aff189 commit 9d4e353

170 files changed

Lines changed: 62220 additions & 58077 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.

org.omg.sysml.edit/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Bundle-ClassPath: .
88
Bundle-Activator: org.omg.sysml.lang.sysml.provider.SysMLEditPlugin$Implementation
99
Bundle-Vendor: %providerName
1010
Bundle-Localization: plugin
11-
Bundle-RequiredExecutionEnvironment: JavaSE-17
11+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1212
Export-Package: org.omg.sysml.lang.sysml.provider
1313
Require-Bundle: org.eclipse.core.runtime,
1414
org.omg.sysml;visibility:=reexport,
223 Bytes
Loading
223 Bytes
Loading
223 Bytes
Loading
223 Bytes
Loading
129 Bytes
Loading
129 Bytes
Loading

org.omg.sysml.edit/plugin.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,3 +628,7 @@ _UI_InvocationExpression_operand_feature = Operand
628628
_UI_AnnotatingElement_ownedAnnotatingRelationship_feature = Owned Annotating Relationship
629629
_UI_Annotation_owningAnnotatingElement_feature = Owning Annotating Element
630630
_UI_Feature_featureTarget_feature = Feature Target
631+
_UI_TerminateActionUsage_type = Terminate Action Usage
632+
_UI_TerminateWithResultActionUsage_type = Terminate With Result Action Usage
633+
_UI_TerminateActionUsage_terminatedOccurrenceArgument_feature = Terminated Occurrence Argument
634+
_UI_TerminateWithResultActionUsage_returnedResultArgument_feature = Returned Result Argument

org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/AcceptActionUsageItemProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col
180180

181181
boolean qualify =
182182
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_RELATIONSHIP ||
183-
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
183+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
184184
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
185185
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
186-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
186+
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
187187
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
188188
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
189189
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||

org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/ActionDefinitionItemProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col
180180

181181
boolean qualify =
182182
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_RELATIONSHIP ||
183-
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
184183
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
185184
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
185+
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
186186
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
187187
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
188188
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||

0 commit comments

Comments
 (0)