Improve General View

Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
ObeoNetwork · Nov 27, 2023 · 2c8bae1 · 2c8bae1
1 parent 4b4eafa
commit 2c8bae1
Show file tree

Hide file tree

Showing 81 changed files with 3,874 additions and 971 deletions.
diff --git a/backend/application/pom.xml b/backend/application/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2023 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
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+     Obeo - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.syson</groupId>
+	<artifactId>syson-application-parent</artifactId>
+	<version>2023.10.8</version>
+
+	<name>syson-application-parent</name>
+	<description>SysON Application Parent</description>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>syson-application</module>
+		<module>syson-application-configuration</module>
+	</modules>
+</project>
diff --git a/backend/application/syson-application-configuration/.checkstyle b/backend/application/syson-application-configuration/.checkstyle
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="SysON" local="false">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
+  <local-check-config name="maven-checkstyle-plugin validate" location="file:/Users/arichard/git/obeo/SysON/backend/releng/syson-resources/checkstyle/CheckstyleConfiguration.xml" type="remote" description="maven-checkstyle-plugin configuration validate">
+    <property name="checkstyle.header.file" value="/Users/arichard/dev/202310_SysON/ws/.metadata/.plugins/org.eclipse.core.resources/.projects/syson-application-configuration/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-validate.txt"/>
+    <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+  </local-check-config>
+  <fileset name="java-sources-validate" enabled="true" check-config-name="maven-checkstyle-plugin validate" local="true">
+    <file-match-pattern match-pattern="^src/main/java/.*\/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java.*\/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
     <filter-data value="src/main/resources"/>

diff --git a/backend/application/syson-application-configuration/pom.xml b/backend/application/syson-application-configuration/pom.xml
@@ -74,6 +74,11 @@
 			<artifactId>sirius-components-widget-reference-view-edit</artifactId>
 			<version>${sirius.web.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.sirius</groupId>
+			<artifactId>sirius-components-collaborative-widget-reference</artifactId>
+			<version>${sirius.web.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sirius</groupId>
 			<artifactId>sirius-web-services</artifactId>

diff --git a/...rc/main/java/org/eclipse/syson/application/configuration/SysMLv2PropertiesConfigurer.java b/...rc/main/java/org/eclipse/syson/application/configuration/SysMLv2PropertiesConfigurer.java
@@ -294,8 +294,12 @@ private WidgetDescription createReferenceWidget() {
         ReferenceWidgetDescription refWidget = ReferenceFactory.eINSTANCE.createReferenceWidgetDescription();
         refWidget.setName("ReferenceWidget");
         refWidget.setLabelExpression("aql:self.getDetailsViewLabel(eStructuralFeature)");
-        refWidget.setReferenceNameExpression("aql:eStructuralFeature");
+        refWidget.setReferenceNameExpression("aql:eStructuralFeature.name");
+        refWidget.setReferenceOwnerExpression("aql:self");
         refWidget.setIsEnabledExpression("aql:not(eStructuralFeature.isReadOnly())");
+        ChangeContext setNewValueOperation = ViewFactory.eINSTANCE.createChangeContext();
+        setNewValueOperation.setExpression("aql:self.setNewValue(eStructuralFeature, " + ViewFormDescriptionConverter.NEW_VALUE + ")");
+        refWidget.getBody().add(setNewValueOperation);
         return refWidget;
     }
 }
diff --git a/...onfiguration/src/main/java/org/eclipse/syson/application/services/DetailsViewService.java b/...onfiguration/src/main/java/org/eclipse/syson/application/services/DetailsViewService.java
@@ -146,6 +146,6 @@ public EEnumLiteral getEnumValue(Element element, EAttribute eAttribute) {
     }
 
     public boolean isReference(EStructuralFeature eStructuralFeature) {
-        return eStructuralFeature instanceof EReference eReference && !eReference.isContainment() && eReference.isChangeable();
+        return eStructuralFeature instanceof EReference eReference && !eReference.isContainment() && !eReference.isContainer() && eReference.isChangeable();
     }
 }
diff --git a/backend/application/syson-application/.checkstyle b/backend/application/syson-application/.checkstyle
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="SysON" local="false">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
+  <local-check-config name="maven-checkstyle-plugin validate" location="file:/Users/arichard/git/obeo/SysON/backend/releng/syson-resources/checkstyle/CheckstyleConfiguration.xml" type="remote" description="maven-checkstyle-plugin configuration validate">
+    <property name="checkstyle.header.file" value="/Users/arichard/dev/202310_SysON/ws/.metadata/.plugins/org.eclipse.core.resources/.projects/syson-application/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-validate.txt"/>
+    <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+  </local-check-config>
+  <fileset name="java-sources-validate" enabled="true" check-config-name="maven-checkstyle-plugin validate" local="true">
+    <file-match-pattern match-pattern="^src/main/java/.*\/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/java.*\/.*\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+    <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
     <filter-data value="src/main/resources"/>

diff --git a/backend/metamodel/pom.xml b/backend/metamodel/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2023 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
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
+
+ Contributors:
+     Obeo - initial API and implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.syson</groupId>
+	<artifactId>syson-metamodel-parent</artifactId>
+	<version>2023.10.8</version>
+
+	<name>syson-metamodel-parent</name>
+	<description>SysON Metamodel Parent</description>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>syson-sysml-metamodel</module>
+		<module>syson-sysml-metamodel-edit</module>
+	</modules>
+</project>
diff --git a/...dit/src/main/java/org/eclipse/syson/sysml/provider/CalculationDefinitionItemProvider.java b/...dit/src/main/java/org/eclipse/syson/sysml/provider/CalculationDefinitionItemProvider.java
@@ -55,8 +55,8 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addExpressionPropertyDescriptor(object);
             addIsModelLevelEvaluablePropertyDescriptor(object);
+            addExpressionPropertyDescriptor(object);
             addResultPropertyDescriptor(object);
             addCalculationPropertyDescriptor(object);
         }

diff --git a/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationUsageItemProvider.java b/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/CalculationUsageItemProvider.java
@@ -55,8 +55,8 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addFunctionPropertyDescriptor(object);
             addIsModelLevelEvaluablePropertyDescriptor(object);
+            addFunctionPropertyDescriptor(object);
             addResultPropertyDescriptor(object);
             addCalculationDefinitionPropertyDescriptor(object);
         }

diff --git a/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectionUsageItemProvider.java b/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectionUsageItemProvider.java
@@ -55,10 +55,10 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addIndividualDefinitionPropertyDescriptor(object);
             addIsIndividualPropertyDescriptor(object);
-            addOccurrenceDefinitionPropertyDescriptor(object);
             addPortionKindPropertyDescriptor(object);
+            addIndividualDefinitionPropertyDescriptor(object);
+            addOccurrenceDefinitionPropertyDescriptor(object);
             addItemDefinitionPropertyDescriptor(object);
             addPartDefinitionPropertyDescriptor(object);
             addConnectionDefinitionPropertyDescriptor(object);

diff --git a/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java b/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorAsUsageItemProvider.java
@@ -62,9 +62,9 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             addRelatedElementPropertyDescriptor(object);
             addSourcePropertyDescriptor(object);
             addTargetPropertyDescriptor(object);
+            addIsDirectedPropertyDescriptor(object);
             addAssociationPropertyDescriptor(object);
             addConnectorEndPropertyDescriptor(object);
-            addIsDirectedPropertyDescriptor(object);
             addRelatedFeaturePropertyDescriptor(object);
             addSourceFeaturePropertyDescriptor(object);
             addTargetFeaturePropertyDescriptor(object);

diff --git a/...-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java b/...-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConnectorItemProvider.java
@@ -62,9 +62,9 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             addRelatedElementPropertyDescriptor(object);
             addSourcePropertyDescriptor(object);
             addTargetPropertyDescriptor(object);
+            addIsDirectedPropertyDescriptor(object);
             addAssociationPropertyDescriptor(object);
             addConnectorEndPropertyDescriptor(object);
-            addIsDirectedPropertyDescriptor(object);
             addRelatedFeaturePropertyDescriptor(object);
             addSourceFeaturePropertyDescriptor(object);
             addTargetFeaturePropertyDescriptor(object);

diff --git a/...edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintDefinitionItemProvider.java b/...edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintDefinitionItemProvider.java
@@ -57,8 +57,8 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             addParameterPropertyDescriptor(object);
             addStepPropertyDescriptor(object);
-            addExpressionPropertyDescriptor(object);
             addIsModelLevelEvaluablePropertyDescriptor(object);
+            addExpressionPropertyDescriptor(object);
             addResultPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;

diff --git a/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintUsageItemProvider.java b/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/ConstraintUsageItemProvider.java
@@ -57,8 +57,8 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             addBehaviorPropertyDescriptor(object);
             addParameterPropertyDescriptor(object);
-            addFunctionPropertyDescriptor(object);
             addIsModelLevelEvaluablePropertyDescriptor(object);
+            addFunctionPropertyDescriptor(object);
             addResultPropertyDescriptor(object);
             addPredicatePropertyDescriptor(object);
             addConstraintDefinitionPropertyDescriptor(object);

diff --git a/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/DefinitionItemProvider.java b/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/DefinitionItemProvider.java
@@ -55,8 +55,8 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addDirectedUsagePropertyDescriptor(object);
             addIsVariationPropertyDescriptor(object);
+            addDirectedUsagePropertyDescriptor(object);
             addOwnedActionPropertyDescriptor(object);
             addOwnedAllocationPropertyDescriptor(object);
             addOwnedAnalysisCasePropertyDescriptor(object);

diff --git a/...ml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ElementItemProvider.java b/...ml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ElementItemProvider.java
@@ -77,18 +77,18 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             addAliasIdsPropertyDescriptor(object);
             addDeclaredNamePropertyDescriptor(object);
             addDeclaredShortNamePropertyDescriptor(object);
-            addDocumentationPropertyDescriptor(object);
             addElementIdPropertyDescriptor(object);
             addIsImpliedIncludedPropertyDescriptor(object);
             addIsLibraryElementPropertyDescriptor(object);
             addNamePropertyDescriptor(object);
+            addQualifiedNamePropertyDescriptor(object);
+            addShortNamePropertyDescriptor(object);
+            addDocumentationPropertyDescriptor(object);
             addOwnedAnnotationPropertyDescriptor(object);
             addOwnedElementPropertyDescriptor(object);
             addOwnerPropertyDescriptor(object);
             addOwningMembershipPropertyDescriptor(object);
             addOwningNamespacePropertyDescriptor(object);
-            addQualifiedNamePropertyDescriptor(object);
-            addShortNamePropertyDescriptor(object);
             addTextualRepresentationPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;

diff --git a/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ExpressionItemProvider.java b/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ExpressionItemProvider.java
@@ -55,8 +55,8 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addFunctionPropertyDescriptor(object);
             addIsModelLevelEvaluablePropertyDescriptor(object);
+            addFunctionPropertyDescriptor(object);
             addResultPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;

diff --git a/...ml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureItemProvider.java b/...ml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureItemProvider.java
@@ -55,10 +55,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addChainingFeaturePropertyDescriptor(object);
             addDirectionPropertyDescriptor(object);
-            addEndOwningTypePropertyDescriptor(object);
-            addFeaturingTypePropertyDescriptor(object);
             addIsCompositePropertyDescriptor(object);
             addIsDerivedPropertyDescriptor(object);
             addIsEndPropertyDescriptor(object);
@@ -67,6 +64,9 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             addIsPortionPropertyDescriptor(object);
             addIsReadOnlyPropertyDescriptor(object);
             addIsUniquePropertyDescriptor(object);
+            addChainingFeaturePropertyDescriptor(object);
+            addEndOwningTypePropertyDescriptor(object);
+            addFeaturingTypePropertyDescriptor(object);
             addOwnedFeatureChainingPropertyDescriptor(object);
             addOwnedFeatureInvertingPropertyDescriptor(object);
             addOwnedRedefinitionPropertyDescriptor(object);

diff --git a/...tamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureValueItemProvider.java b/...tamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FeatureValueItemProvider.java
@@ -55,9 +55,9 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addFeatureWithValuePropertyDescriptor(object);
             addIsDefaultPropertyDescriptor(object);
             addIsInitialPropertyDescriptor(object);
+            addFeatureWithValuePropertyDescriptor(object);
             addValuePropertyDescriptor(object);
         }
         return itemPropertyDescriptors;

diff --git a/...l-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FunctionItemProvider.java b/...l-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/FunctionItemProvider.java
@@ -55,8 +55,8 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addExpressionPropertyDescriptor(object);
             addIsModelLevelEvaluablePropertyDescriptor(object);
+            addExpressionPropertyDescriptor(object);
             addResultPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;

diff --git a/...sml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ImportItemProvider.java b/...sml-metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/ImportItemProvider.java
@@ -55,11 +55,11 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addImportedElementPropertyDescriptor(object);
-            addImportOwningNamespacePropertyDescriptor(object);
             addIsImportAllPropertyDescriptor(object);
             addIsRecursivePropertyDescriptor(object);
             addVisibilityPropertyDescriptor(object);
+            addImportedElementPropertyDescriptor(object);
+            addImportOwningNamespacePropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }

diff --git a/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MembershipItemProvider.java b/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MembershipItemProvider.java
@@ -55,12 +55,12 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addMemberElementPropertyDescriptor(object);
             addMemberElementIdPropertyDescriptor(object);
             addMemberNamePropertyDescriptor(object);
-            addMembershipOwningNamespacePropertyDescriptor(object);
             addMemberShortNamePropertyDescriptor(object);
             addVisibilityPropertyDescriptor(object);
+            addMemberElementPropertyDescriptor(object);
+            addMembershipOwningNamespacePropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }

diff --git a/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/OccurrenceUsageItemProvider.java b/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/OccurrenceUsageItemProvider.java
@@ -55,10 +55,10 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addIndividualDefinitionPropertyDescriptor(object);
             addIsIndividualPropertyDescriptor(object);
-            addOccurrenceDefinitionPropertyDescriptor(object);
             addPortionKindPropertyDescriptor(object);
+            addIndividualDefinitionPropertyDescriptor(object);
+            addOccurrenceDefinitionPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }

diff --git a/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/OwningMembershipItemProvider.java b/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/OwningMembershipItemProvider.java
@@ -55,10 +55,10 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
-            addOwnedMemberElementPropertyDescriptor(object);
             addOwnedMemberElementIdPropertyDescriptor(object);
             addOwnedMemberNamePropertyDescriptor(object);
             addOwnedMemberShortNamePropertyDescriptor(object);
+            addOwnedMemberElementPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }

diff --git a/...dit/src/main/java/org/eclipse/syson/sysml/provider/RequirementDefinitionItemProvider.java b/...dit/src/main/java/org/eclipse/syson/sysml/provider/RequirementDefinitionItemProvider.java
@@ -55,14 +55,14 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
+            addReqIdPropertyDescriptor(object);
+            addTextPropertyDescriptor(object);
             addActorParameterPropertyDescriptor(object);
             addAssumedConstraintPropertyDescriptor(object);
             addFramedConcernPropertyDescriptor(object);
-            addReqIdPropertyDescriptor(object);
             addRequiredConstraintPropertyDescriptor(object);
             addStakeholderParameterPropertyDescriptor(object);
             addSubjectParameterPropertyDescriptor(object);
-            addTextPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }

diff --git a/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementUsageItemProvider.java b/...del-edit/src/main/java/org/eclipse/syson/sysml/provider/RequirementUsageItemProvider.java
@@ -55,15 +55,15 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
         if (itemPropertyDescriptors == null) {
             super.getPropertyDescriptors(object);
 
+            addReqIdPropertyDescriptor(object);
+            addTextPropertyDescriptor(object);
             addActorParameterPropertyDescriptor(object);
             addAssumedConstraintPropertyDescriptor(object);
             addFramedConcernPropertyDescriptor(object);
-            addReqIdPropertyDescriptor(object);
             addRequiredConstraintPropertyDescriptor(object);
             addRequirementDefinitionPropertyDescriptor(object);
             addStakeholderParameterPropertyDescriptor(object);
             addSubjectParameterPropertyDescriptor(object);
-            addTextPropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }