[2049] Fix direct edit on "end" element

Bug: #2049
Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>

Author: AxelRICHARD

CHANGELOG.adoc

@@ -93,6 +93,9 @@ For example `ViewUsage` elements are no longer rendered in _parts_ compartments.
 It now follows the same rule than all other graphical node: if a compartment that can display the new `PerformActionUsage` is displayed, then the new `PerformActionUsage` is displayed in this compartment, otherwise it is displayed in the diagram background.
 - https://github.com/eclipse-syson/syson/issues/2046[#2046] [diagrams] Fix an issue where the creation of a `RequirementUsage` from a `Package` graphical node was not revealing it.
 - https://github.com/eclipse-syson/syson/issues/1990[#1990] [diagrams] Fix the `EnumerationDefinition` graphical node compartment name to follow the SysMLv2 specification.
+- https://github.com/eclipse-syson/syson/issues/2049[#2049] [diagrams] Fix the direct edit and the display of `ends` graphical node elements inside the _ends_ compartment.
+Now the _end_ keyword is not displayed anymore in the label of these graphical nodes, and the direct edit only allows to edit the name of the end instead of the full label which was confusing for users.
+
 
 === Improvements
 

backend/services/syson-diagram-services/src/main/java/org/eclipse/syson/diagram/services/DiagramQueryLabelService.java

@@ -27,6 +27,7 @@
 import org.eclipse.syson.sysml.ActionUsage;
 import org.eclipse.syson.sysml.AttributeUsage;
 import org.eclipse.syson.sysml.Comment;
+import org.eclipse.syson.sysml.ConnectionDefinition;
 import org.eclipse.syson.sysml.ConnectionUsage;
 import org.eclipse.syson.sysml.ConstraintUsage;
 import org.eclipse.syson.sysml.Definition;
@@ -457,13 +458,13 @@ public String getUsageListItemPrefix(Usage usage) {
         if (usage.isIsVariation()) {
             label.append(LabelConstants.VARIATION + LabelConstants.SPACE);
         }
-        if (usage.isIsConstant()) {
+        if (usage.isIsConstant() && !(usage.getOwner() instanceof ConnectionDefinition)) {
             label.append(LabelConstants.CONSTANT + LabelConstants.SPACE);
         }
         if (usage.isIsDerived()) {
             label.append(LabelConstants.DERIVED + LabelConstants.SPACE);
         }
-        if (usage.isIsEnd()) {
+        if (usage.isIsEnd() && !(usage.getOwner() instanceof ConnectionDefinition)) {
             label.append(LabelConstants.END + LabelConstants.SPACE);
         }
         this.getReferenceUsagePrefix(usage, label);
@@ -792,7 +793,7 @@ private String getShortNameLabel(Element element) {
      *         otherwise.
      */
     private void getReferenceUsagePrefix(Usage usage, StringBuilder label) {
-        if (usage.isIsReference() && !(usage instanceof AttributeUsage)) {
+        if (usage.isIsReference() && !(usage instanceof AttributeUsage) && !(usage.getOwner() instanceof ConnectionDefinition)) {
             // AttributeUsage are always referential, so no need to add the ref keyword
             label.append(LabelConstants.REF + LabelConstants.SPACE);
         }

backend/services/syson-services/src/main/java/org/eclipse/syson/services/DiagramDirectEditListener.java

@@ -226,12 +226,6 @@ public void exitListItemExpression(ListItemExpressionContext ctx) {
             }
         }
         this.handleMissingDirectionPrefixExpression(ctx);
-        this.handleMissingAbstractPrefixExpression(ctx);
-        this.handleMissingDerivedPrefixExpression(ctx);
-        this.handleMissingEndPrefixExpression(ctx);
-        this.handleMissingVariationPrefixExpression(ctx);
-        this.handleMissingConstantPrefixExpression(ctx);
-        this.handleMissingReferenceExpression(ctx);
         this.handleMissingMultiplicityExpression(ctx);
         this.handleMissingOrderedMultiplicityExpression(ctx);
         this.handleMissingNonuniqueMultiplicityExpression(ctx);
@@ -281,10 +275,6 @@ public void exitAbstractPrefixExpression(AbstractPrefixExpressionContext ctx) {
         if (this.element instanceof Usage usage) {
             if (ctx != null) {
                 usage.setIsAbstract(true);
-            } else {
-                usage.setIsAbstract(false);
-                // A variation is always abstract
-                usage.setIsVariation(false);
             }
         }
         super.exitAbstractPrefixExpression(ctx);
@@ -305,8 +295,6 @@ public void exitDerivedPrefixExpression(DerivedPrefixExpressionContext ctx) {
         if (this.element instanceof Usage usage) {
             if (ctx != null) {
                 usage.setIsDerived(true);
-            } else {
-                usage.setIsDerived(false);
             }
         }
         super.exitDerivedPrefixExpression(ctx);
@@ -317,8 +305,6 @@ public void exitEndPrefixExpression(EndPrefixExpressionContext ctx) {
         if (this.element instanceof Usage usage) {
             if (ctx != null) {
                 usage.setIsEnd(true);
-            } else {
-                usage.setIsEnd(false);
             }
         }
         super.exitEndPrefixExpression(ctx);
@@ -329,8 +315,6 @@ public void exitConstantPrefixExpression(ConstantPrefixExpressionContext ctx) {
         if (this.element instanceof Usage usage) {
             if (ctx != null) {
                 usage.setIsConstant(true);
-            } else {
-                usage.setIsConstant(false);
             }
         }
         super.exitConstantPrefixExpression(ctx);
@@ -343,8 +327,6 @@ public void exitVariationPrefixExpression(VariationPrefixExpressionContext ctx)
                 usage.setIsVariation(true);
                 // A variation is always abstract
                 usage.setIsAbstract(true);
-            } else {
-                usage.setIsVariation(false);
             }
         }
         super.exitVariationPrefixExpression(ctx);
@@ -396,8 +378,6 @@ public void exitOrderedMultiplicityExpression(OrderedMultiplicityExpressionConte
         if (this.element instanceof Usage usage) {
             if (ctx != null) {
                 usage.setIsOrdered(true);
-            } else {
-                usage.setIsOrdered(false);
             }
         }
         super.exitOrderedMultiplicityExpression(ctx);
@@ -408,8 +388,6 @@ public void exitNonuniqueMultiplicityExpression(NonuniqueMultiplicityExpressionC
         if (this.element instanceof Usage usage) {
             if (ctx != null) {
                 usage.setIsUnique(false);
-            } else {
-                usage.setIsUnique(true);
             }
         }
         super.exitNonuniqueMultiplicityExpression(ctx);
@@ -1077,27 +1055,6 @@ private void handleMissingAbstractPrefixExpression(ParserRuleContext ctx) {
         }
     }
 
-    private void handleMissingDerivedPrefixExpression(ListItemExpressionContext ctx) {
-        DerivedPrefixExpressionContext derivedPrefixExpression = ctx.prefixListItemExpression().derivedPrefixExpression(0);
-        if (this.element instanceof Usage usage && derivedPrefixExpression == null) {
-            usage.setIsDerived(false);
-        }
-    }
-
-    private void handleMissingEndPrefixExpression(ListItemExpressionContext ctx) {
-        EndPrefixExpressionContext endPrefixExpression = ctx.prefixListItemExpression().endPrefixExpression(0);
-        if (this.element instanceof Usage usage && endPrefixExpression == null) {
-            usage.setIsEnd(false);
-        }
-    }
-
-    private void handleMissingConstantPrefixExpression(ListItemExpressionContext ctx) {
-        ConstantPrefixExpressionContext constantPrefixExpression = ctx.prefixListItemExpression().constantPrefixExpression(0);
-        if (this.element instanceof Usage usage && constantPrefixExpression == null) {
-            usage.setIsConstant(false);
-        }
-    }
-
     private void handleMissingVariationPrefixExpression(ParserRuleContext ctx) {
         VariationPrefixExpressionContext variationPrefixExpression = null;
         if (ctx instanceof ListItemExpressionContext listCtx) {

doc/content/modules/user-manual/pages/hands-on/how-tos/model-management.adoc

@@ -311,18 +311,21 @@ These shortcuts offer a convenient way to update model elements efficiently.
 
 [WARNING]
 ====
-When using the direct edit tool to set the name of an `Element` be aware that the following keywords would not be accepted in the name part of your input:
-
-* ':'
-* ':>'
-* '::>'
-* ':>>'
-* '=' 
-* ':='
-* '['
-* ' default'
-* ' ordered'
-* ' nonunique'
-
-To be able to use those in the name of the `Element`, use the "name" field in the {details} view.
+In diagrams, when using the direct edit tool to set the name of an `Element` be aware that the following keywords would not be accepted in the name part of your input:
+
+* ':' (because it's used to set the type of an `Element`)
+* ':>' (because it's used to set a subsetting `Relationship` between two `Element`)
+* '::>' (because it's used to set a redefinition `Relationship` between two `Element`)
+* ':>>' (because it's used to set a reference subsetting `Relationship` between two `Element`)
+* '=' (because it's used to set a value to a `Feature`)
+* ':=' (because it's used to set an initial value to a `Feature`)
+* '[' (because it's used to set the cardinality of an `Element` or a `Relationship`)
+* ' constant' (note the space before _constant_)(because it's used to set a `Feature` as constant)
+* ' default' (note the space before _default_)(because it's used to set a `Feature` value as default)
+* ' end' (note the space before _end_)(because it's used to set a `Feature` as an end)
+* ' nonunique' (note the space before _nonunique_)(because it's used to set a `Feature` as non-unique)
+* ' ordered' (note the space before _ordered_)(because it's used to set a `Feature` as ordered)
+* ' variation' (note the space before _variation_)(because it's used to set a `Feature` as a variation)
+
+To be able to use those in the name of the `Element`, use the "Declared Name" text field in the {details} view.
 ====

doc/content/modules/user-manual/pages/release-notes/2026.3.0.adoc

@@ -30,6 +30,8 @@ They can also add their own SysML-based validation rules by returning additional
 It now follows the same rule than all other graphical node: if a compartment that can display the new `PerformActionUsage` is displayed, then the new `PerformActionUsage` is displayed in this compartment, otherwise it is displayed in the diagram background.
 ** Fix an issue where the creation of a `RequirementUsage` from a `Package` graphical node was not revealing it.
 ** Fix the `EnumerationDefinition` graphical node compartment name from `enumerations` to `enums`, to follow the SysMLv2 specification.
+** Fix the direct edit and the display of `ends` graphical node elements inside the _ends_ compartment.
+Now the _end_ keyword is not displayed anymore in the label of these graphical nodes, and the direct edit only allows to edit the name of the `end` element instead of the full label which was confusing for users.
 
 * In textual import/export:
 

scripts/check-coverage.jsh

@@ -34,17 +34,17 @@ var moduleCoverageData = List.of(
   new ModuleCoverage("syson-application", 37.0),
   new ModuleCoverage("syson-application-configuration", 75.0),
   new ModuleCoverage("syson-common-view", 100.0),
-  new ModuleCoverage("syson-diagram-common-view", 88.0),
+  new ModuleCoverage("syson-diagram-common-view", 89.0),
   new ModuleCoverage("syson-diagram-services", 84.0),
-  new ModuleCoverage("syson-direct-edit-grammar", 68.0),
+  new ModuleCoverage("syson-direct-edit-grammar", 67.0),
   new ModuleCoverage("syson-form-services", 100.0),
   new ModuleCoverage("syson-model-services", 94.0),
   new ModuleCoverage("syson-representation-services", 100.0),
   new ModuleCoverage("syson-services", 64.0),
   new ModuleCoverage("syson-siriusweb-customnodes-metamodel", 41.0),
   new ModuleCoverage("syson-siriusweb-customnodes-metamodel-edit", 0.0),
   new ModuleCoverage("syson-standard-diagrams-view", 97.0),
-  new ModuleCoverage("syson-sysml-export", 69.0),
+  new ModuleCoverage("syson-sysml-export", 71.0),
   new ModuleCoverage("syson-sysml-import", 85.0),
   new ModuleCoverage("syson-sysml-metamodel", 76.0),
   new ModuleCoverage("syson-sysml-metamodel-edit", 17.0),