Skip to content

Commit 967ce0c

Browse files
seidewitzseidewitz
authored
Merge pull request #607 from Systems-Modeling/ST6RI-807
ST6RI-807 Flow Connection Revision (SYSML2_-173)
2 parents 2f54760 + 5cc7272 commit 967ce0c

197 files changed

Lines changed: 73181 additions & 70876 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/plugin.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,3 +632,4 @@ _UI_TerminateActionUsage_type = Terminate Action Usage
632632
_UI_TerminateWithResultActionUsage_type = Terminate With Result Action Usage
633633
_UI_TerminateActionUsage_terminatedOccurrenceArgument_feature = Terminated Occurrence Argument
634634
_UI_TerminateWithResultActionUsage_returnedResultArgument_feature = Returned Result Argument
635+
_UI_FlowConnectionDefinition_flowConnectionEnd_feature = Flow Connection End

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,17 @@ 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.FEATURE__OWNED_TYPE_FEATURING ||
184183
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
185184
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
186185
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
187-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
188-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
189186
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
190187
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
191188
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||
192189
childFeature == SysMLPackage.Literals.TYPE__OWNED_DISJOINING ||
193190
childFeature == SysMLPackage.Literals.TYPE__OWNED_DIFFERENCING ||
191+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
192+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
193+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
194194
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_IMPORT;
195195

196196
if (qualify) {

‎org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/ActionUsageItemProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,17 @@ 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.FEATURE__OWNED_TYPE_FEATURING ||
184183
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
185184
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
186185
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
187-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
188-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
189186
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
190187
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
191188
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||
192189
childFeature == SysMLPackage.Literals.TYPE__OWNED_DISJOINING ||
193190
childFeature == SysMLPackage.Literals.TYPE__OWNED_DIFFERENCING ||
191+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
192+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
193+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
194194
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_IMPORT;
195195

196196
if (qualify) {

‎org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/AllocationUsageItemProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,18 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col
134134

135135
boolean qualify =
136136
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_RELATIONSHIP ||
137-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
138137
childFeature == SysMLPackage.Literals.RELATIONSHIP__OWNED_RELATED_ELEMENT ||
139138
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
140139
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
141140
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
142-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
143-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
144141
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
145142
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
146143
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||
147144
childFeature == SysMLPackage.Literals.TYPE__OWNED_DISJOINING ||
148145
childFeature == SysMLPackage.Literals.TYPE__OWNED_DIFFERENCING ||
146+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
147+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
148+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
149149
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_IMPORT;
150150

151151
if (qualify) {

‎org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/AnalysisCaseUsageItemProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col
157157

158158
boolean qualify =
159159
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_RELATIONSHIP ||
160-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
161160
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
162161
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
163162
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
164-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
165-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
166163
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
167164
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
168165
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||
169166
childFeature == SysMLPackage.Literals.TYPE__OWNED_DISJOINING ||
170167
childFeature == SysMLPackage.Literals.TYPE__OWNED_DIFFERENCING ||
168+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
169+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
170+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
171171
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_IMPORT;
172172

173173
if (qualify) {

‎org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/AssertConstraintUsageItemProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,17 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col
165165

166166
boolean qualify =
167167
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_RELATIONSHIP ||
168-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
169168
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
170169
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
171170
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
172-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
173-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
174171
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
175172
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
176173
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||
177174
childFeature == SysMLPackage.Literals.TYPE__OWNED_DISJOINING ||
178175
childFeature == SysMLPackage.Literals.TYPE__OWNED_DIFFERENCING ||
176+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
177+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
178+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
179179
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_IMPORT;
180180

181181
if (qualify) {

‎org.omg.sysml.edit/src/org/omg/sysml/lang/sysml/provider/AssignmentActionUsageItemProvider.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,17 @@ 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.FEATURE__OWNED_TYPE_FEATURING ||
184183
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_MEMBERSHIP ||
185184
childFeature == SysMLPackage.Literals.ELEMENT__OWNED_ANNOTATION ||
186185
childFeature == SysMLPackage.Literals.TYPE__OWNED_SPECIALIZATION ||
187-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
188-
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
189186
childFeature == SysMLPackage.Literals.TYPE__OWNED_CONJUGATOR ||
190187
childFeature == SysMLPackage.Literals.TYPE__OWNED_INTERSECTING ||
191188
childFeature == SysMLPackage.Literals.TYPE__OWNED_UNIONING ||
192189
childFeature == SysMLPackage.Literals.TYPE__OWNED_DISJOINING ||
193190
childFeature == SysMLPackage.Literals.TYPE__OWNED_DIFFERENCING ||
191+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_TYPE_FEATURING ||
192+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_INVERTING ||
193+
childFeature == SysMLPackage.Literals.FEATURE__OWNED_FEATURE_CHAINING ||
194194
childFeature == SysMLPackage.Literals.NAMESPACE__OWNED_IMPORT;
195195

196196
if (qualify) {

0 commit comments

Comments
 (0)