Skip to content

Commit d493365

Browse files
committed
ST6RI-912 Replaced isNonunique in grammars with Nonunique production.
- Added value converter so 'nonunique' keyword has the value "false" for setting isUnique. - Also updated KerMLOutlineTreeProvider to show "ordered" and "nonunique" in outline entry for a feature.
1 parent a5a602d commit d493365

58 files changed

Lines changed: 44017 additions & 43544 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.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/AbstractKerMLIdeModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.38.0
2+
* generated by Xtext 2.41.0
33
*/
44
package org.omg.kerml.xtext.ide;
55

org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/contentassist/antlr/KerMLParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.38.0
2+
* generated by Xtext 2.41.0
33
*/
44
package org.omg.kerml.xtext.ide.contentassist.antlr;
55

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/AbstractKerMLUiModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.38.0
2+
* generated by Xtext 2.41.0
33
*/
44
package org.omg.kerml.xtext.ui;
55

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/KerMLExecutableExtensionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.38.0
2+
* generated by Xtext 2.41.0
33
*/
44
package org.omg.kerml.xtext.ui;
55

org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/internal/XtextActivator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.38.0
2+
* generated by Xtext 2.41.0
33
*/
44
package org.omg.kerml.xtext.ui.internal;
55

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,12 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
216216
}
217217
}
218218
}
219+
if (feature.ordered) {
220+
idText += " ordered"
221+
}
222+
if (!feature.unique) {
223+
idText += " nonunique"
224+
}
219225
idText
220226
}
221227

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Require-Bundle: org.eclipse.xtext,
2121
org.eclipse.xtext.common.types,
2222
org.objectweb.asm;bundle-version="9.3.0";resolution:=optional
2323
Export-Package: org.omg.kerml.xtext,
24+
org.omg.kerml.xtext.conversion,
2425
org.omg.kerml.xtext.generator,
2526
org.omg.kerml.xtext.library,
2627
org.omg.kerml.xtext.linking,

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/AbstractKerMLRuntimeModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.38.0
2+
* generated by Xtext 2.41.0
33
*/
44
package org.omg.kerml.xtext;
55

21 Bytes
Binary file not shown.

org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerMLStandaloneSetupGenerated.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* generated by Xtext 2.38.0
2+
* generated by Xtext 2.41.0
33
*/
44
package org.omg.kerml.xtext;
55

0 commit comments

Comments
 (0)