[564] Align metamodel to SysMLv2 Beta 2 specification

Bug: #564 Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
eclipse-syson · Jul 19, 2024 · 6022bec · 6022bec
1 parent 2ed355a
commit 6022bec
Show file tree

Hide file tree

Showing 101 changed files with 1,954 additions and 1,243 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -8,6 +8,22 @@
 - https://github.com/eclipse-syson/syson/issues/393[#393] [general-view] Code refactoring:
 * Rename `ExhibitStatesCompartmentItemNodeDescriptionProvider` to `StatesCompartmentItemNodeDescriptionProvider`.
 * _StatesCompartmentNodeDescriptionProvider_ now handles both exhibit and non-exhibit states.
+- https://github.com/eclipse-syson/syson/issues/564[#564] [metamodel] Align metamodel to SysMLv2 Beta 2 specification released on the 3rd of February 2024(see https://www.omg.org/spec/SysML/ for more details) and KerML Beta 2 specification released on the 17the of February 2024(see https://www.omg.org/spec/KerML/ for more details).
+You may have to fix your existing SysON models/projects by your own means to still be able to open them with SysON.
+Please download all your models/projects before upgrading to 2024.9.0.
+The changes are:
+* AnnotatingElement
+** add derived reference "ownedAnnotatingRelationship : Annotation"
+* Annotation
+** add derived reference "owningAnnotatingElement : AnnotatingElement"
+* Connector
+** remove attribute "isDirected : boolean"
+* OperatorExpression
+** remove derived reference "operand : Expression"
+* ParameterMembership
+** add operation "parameterDirection()  : FeatureDirectionKind"
+* Type
+** add operation "directionOfExcluding(Feature, Type[0..\*]) : FeatureDirectionKind"
 
 === Dependency update
 

diff --git a/...el-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotatingElementItemProvider.java b/...el-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotatingElementItemProvider.java
@@ -50,6 +50,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotationPropertyDescriptor(object);
+            this.addOwnedAnnotatingRelationshipPropertyDescriptor(object);
         }
         return this.itemPropertyDescriptors;
     }
@@ -92,6 +93,26 @@ protected void addAnnotationPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owned Annotating Relationship feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwnedAnnotatingRelationshipPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_AnnotatingElement_ownedAnnotatingRelationship_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_AnnotatingElement_ownedAnnotatingRelationship_feature", "_UI_AnnotatingElement_type"),
+                SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This returns AnnotatingElement.svg. <!-- begin-user-doc --> <!-- end-user-doc -->
      *

diff --git a/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotationItemProvider.java b/...metamodel-edit/src/main/java/org/eclipse/syson/sysml/provider/AnnotationItemProvider.java
@@ -51,6 +51,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotatingElementPropertyDescriptor(object);
             this.addOwningAnnotatedElementPropertyDescriptor(object);
+            this.addOwningAnnotatingElementPropertyDescriptor(object);
         }
         return this.itemPropertyDescriptors;
     }
@@ -113,6 +114,26 @@ protected void addOwningAnnotatedElementPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owning Annotating Element feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwningAnnotatingElementPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_Annotation_owningAnnotatingElement_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_Annotation_owningAnnotatingElement_feature", "_UI_Annotation_type"),
+                SysmlPackage.eINSTANCE.getAnnotation_OwningAnnotatingElement(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This returns Annotation.svg. <!-- begin-user-doc --> <!-- end-user-doc -->
      *

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
@@ -56,7 +56,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             this.addRelatedElementPropertyDescriptor(object);
             this.addSourcePropertyDescriptor(object);
             this.addTargetPropertyDescriptor(object);
-            this.addIsDirectedPropertyDescriptor(object);
             this.addAssociationPropertyDescriptor(object);
             this.addConnectorEndPropertyDescriptor(object);
             this.addRelatedFeaturePropertyDescriptor(object);
@@ -180,25 +179,6 @@ protected void addConnectorEndPropertyDescriptor(Object object) {
                 null));
     }
 
-    /**
-     * This adds a property descriptor for the Is Directed feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addIsDirectedPropertyDescriptor(Object object) {
-        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
-                this.getResourceLocator(),
-                this.getString("_UI_Connector_isDirected_feature"),
-                this.getString("_UI_PropertyDescriptor_description", "_UI_Connector_isDirected_feature", "_UI_Connector_type"),
-                SysmlPackage.eINSTANCE.getConnector_IsDirected(),
-                true,
-                false,
-                false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                null,
-                null));
-    }
-
     /**
      * This adds a property descriptor for the Related Feature feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -310,7 +290,6 @@ public void notifyChanged(Notification notification) {
 
         switch (notification.getFeatureID(ConnectorAsUsage.class)) {
             case SysmlPackage.CONNECTOR_AS_USAGE__IS_IMPLIED:
-            case SysmlPackage.CONNECTOR_AS_USAGE__IS_DIRECTED:
                 this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
                 return;
             case SysmlPackage.CONNECTOR_AS_USAGE__OWNED_RELATED_ELEMENT:

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
@@ -56,7 +56,6 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
             this.addRelatedElementPropertyDescriptor(object);
             this.addSourcePropertyDescriptor(object);
             this.addTargetPropertyDescriptor(object);
-            this.addIsDirectedPropertyDescriptor(object);
             this.addAssociationPropertyDescriptor(object);
             this.addConnectorEndPropertyDescriptor(object);
             this.addRelatedFeaturePropertyDescriptor(object);
@@ -180,25 +179,6 @@ protected void addConnectorEndPropertyDescriptor(Object object) {
                 null));
     }
 
-    /**
-     * This adds a property descriptor for the Is Directed feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    protected void addIsDirectedPropertyDescriptor(Object object) {
-        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
-                this.getResourceLocator(),
-                this.getString("_UI_Connector_isDirected_feature"),
-                this.getString("_UI_PropertyDescriptor_description", "_UI_Connector_isDirected_feature", "_UI_Connector_type"),
-                SysmlPackage.eINSTANCE.getConnector_IsDirected(),
-                true,
-                false,
-                false,
-                ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-                null,
-                null));
-    }
-
     /**
      * This adds a property descriptor for the Related Feature feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *
@@ -320,7 +300,6 @@ public void notifyChanged(Notification notification) {
 
         switch (notification.getFeatureID(Connector.class)) {
             case SysmlPackage.CONNECTOR__IS_IMPLIED:
-            case SysmlPackage.CONNECTOR__IS_DIRECTED:
                 this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
                 return;
             case SysmlPackage.CONNECTOR__OWNED_RELATED_ELEMENT:

diff --git a/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataFeatureItemProvider.java b/...odel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataFeatureItemProvider.java
@@ -50,6 +50,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotationPropertyDescriptor(object);
+            this.addOwnedAnnotatingRelationshipPropertyDescriptor(object);
             this.addMetaclassPropertyDescriptor(object);
         }
         return this.itemPropertyDescriptors;
@@ -93,6 +94,26 @@ protected void addAnnotationPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owned Annotating Relationship feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwnedAnnotatingRelationshipPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_AnnotatingElement_ownedAnnotatingRelationship_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_AnnotatingElement_ownedAnnotatingRelationship_feature", "_UI_AnnotatingElement_type"),
+                SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This adds a property descriptor for the Metaclass feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *

diff --git a/...amodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataUsageItemProvider.java b/...amodel-edit/src/main/java/org/eclipse/syson/sysml/provider/MetadataUsageItemProvider.java
@@ -50,6 +50,7 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
 
             this.addAnnotatedElementPropertyDescriptor(object);
             this.addAnnotationPropertyDescriptor(object);
+            this.addOwnedAnnotatingRelationshipPropertyDescriptor(object);
             this.addMetaclassPropertyDescriptor(object);
             this.addMetadataDefinitionPropertyDescriptor(object);
         }
@@ -94,6 +95,26 @@ protected void addAnnotationPropertyDescriptor(Object object) {
                 null));
     }
 
+    /**
+     * This adds a property descriptor for the Owned Annotating Relationship feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     *
+     * @generated
+     */
+    protected void addOwnedAnnotatingRelationshipPropertyDescriptor(Object object) {
+        this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(),
+                this.getResourceLocator(),
+                this.getString("_UI_AnnotatingElement_ownedAnnotatingRelationship_feature"),
+                this.getString("_UI_PropertyDescriptor_description", "_UI_AnnotatingElement_ownedAnnotatingRelationship_feature", "_UI_AnnotatingElement_type"),
+                SysmlPackage.eINSTANCE.getAnnotatingElement_OwnedAnnotatingRelationship(),
+                false,
+                false,
+                false,
+                null,
+                null,
+                null));
+    }
+
     /**
      * This adds a property descriptor for the Metaclass feature. <!-- begin-user-doc --> <!-- end-user-doc -->
      *