-Repetition of attributes : name and derived from in Tnodetype removed

Author: Amina-Moussaoui

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/TGroupPropertyPage.java

@@ -68,17 +68,11 @@ public boolean accept(MObject element) {
                         return TGroupType.canInstantiate(element);
                     }
                 });
-        /*
-                 * table.addProperty("Software Components",
-                 * getCamelValue(this._element.getSoftwareComponents()),
-                 * getAddRemove(SoftwareComponent.MdaTypes.STEREOTYPE_ELT.getExtendedElement(),
-                 * this._element.getSoftwareComponents()));
-                 */
 
 
         List <ModelElement> members_elt = extractModelElements(this._element.getMembers());
         List<ModelElement> nodeTemplateList = (TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null) 
-            ? TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement() // Ensure T is compatible with TNodeTemplate
+            ? TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
             : Collections.emptyList();
 
         table.addProperty(
@@ -89,7 +83,7 @@ public boolean accept(MObject element) {
     }
 
     @objid ("805e83a0-7a3b-4978-bc22-f5bcc9e60aa5")
-    public static List<ModelElement> extractModelElements(List<TNodeTemplate> members) {
+    public static List<ModelElement> extractModelElements1(List<TNodeTemplate> members) {
         List<ModelElement> members_elt = new ArrayList<>();
         for (int i = 0; i < members.size(); i++) {
             members_elt.add(members.get(i).getElement());

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/core/ToscaElementPropertyPage.java

@@ -3,7 +3,11 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
+import com.modeliosoft.modelio.api.module.mda.IMdaProxy;
 import com.modeliosoft.modelio.javadesigner.annotations.objid;
+
+import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate;
 import fr.softeam.toscadesigner.handlers.propertypages.IPropertyContent;
 import org.modelio.api.module.propertiesPage.IModulePropertyTable;
 import org.modelio.metamodel.uml.infrastructure.ModelElement;
@@ -154,5 +158,13 @@ protected String getNotNull(String value) {
             return "";
         return value;
     }
+    
+    public static < T extends IMdaProxy> List<ModelElement> extractModelElements(List<T> members) {
+        List<ModelElement> members_elt = new ArrayList<>();
+        for (int i = 0; i < members.size(); i++) {
+            members_elt.add((ModelElement) ((IMdaProxy) members.get(i)).getElement());
+        }
+        return members_elt;
+    }
 
 }

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/serviceTemplate/TNodeTypePropertyPage.java

@@ -26,16 +26,6 @@ public  TNodeTypePropertyPage(T elt) {
     @Override
     public void changeProperty(int row, String value) {
         switch (row) {
-        case 1:
-            this._element.getElement().setName(value);
-            break;
-        case 2:
-            for (ModelElement el : TNodeType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
-                if (value.contains(el.getUuid())) {
-                    this._element.setDerivedFrom(TNodeType.instantiate((org.modelio.metamodel.uml.statik.Class) el));
-                }
-            }
-            break;
         case 3:
             for (ModelElement dep : InterfacesType.MdaTypes.STEREOTYPE_ELT.getExtendedElement()) {
                 if (value.contains(dep.getUuid())) {
@@ -70,15 +60,7 @@ public void changeProperty(int row, String value) {
     @Override
     public void update(IModulePropertyTable table) {
         super.update(table);
-        table.addProperty("Name", _element.getElement().getName());
-        table.addProperty("Derived From",
-                this._element.getDerivedFrom() != null ? this._element.getDerivedFrom().getElement() : null,
-                Arrays.asList(Metamodel.getMClass("Class")), new IMObjectFilter() {
-                    @Override
-                    public boolean accept(MObject element) {
-                        return TNodeType.canInstantiate(element);
-                    }
-                });
+
         // Interfaces Type
         table.addProperty("Interfaces Type",
                 this._element.getInterfaces() != null ? this._element.getInterfaces().getElement() : null,