TopologyTemplate property page update

Author: Amina-Moussaoui

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/tosca/standard/package_/TTopologyTemplate.java

@@ -360,7 +360,7 @@ public boolean removeNodeTemplates(final TNodeTemplate obj) {
     public boolean removeRelationshipTemplates(final TRelationshipTemplate obj) {
         if (obj != null) {
           for (Dependency d : new ArrayList<>(this.elt.getDependsOnDependency())) {
-            if (d.isStereotyped(TTopologyTemplate.MdaTypes.MDAASSOCDEP) && Objects.equals(d.getTagValue(TTopologyTemplate.MdaTypes.MDAASSOCDEP_ROLE), "")) 
+            if (d.isStereotyped(TTopologyTemplate.MdaTypes.MDAASSOCDEP) && Objects.equals(d.getTagValue(TTopologyTemplate.MdaTypes.MDAASSOCDEP_ROLE), "relationshipTemplates")) 
               if (Objects.equals(d.getDependsOn(), obj.getElement())) {
                 d.delete();
                 return true;

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/handlers/propertypages/topologyTemplate/TTopologyTemplatePropertyPage.java

@@ -4,6 +4,7 @@
 
 import fr.softeam.toscadesigner.api.IToscaDesignerPeerModule;
 import fr.softeam.toscadesigner.api.ToscaDesignerProxyFactory;
+import fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate;
 import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate;
 import fr.softeam.toscadesigner.api.tosca.standard.package_.TGroup;
 import fr.softeam.toscadesigner.api.tosca.standard.package_.TTopologyTemplate;
@@ -14,6 +15,7 @@
 
 import org.modelio.api.module.propertiesPage.IModulePropertyTable;
 import org.modelio.metamodel.uml.infrastructure.ModelElement;
+import org.modelio.metamodel.uml.statik.Association;
 import org.modelio.metamodel.uml.statik.Class;
 
 @objid("a7f33f74-8435-4a95-a221-94a56c5f4cfd")
@@ -46,7 +48,7 @@ public void changeProperty(int row, String value) {
 			break;
 
         case 3:
-            Class elt2 = (Class) getModelElt(TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
+        	Class elt2 = (Class) getModelElt(TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
             if ((elt2 != null)
                     && (elt2.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, TNodeTemplate.STEREOTYPE_NAME))) {
                 Object pc = ToscaDesignerProxyFactory.instantiate(elt2);
@@ -57,6 +59,19 @@ public void changeProperty(int row, String value) {
                 }
             }
             break;
+            
+        case 4:
+             Association elt3 = (Association) getModelElt(TRelationshipTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement(), value);
+            if ((elt3!= null)
+                    && (elt3.isStereotyped(IToscaDesignerPeerModule.MODULE_NAME, TRelationshipTemplate.STEREOTYPE_NAME))) {
+                Object pc = ToscaDesignerProxyFactory.instantiate(elt3);
+                if (value.startsWith(this._add)) {
+                    this._element.addRelationshipTemplates((TRelationshipTemplate) pc);
+                } else {
+                    this._element.removeRelationshipTemplates((TRelationshipTemplate) pc);
+                }
+            }
+            break;
 		}
 	}
 
@@ -67,16 +82,16 @@ public void update(IModulePropertyTable table) {
 		table.addProperty("Name", _element.getElement().getName());
 
 		// groups
-		List<ModelElement> members_elt1 = extractModelElements(this._element.getGroups());
+		List<ModelElement> members_elt = extractModelElements(this._element.getGroups());
 		List<ModelElement> groupList = (TGroup.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null)
 				? TGroup.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
 				: Collections.emptyList();
 
-		table.addProperty("Groups", getToscaValue(members_elt1),
+		table.addProperty("Groups", getToscaValue(members_elt),
 				getAddRemove(groupList, extractModelElements(this._element.getGroups())));
 
 		// node templates
-        List <ModelElement> members_elt = extractModelElements(this._element.getNodeTemplates());
+        members_elt = extractModelElements(this._element.getNodeTemplates());
         List<ModelElement> nodeTemplateList = (TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null) 
             ? TNodeTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
             : Collections.emptyList();
@@ -86,6 +101,18 @@ public void update(IModulePropertyTable table) {
             getToscaValue(members_elt), 
             getAddRemove(nodeTemplateList, extractModelElements(this._element.getNodeTemplates()))
         );
+        
+        //relationship templates
+        members_elt = extractModelElements(this._element.getRelationshipTemplates());
+        List<ModelElement> relationshipTemplates = (TRelationshipTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement() != null) 
+            ? TRelationshipTemplate.MdaTypes.STEREOTYPE_ELT.getExtendedElement()
+            : Collections.emptyList();
+        
+        table.addProperty(
+            "Relationship templates", 
+            getToscaValue(members_elt), 
+            getAddRemove(relationshipTemplates, extractModelElements(this._element.getRelationshipTemplates()))
+        );
 	}
 
 }