[394] Fix some minor issue with redefine feature

Bug: eclipse-syson#394 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
adaussy · Jun 13, 2024 · 10f9867 · 10f9867
1 parent 3be75ba
commit 10f9867
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 52 deletions.
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
@@ -41,6 +41,7 @@
 import org.eclipse.syson.sysml.EndFeatureMembership;
 import org.eclipse.syson.sysml.Feature;
 import org.eclipse.syson.sysml.FeatureDirectionKind;
+import org.eclipse.syson.sysml.FeatureMembership;
 import org.eclipse.syson.sysml.FeatureReferenceExpression;
 import org.eclipse.syson.sysml.FeatureTyping;
 import org.eclipse.syson.sysml.FeatureValue;
@@ -164,6 +165,8 @@ public boolean isReadOnly(Element element, EStructuralFeature eStructuralFeature
             if ((element instanceof StateUsage && SysmlPackage.eINSTANCE.getStateUsage_IsParallel().equals(eStructuralFeature))
                     || (element instanceof StateDefinition && SysmlPackage.eINSTANCE.getStateDefinition_IsParallel().equals(eStructuralFeature))) {
                 isReadOnly = isReadOnly || ((Type) element).getOwnedFeature().stream().filter(TransitionUsage.class::isInstance).findAny().isPresent();
+            } else if (element instanceof FeatureMembership && SysmlPackage.eINSTANCE.getFeaturing_Feature().equals(eStructuralFeature)) {
+                isReadOnly = true;
             }
         }
         return isReadOnly;

diff --git a/...ml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImpl.java b/...ml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImpl.java
@@ -73,9 +73,9 @@ public PortDefinition getOriginalPortDefinition() {
      * @generated NOT
      */
     public PortDefinition basicGetOriginalPortDefinition() {
-        Namespace owningNamespace = this.getOwningNamespace();
-        if (owningNamespace instanceof PortDefinition portDefinition) {
-            return portDefinition;
+        PortConjugation conjugator = this.getOwnedPortConjugator();
+        if (conjugator != null) {
+            return conjugator.getOriginalPortDefinition();
         }
         return null;
     }
@@ -171,4 +171,14 @@ public Conjugation getOwnedConjugator() {
         return this.getOwnedPortConjugator();
     }
 
+    /**
+     * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+    @Override
+    public Namespace getOwningNamespace() {
+        return this.getOriginalPortDefinition();
+    }
+
 } // ConjugatedPortDefinitionImpl
diff --git a/...son-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureMembershipImpl.java b/...son-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/FeatureMembershipImpl.java
@@ -80,50 +80,23 @@ protected EClass eStaticClass() {
         return SysmlPackage.eINSTANCE.getFeatureMembership();
     }
 
-    /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @generated
-     */
-    @Override
-    public Feature getFeature() {
-        if (this.feature != null && this.feature.eIsProxy()) {
-            InternalEObject oldFeature = (InternalEObject) this.feature;
-            this.feature = (Feature) this.eResolveProxy(oldFeature);
-            if (this.feature != oldFeature) {
-                if (this.eNotificationRequired()) {
-                    this.eNotify(new ENotificationImpl(this, Notification.RESOLVE, SysmlPackage.FEATURE_MEMBERSHIP__FEATURE, oldFeature, this.feature));
-                }
-            }
-        }
-        return this.feature;
-    }
-
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated NOT
      */
     public Feature basicGetFeature() {
-        Feature ownedMemberFeature = this.getOwnedMemberFeature();
-        if (ownedMemberFeature != null) {
-            return ownedMemberFeature;
-        }
-        return this.feature;
+        return this.getFeature();
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public void setFeature(Feature newFeature) {
-        Feature oldFeature = this.feature;
-        this.feature = newFeature;
-        if (this.eNotificationRequired()) {
-            this.eNotify(new ENotificationImpl(this, Notification.SET, SysmlPackage.FEATURE_MEMBERSHIP__FEATURE, oldFeature, this.feature));
-        }
+        // It redefines "feature" feature from Featuring
     }
 
     /**
@@ -390,4 +363,14 @@ public Namespace getMembershipOwningNamespace() {
         return this.getOwningType();
     }
 
+     /**
+     * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+     @Override
+     public Feature getFeature() {
+         return this.getOwnedMemberFeature();
+     }
+
 } // FeatureMembershipImpl
diff --git a/...n-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IncludeUseCaseUsageImpl.java b/...n-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/IncludeUseCaseUsageImpl.java
@@ -93,13 +93,10 @@ public ActionUsage getPerformedAction() {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     public ActionUsage basicGetPerformedAction() {
-        // TODO: implement this method to return the 'Performed Action' reference
-        // -> do not perform proxy resolution
-        // Ensure that you remove @generated or mark it @generated NOT
-        return null;
+        return this.getUseCaseIncluded();
     }
 
     /**

diff --git a/...l/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java b/...l/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/MetadataUsageImpl.java
@@ -414,7 +414,7 @@ public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTarg
     /**
      * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public EList<Structure> getItemDefinition() {

diff --git a/...n-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ReferenceSubsettingImpl.java b/...n-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/ReferenceSubsettingImpl.java
@@ -16,6 +16,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.syson.sysml.Element;
 import org.eclipse.syson.sysml.Feature;
 import org.eclipse.syson.sysml.ReferenceSubsetting;
 import org.eclipse.syson.sysml.SysmlPackage;
@@ -124,7 +125,7 @@ public Feature getReferencingFeature() {
      * @generated NOT
      */
     public Feature basicGetReferencingFeature() {
-        return this.getSubsettingFeature();
+        return this.getOwningFeature();
     }
 
     /**
@@ -222,7 +223,20 @@ public void setSubsettedFeature(Feature newSubsettedFeature) {
      */
     @Override
     public Feature getOwningFeature() {
-        return this.getReferencingFeature();
+        Element owner = this.getOwningRelatedElement();
+        if (owner instanceof Feature feature) {
+            return feature;
+        }
+        return null;
     }
 
+    /**
+     * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+    @Override
+    public Feature getSubsettingFeature() {
+        return this.getReferencingFeature();
+    }
 } // ReferenceSubsettingImpl
diff --git a/...ml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateSubactionMembershipImpl.java b/...ml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/StateSubactionMembershipImpl.java
@@ -100,11 +100,11 @@ public ActionUsage getAction() {
      * @generated NOT
      */
     public ActionUsage basicGetAction() {
-        Feature ownedMemberFeature = this.getOwnedMemberFeature();
-        if (ownedMemberFeature instanceof ActionUsage au) {
-            return au;
-        }
-        return null;
+        return this.getOwnedRelatedElement().stream()
+                .filter(ActionUsage.class::isInstance)
+                .map(ActionUsage.class::cast)
+                .findFirst()
+                .orElse(null);
     }
 
     /**
@@ -214,4 +214,14 @@ public String toString() {
         return result.toString();
     }
 
+    /**
+     * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
+     *
+     * @generated NOT
+     */
+    @Override
+    public Feature getOwnedMemberFeature() {
+        return this.getAction();
+    }
+
 } // StateSubactionMembershipImpl
diff --git a/...metamodel/src/main/java/org/eclipse/syson/sysml/impl/TransitionFeatureMembershipImpl.java b/...metamodel/src/main/java/org/eclipse/syson/sysml/impl/TransitionFeatureMembershipImpl.java
@@ -118,11 +118,11 @@ public Step getTransitionFeature() {
      * @generated NOT
      */
     public Step basicGetTransitionFeature() {
-        Feature memberFeature = this.getFeature();
-        if (memberFeature instanceof Step step) {
-            return step;
-        }
-        return null;
+        return getOwnedRelatedElement().stream()
+                .filter(Step.class::isInstance)
+                .map(Step.class::cast)
+                .findFirst()
+                .orElse(null);
     }
 
     /**

diff --git a/...metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java b/...metamodel/syson-sysml-metamodel/src/main/java/org/eclipse/syson/sysml/impl/UsageImpl.java
@@ -1049,7 +1049,7 @@ public String toString() {
     /**
      * <!-- begin-user-doc --> Redefines getter generated from eAnnotation <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public EList<Type> getType() {

diff --git a/...etamodel/src/test/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImplTest.java b/...etamodel/src/test/java/org/eclipse/syson/sysml/impl/ConjugatedPortDefinitionImplTest.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.syson.sysml.ConjugatedPortDefinition;
+import org.eclipse.syson.sysml.PortConjugation;
 import org.eclipse.syson.sysml.PortDefinition;
 import org.eclipse.syson.sysml.helper.LabelConstants;
 import org.eclipse.syson.sysml.util.ModelBuilder;
@@ -39,6 +40,7 @@ public void setUp() {
     public void getNames() {
         PortDefinition port = this.builder.createWithName(PortDefinition.class, "p1");
         ConjugatedPortDefinition conjugatedPort = this.builder.createInWithName(ConjugatedPortDefinition.class, port, "unusedName");
+        this.builder.createIn(PortConjugation.class, conjugatedPort).setOriginalPortDefinition(port);
         assertEquals(LabelConstants.CONJUGATED + "p1", conjugatedPort.getName());
 
     }