Skip to content

Commit 91c5494

Browse files
seidewitzseidewitz
authored
Merge pull request #266 from Systems-Modeling/ST6RI-430
ST6RI-430 Transition sources cannot be feature chains
2 parents b84fff7 + 817c235 commit 91c5494

38 files changed

Lines changed: 26235 additions & 25870 deletions

File tree

‎org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext.ide
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ide
55
Bundle-Vendor: SysML v2 Submission Team
6-
Bundle-Version: 0.14.0.qualifier
6+
Bundle-Version: 0.14.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.expressions.xtext,

‎org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext.ui
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ui
55
Bundle-Vendor: SysML v2 Submission Team
6-
Bundle-Version: 0.14.0.qualifier
6+
Bundle-Version: 0.14.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.expressions.xtext,

‎org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Automatic-Module-Name: org.omg.kerml.expressions.xtext
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext
5-
Bundle-Version: 0.14.0.qualifier
5+
Bundle-Version: 0.14.1.qualifier
66
Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.eclipse.xtext,

‎org.omg.kerml.owl.ide/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.kerml.owl.ide
44
Bundle-Vendor: My Company
5-
Bundle-Version: 0.14.0.qualifier
5+
Bundle-Version: 0.14.1.qualifier
66
Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.omg.kerml.owl,

‎org.omg.kerml.owl.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.kerml.owl.ui
44
Bundle-Vendor: My Company
5-
Bundle-Version: 0.14.0.qualifier
5+
Bundle-Version: 0.14.1.qualifier
66
Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.omg.kerml.owl,

‎org.omg.kerml.owl/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.sysml.owl
44
Bundle-Vendor: My Company
5-
Bundle-Version: 0.14.0.qualifier
5+
Bundle-Version: 0.14.1.qualifier
66
Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true
77
Bundle-ActivationPolicy: lazy
88
Require-Bundle: org.eclipse.xtext,

‎org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.kerml.xpect.tests
44
Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true
55
Bundle-Vendor: SysML v2 Submission Team
6-
Bundle-Version: 0.14.0.qualifier
6+
Bundle-Version: 0.14.1.qualifier
77
Require-Bundle: org.eclipse.core.runtime,
88
org.eclipse.xpect.xtext.lib;bundle-version="0.2.0",
99
org.eclipse.xpect.xtext.xbase.lib;bundle-version="0.2.0",

‎org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.xtext.ide
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ide
55
Bundle-Vendor: SysML v2 Submission Team
6-
Bundle-Version: 0.14.0.qualifier
6+
Bundle-Version: 0.14.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.xtext,

‎org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.xtext.ui
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ui
55
Bundle-Vendor: SysML v2 Submission Team
6-
Bundle-Version: 0.14.0.qualifier
6+
Bundle-Version: 0.14.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.xtext.ui; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.xtext,

‎org.omg.kerml.xtext.ui/src/org/omg/kerml/xtext/ui/outline/KerMLOutlineTreeProvider.xtend‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
392392
if (redefinition.redefinedFeature !== null) {
393393
createNode(parentNode, redefinition.redefinedFeature,
394394
redefinition.redefinedFeature._image, redefinition.redefinedFeature._text,
395-
true
395+
redefinition.redefinedFeature.ownedFeatureChaining.empty
396396
)
397397
}
398398
}
@@ -482,8 +482,8 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
482482
// Traversal does not know about the new node, children have to be created here
483483
if (generalType !== null) {
484484
createNode(implicitNode, generalType,
485-
generalType._image, generalType._text,
486-
true
485+
generalType._image, textDispatcher.invoke(generalType).toString(),
486+
!(generalType instanceof Feature) || (generalType as Feature).ownedFeatureChaining.isEmpty
487487
)
488488
}
489489
])

0 commit comments

Comments
 (0)