Skip to content

ST6RI-912 Eliminate adding of "nonunique" property to metamodel #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seidewitz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ST6RI-912 Eliminate adding of "nonunique" property to metamodel #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d493365
ST6RI-912 Replaced isNonunique in grammars with Nonunique production.
seidewitz Feb 13, 2026
2c7a2a9
ST6RI-912 Removed isNonunique from Feature
seidewitz Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/AbstractKerMLIdeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext.ide;

Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext.ide/src-gen/org/omg/kerml/xtext/ide/contentassist/antlr/KerMLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext.ide.contentassist.antlr;

Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/AbstractKerMLUiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext.ui;

Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/KerMLExecutableExtensionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext.ui;

Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext.ui/src-gen/org/omg/kerml/xtext/ui/internal/XtextActivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext.ui.internal;

Expand Down
6 changes: 6 additions & 0 deletions org.omg.kerml.xtext.ui/src/org/omg/kerml/xtext/ui/outline/KerMLOutlineTreeProvider.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ class KerMLOutlineTreeProvider extends DefaultOutlineTreeProvider {
}
}
}
if (feature.ordered) {
idText += " ordered"
}
if (!feature.unique) {
idText += " nonunique"
}
idText
}

Expand Down
1 change: 1 addition & 0 deletions org.omg.kerml.xtext/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.common.types,
org.objectweb.asm;bundle-version="9.3.0";resolution:=optional
Export-Package: org.omg.kerml.xtext,
org.omg.kerml.xtext.conversion,
org.omg.kerml.xtext.generator,
org.omg.kerml.xtext.library,
org.omg.kerml.xtext.linking,
Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/AbstractKerMLRuntimeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext;

Expand Down
Binary file modified org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerML.xtextbin
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/KerMLStandaloneSetupGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext;

Expand Down
2 changes: 1 addition & 1 deletion ...omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLAntlrTokenFileProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext.parser.antlr;

Expand Down
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/KerMLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
package org.omg.kerml.xtext.parser.antlr;

Expand Down
50 changes: 41 additions & 9 deletions org.omg.kerml.xtext/src-gen/org/omg/kerml/xtext/parser/antlr/internal/InternalKerML.g
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.38.0
* generated by Xtext 2.41.0
*/
grammar InternalKerML;

Expand Down Expand Up @@ -5605,15 +5605,20 @@ ruleMultiplicityPart[EObject in_current] returns [EObject current=in_current]
)
(
(
lv_isNonunique_3_0='nonunique'
{
newLeafNode(lv_isNonunique_3_0, grammarAccess.getMultiplicityPartAccess().getIsNonuniqueNonuniqueKeyword_1_1_0_1_0());
newCompositeNode(grammarAccess.getMultiplicityPartAccess().getIsUniqueNonuniqueParserRuleCall_1_1_0_1_0());
}
lv_isUnique_3_0=ruleNonunique
{
if ($current==null) {
$current = createModelElement(grammarAccess.getMultiplicityPartRule());
$current = createModelElementForParent(grammarAccess.getMultiplicityPartRule());
}
setWithLastConsumed($current, "isNonunique", lv_isNonunique_3_0 != null, "nonunique");
set(
$current,
"isUnique",
lv_isUnique_3_0,
"org.omg.kerml.xtext.KerML.Nonunique");
afterParserOrEnumRuleCall();
}
)
)?
Expand All @@ -5622,15 +5627,20 @@ ruleMultiplicityPart[EObject in_current] returns [EObject current=in_current]
(
(
(
lv_isNonunique_4_0='nonunique'
{
newLeafNode(lv_isNonunique_4_0, grammarAccess.getMultiplicityPartAccess().getIsNonuniqueNonuniqueKeyword_1_1_1_0_0());
newCompositeNode(grammarAccess.getMultiplicityPartAccess().getIsUniqueNonuniqueParserRuleCall_1_1_1_0_0());
}
lv_isUnique_4_0=ruleNonunique
{
if ($current==null) {
$current = createModelElement(grammarAccess.getMultiplicityPartRule());
$current = createModelElementForParent(grammarAccess.getMultiplicityPartRule());
}
setWithLastConsumed($current, "isNonunique", lv_isNonunique_4_0 != null, "nonunique");
set(
$current,
"isUnique",
lv_isUnique_4_0,
"org.omg.kerml.xtext.KerML.Nonunique");
afterParserOrEnumRuleCall();
}
)
)
Expand All @@ -5654,6 +5664,28 @@ ruleMultiplicityPart[EObject in_current] returns [EObject current=in_current]
)
;

// Entry rule entryRuleNonunique
entryRuleNonunique returns [String current=null]:
{ newCompositeNode(grammarAccess.getNonuniqueRule()); }
iv_ruleNonunique=ruleNonunique
{ $current=$iv_ruleNonunique.current.getText(); }
EOF;

// Rule Nonunique
ruleNonunique returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
@init {
enterRule();
}
@after {
leaveRule();
}:
kw='nonunique'
{
$current.merge(kw);
newLeafNode(kw, grammarAccess.getNonuniqueAccess().getNonuniqueKeyword());
}
;


// Rule FeatureSpecialization
ruleFeatureSpecialization[EObject in_current] returns [EObject current=in_current]
Expand Down
Loading