[1003] Fix Feature labels using a default FeatureValue relationship

Bug: #1003
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>

Author: adaussy

CHANGELOG.adoc

@@ -27,7 +27,8 @@ New default names now includes a number, this number corresponding to the count
 They are now properly downloaded.
 Export to textual SysMLv2 is not fully implemented yet so there are still unhandled cases.
 - https://github.com/eclipse-syson/syson/issues/998[#998] Fix `Port Usage` labels in diagrams.
-- https://github.com/eclipse-syson/syson/issues/1002[#1002] Invalid label for Feature (e.g.: `Attribute Usage`) when the `Feature Value` aims to define "initial" value.
+- https://github.com/eclipse-syson/syson/issues/1002[#1002] Invalid label for `Usages` (e.g.: `Attribute Usage`) when their `Feature Value` aims to define "initial" value.
+- https://github.com/eclipse-syson/syson/issues/1003[#1003] Invalid label for `Usages` (e.g.: `Attribute Usage`) when their `Feature Value` aims to define "default" value.
 
 === Improvements
 

backend/application/syson-application/src/test/java/org/eclipse/syson/application/export/ImportExportTests.java

@@ -48,7 +48,6 @@ public class ImportExportTests extends AbstractIntegrationTests {
     @Autowired
     private SysMLEditingContextProcessor sysMLEditingContextProcessor;
 
-
     private SysmlImportExportChecker checker;
 
     @BeforeEach
@@ -172,13 +171,13 @@ public void checkImportPort() throws IOException {
     public void checkScalarValueAttribute() throws IOException {
         var input = """
                 package Occurrences {
-                  private import ScalarValues::*;
-                  occurrence def Occurrence1 {
-                      attribute a : Integer;
-                      attribute b : Integer default = 1;
-                      attribute c : Integer = 1;
-                      attribute d : Integer := 3;
-                  }
+                    private import ScalarValues::*;
+                    occurrence def Occurrence1 {
+                        attribute a : Integer;
+                        attribute b : Integer default = 1;
+                        attribute c : Integer = 1;
+                        attribute d : Integer := 3;
+                    }
                 }""";
         this.checker.check(input, input);
     }

backend/application/syson-application/src/test/java/org/eclipse/syson/application/export/checker/SysmlImportExportChecker.java

@@ -50,8 +50,6 @@ public class SysmlImportExportChecker {
 
     private final SysMLEditingContextProcessor sysMLEditingContextProcessor;
 
-
-
     public SysmlImportExportChecker(SysMLExternalResourceLoaderService sysmlLoader, IEditingDomainFactory editingDomainFactory, SysMLv2DocumentExporter exporter, SysMLEditingContextProcessor sysMLEditingContextProcessor) {
         super();
         this.sysMLEditingContextProcessor = Objects.requireNonNull(sysMLEditingContextProcessor);

backend/application/syson-sysml-export/src/main/java/org/eclipse/syson/sysml/export/SysMLElementSerializer.java

@@ -1206,16 +1206,13 @@ private void appendValuePart(Appender builder, Usage usage) {
 
         for (FeatureValue feature : ownedRelationship) {
             builder.appendSpaceIfNeeded();
+            if (feature.isIsDefault()) {
+                builder.appendWithSpaceIfNeeded(LabelConstants.DEFAULT);
+            }
             if (feature.isIsInitial()) {
-                builder.append(":=");
-            } else if (feature.isIsDefault()) {
-                builder.append("default");
-                if (feature.isIsInitial()) {
-                    builder.append(":");
-                }
-                builder.append("=");
+                builder.appendWithSpaceIfNeeded(":=");
             } else {
-                builder.append("=");
+                builder.appendWithSpaceIfNeeded(LabelConstants.EQUAL);
             }
             this.appendOwnedExpression(builder, feature.getValue());
         }

backend/metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/helper/LabelConstants.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023, 2024 Obeo.
+ * Copyright (c) 2023, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -78,4 +78,6 @@ public class LabelConstants {
     public static final String VARIANT = "variant";
 
     public static final String VARIATION = "variation";
+
+    public static final String DEFAULT = "default";
 }

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

@@ -553,9 +553,15 @@ protected String getValueLabel(Usage usage) {
             if (expression != null) {
                 valueAsString = this.getValue(expression);
             }
+
+            if (featureValue.get().isIsDefault()) {
+                label
+                        .append(LabelConstants.SPACE)
+                        .append(LabelConstants.DEFAULT);
+            }
             label
                     .append(LabelConstants.SPACE)
-                    .append(getFeatureValueRelationshipSymbol(featureValue.get()))
+                    .append(this.getFeatureValueRelationshipSymbol(featureValue.get()))
                     .append(LabelConstants.SPACE)
                     .append(valueAsString);
         }

backend/views/syson-diagram-common-view/src/test/java/org/eclipse/syson/diagram/common/view/services/ViewLabelServiceTest.java

@@ -104,6 +104,30 @@ public void testInitalFeatureValueSymboleLabel() {
 
     }
 
+    @DisplayName("Given a FeatureValue to an attribute, when it is a default FeatureValue relationship, then the label should use the symbole ':=' instead of '='")
+    @Test
+    public void testDefaultFeatureValueSymboleLabel() {
+        AttributeUsage attributeUsage = SysmlFactory.eINSTANCE.createAttributeUsage();
+        attributeUsage.setDeclaredName(ATTRIBUTE_USAGE_NAME);
+
+        LiteralInteger literal = SysmlFactory.eINSTANCE.createLiteralInteger();
+        literal.setValue(1);
+        FeatureValue featureValue = SysmlFactory.eINSTANCE.createFeatureValue();
+        featureValue.getOwnedRelatedElement().add(literal);
+        attributeUsage.getOwnedRelationship().add(featureValue);
+
+        assertEquals("myAttributeUsage = 1", this.viewLabelService.getCompartmentItemLabel(attributeUsage));
+
+        featureValue.setIsDefault(true);
+
+        assertEquals("myAttributeUsage default = 1", this.viewLabelService.getCompartmentItemLabel(attributeUsage));
+        
+        featureValue.setIsInitial(true);
+        
+        assertEquals("myAttributeUsage default := 1", this.viewLabelService.getCompartmentItemLabel(attributeUsage));
+
+    }
+
     @DisplayName("Check Attribute Usage item label with no name")
     @Test
     void testItemCompartmentLabelWithoutName() {

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

@@ -33,7 +33,8 @@ For example, if a `PartDefinition` already defines 5 parts, then a new `Part` cr
 They are now properly downloaded.
 Export to textual SysMLv2 is not fully implemented yet so there are still unhandled cases.
 - Fix `Port Usage` labels in diagrams (feature typing was incorrectly duplicated).
-- In diagrams, labels of `Usages` (e.g.: `Attribute Usages`) with a `FeatureValue` relationship having an _initial_ property set to true now use the ":=" symbole instead of "=".
+- In diagrams, labels of `Usages` (e.g.: `Attribute Usages`) with a `Feature Value` relationship having the _initial_ property set to true now use the ":=" symbol instead of "=".
+- In diagrams, labels of `Usages` (e.g.: `Attribute Usages`) with a `Feature Value` relationship having the _default_ property set to true now display the _default_ keyword.
 
 == New features