Merge remote-tracking branch 'origin/ToscaProfile' into toscaCodeGen

Author: juancadavid

ToscaDesigner/src/main/conf/module.xml

@@ -1,13 +1,14 @@
 #
-#Fri Mar 08 11:23:31 CET 2024
+#Thu May 22 14:53:22 CEST 2025
 CLASS_LINECOLOR=84 101 255
 COMPONENT_INNERVIEWMODE=DIAGRAM
-CLASS_INNERVIEWMODE=DIAGRAM
 DEPENDENCY_SHOWLABEL=true
+CLASS_INNERVIEWMODE=DIAGRAM
 CLASS_FILLCOLOR=255 255 255
 CLASS_TEXTCOLOR=84 101 255
 basestyle=Modelio 5.3.x
 provider=Modelio
+ASSOC_SHOWCARD=false
 stylename=ToscaStyle
 theme=false
 CLASS_SHOWSTEREOTYPES=ICON

ToscaDesigner/src/main/conf/res/generated/styles/ToscaStyle.style

@@ -2,7 +2,7 @@
  * WARNING: GENERATED FILE - DO NOT EDIT
  * Module: ToscaDesigner v0.1.0
 
- * This file was generated on 15/05/2025 11:44 by Modelio Studio.
+ * This file was generated on 22/05/2025 15:02 by Modelio Studio.
  */
 package fr.softeam.toscadesigner.api;
 
@@ -126,16 +126,16 @@
  */
 @objid ("344538da-8f7b-4820-bee7-fad3a6c1b7e1")
 public class ToscaDesignerProxyFactory {
-    @objid ("3bbd5158-1b09-4425-bfd7-b6cd71da3c1c")
+    @objid ("fc8177d1-75a4-4193-90f5-612fa7ebe204")
     private static final String ASSETNAME = "ToscaDesigner";
 
-    @objid ("3e6e35a6-ff14-43bc-80ef-32ba54f53859")
+    @objid ("d8d9bd31-22cd-40fa-9d15-af62426f90be")
     private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
 
     /**
      * @param session The modeling session this factory is operating in.
      */
-    @objid ("c0edaabf-4761-4938-a511-54f115a44610")
+    @objid ("03437014-6288-4ff6-93e3-52d5af196acf")
     public static final void initialize(final IModelingSession session) throws MdaProxyException {
         fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.MdaTypes.init(session);
         fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
@@ -241,7 +241,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
      * @param e A model element
      * @return the right proxy or <i>null</i>.
      */
-    @objid ("4416c7b2-7a42-4172-98a3-b53e7e4729b4")
+    @objid ("54524dcf-f80d-48f4-bef8-afb1f4fbe0fc")
     public static final Object instantiate(final ModelElement e) {
         for (Stereotype s : e.getExtension()) {
               ModuleComponent module = s.getModule();
@@ -261,23 +261,23 @@ public static final Object instantiate(final ModelElement e) {
      * @param stName A stereotype name.
      * @return the right proxy or <i>null</i>.
      */
-    @objid ("6869383a-f852-480c-851b-946037e2a2a0")
+    @objid ("86161449-a404-4d36-b197-2f049f6582c0")
     public static final Object instantiate(final Element e, final String stName) {
         instantiateVisitor.setStereotype(stName);
         return e.accept(instantiateVisitor);
     }
 
-    @objid ("161e7695-8ebc-4970-9cab-3b9a65412fd7")
+    @objid ("faf5aba4-dca0-40e9-8ee9-43b5e2b20487")
     private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
-        @objid ("89179f9e-658a-4c36-8109-502cacdfc919")
+        @objid ("61090378-24d4-4418-b883-7a0d5cadc791")
         private String stName;
 
-        @objid ("84b7ac02-465d-4dd1-a2b9-010ca3143aac")
+        @objid ("f98f9888-91a3-4dc7-9211-accddc39b553")
         public final void setStereotype(final String stName) {
             this.stName = stName;
         }
 
-        @objid ("8e9ec5e0-8be9-480e-90c0-3152a85fa285")
+        @objid ("24796db2-f6ba-4716-b9c0-96f9737a6582")
         @Override
         public final Object visitAssociation(Association obj) {
             switch (this.stName) {
@@ -290,7 +290,7 @@ public final Object visitAssociation(Association obj) {
 
         }
 
-        @objid ("5980cdb4-78af-4593-b689-4d4c2dd299b2")
+        @objid ("fb4e31f9-8ca0-4856-8d80-d1785d8bb9f0")
         @Override
         public final Object visitAttribute(Attribute obj) {
             switch (this.stName) {
@@ -305,7 +305,7 @@ public final Object visitAttribute(Attribute obj) {
 
         }
 
-        @objid ("aed06588-ce38-4c50-b245-92ac128b15f8")
+        @objid ("e0ceb5e7-0c6d-454e-9395-0216f511f65c")
         @Override
         public final Object visitPackage(Package obj) {
             switch (this.stName) {
@@ -319,7 +319,7 @@ public final Object visitPackage(Package obj) {
 
         }
 
-        @objid ("df795db8-b428-4ee1-815a-3ecab16b6688")
+        @objid ("323338a9-f5c7-4e07-a89d-a23a27ae2087")
         @Override
         public final Object visitAssociationEnd(AssociationEnd obj) {
             switch (this.stName) {
@@ -332,7 +332,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
 
         }
 
-        @objid ("f4070526-7df3-4730-883f-5c0bb2a4816f")
+        @objid ("dde3a8f3-50e9-48ed-8e1e-303f083a13fa")
         @Override
         public final Object visitDataType(DataType obj) {
             switch (this.stName) {
@@ -346,7 +346,7 @@ public final Object visitDataType(DataType obj) {
 
         }
 
-        @objid ("d2e9608c-ded5-4566-8a79-3a08263224e7")
+        @objid ("fcafc004-d890-4a17-936a-09d14fcdad96")
         @Override
         public final Object visitClass(Class obj) {
             switch (this.stName) {
@@ -388,7 +388,7 @@ public final Object visitClass(Class obj) {
 
         }
 
-        @objid ("e67f9a90-6441-427a-8c9c-fd4f10903dd9")
+        @objid ("c5a0002d-f72a-4505-ba9b-2c2ca7f85cdc")
         @Override
         public final Object visitStaticDiagram(StaticDiagram obj) {
             switch (this.stName) {
@@ -403,7 +403,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
 
         }
 
-        @objid ("1517055c-f3ae-4ddc-bdf3-9d24ff19d891")
+        @objid ("9edcaf70-b221-4bb4-83b6-54ea08f272ae")
         @Override
         public final Object visitModelElement(ModelElement obj) {
             switch (this.stName) {
@@ -471,7 +471,7 @@ public final Object visitModelElement(ModelElement obj) {
          * <p>If null is returned the caller will return null.
          * @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
          */
-        @objid ("24412da0-0b27-4f3b-8203-54284b7937fd")
+        @objid ("2c1f88b3-952d-48db-affe-9ca255834808")
         @Override
         public IInfrastructureVisitor getInfrastructureVisitor() {
             return this;

ToscaDesigner/src/main/conf/toscadesigner.ramc

@@ -40,13 +40,14 @@
  */
 @objid ("ed792b19-3a0d-46f3-b2a8-c885af3a1414")
 public class ServiceTemplateDiagram implements IMdaProxy {
-    @objid ("7fc22752-cf84-48ec-b223-9ce0cfe9e61b")
+    @objid ("57bd9e21-45a0-46bb-9432-f084dbbdc6d5")
     public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
 
     /**
      * The underlying {@link StaticDiagram} represented by this proxy, never null.
+     * 
      */
-    @objid ("0a55d147-1304-4b76-9003-17f3e165f0ea")
+    @objid ("452d5cee-7522-45ad-92e9-484499e2b67f")
     protected final StaticDiagram elt;
 
     /**
@@ -56,17 +57,16 @@ public class ServiceTemplateDiagram implements IMdaProxy {
      * @param elt a model object
      * @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
      */
-    @objid ("ed8beefb-d75a-48da-a876-c5f1a6d1e483")
+    @objid ("c60fb045-d6cf-4a82-ba3d-687133b13e87")
     public static boolean canInstantiate(final MObject elt) {
         return ((elt instanceof StaticDiagram) && (ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
     }
 
     /**
      * Create a new {@link StaticDiagram} stereotyped << ServiceTemplateDiagram >> then instantiate a {@link ServiceTemplateDiagram} proxy.
-     * 
      * @return a {@link ServiceTemplateDiagram} proxy on the created {@link StaticDiagram}.
      */
-    @objid ("041ec76c-98c3-453b-9072-8943fc8bfdfb")
+    @objid ("3a6a052a-269a-42c3-9fe0-c74c0a503fe3")
     public static ServiceTemplateDiagram create(final IModelingSession session) {
         ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
         e.getExtension().add(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static ServiceTemplateDiagram create(final IModelingSession session) {
      * @param obj a StaticDiagram
      * @return a {@link ServiceTemplateDiagram} proxy or <i>null</i>.
      */
-    @objid ("dc898290-1e06-4d64-a88b-e028b13b9f5b")
+    @objid ("79a71efb-e46c-4565-92d9-f92f927856a7")
     public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
         return ServiceTemplateDiagram.canInstantiate(obj) ? new ServiceTemplateDiagram(obj) : null;
     }
@@ -89,19 +89,19 @@ public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
      * Tries to instantiate a {@link ServiceTemplateDiagram} proxy from a {@link StaticDiagram} stereotyped << ServiceTemplateDiagram >> checking its metaclass and its stereotype. 
      * <p>
      * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
+     * @throws IllegalArgumentException if the instantiation cannot be carried out.
      * @param obj a {@link StaticDiagram}
      * @return a {@link ServiceTemplateDiagram} proxy.
-     * @throws IllegalArgumentException if the instantiation cannot be carried out.
      */
-    @objid ("e2514b80-87f6-4e90-b916-2ea48caa30d3")
+    @objid ("a8aac38d-be79-40e5-904b-e74ab2e0c2c0")
     public static ServiceTemplateDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
         if (ServiceTemplateDiagram.canInstantiate(obj))
-        	return new ServiceTemplateDiagram(obj);
+            return new ServiceTemplateDiagram(obj);
         else
-        	throw new IllegalArgumentException("ServiceTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
+            throw new IllegalArgumentException("ServiceTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
     }
 
-    @objid ("4b5924c6-dae6-4c94-a12d-6a10db240242")
+    @objid ("dde4503c-81bb-418c-9226-dc40ae7eee44")
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -118,38 +118,37 @@ public boolean equals(final Object obj) {
     }
 
     /**
-     * Get the underlying {@link StaticDiagram}. 
+     * Get the underlying {@link StaticDiagram}.
      * @return the StaticDiagram represented by this proxy, never null.
      */
-    @objid ("2467a6ae-f02d-453f-b1d6-6205a21cb0d9")
+    @objid ("e8ef3a75-f47b-49db-be5e-a4d4874a44da")
     public StaticDiagram getElement() {
         return this.elt;
     }
 
-    @objid ("8f4f1176-d766-424e-806a-a07a8953ec2e")
+    @objid ("162f2002-65bc-4497-8f6a-f9210350b6fe")
     @Override
     public int hashCode() {
         return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
-        
     }
 
-    @objid ("81b0aed9-5090-4bec-90e8-ece0cdbbb5bb")
+    @objid ("6ec2c9f9-e44a-474c-9a38-e5060fd95f24")
     protected  ServiceTemplateDiagram(final StaticDiagram elt) {
         this.elt = elt;
     }
 
     @objid ("4b6fef3f-101c-4384-86b5-c7c7a22b250c")
     public static final class MdaTypes {
-        @objid ("8e681867-7589-40bb-af6b-3225c8239fff")
+        @objid ("5f2d5a35-5bf9-4416-b3bd-82bd32e759ae")
         public static Stereotype STEREOTYPE_ELT;
 
-        @objid ("edb9082c-196e-4573-8723-992e9bae6634")
+        @objid ("4771a861-5e74-4742-8cb6-0669203d1e59")
         private static Stereotype MDAASSOCDEP;
 
-        @objid ("2fa56a44-00e8-4e11-8226-2f6404df0753")
+        @objid ("b8f1bc77-a3f0-4909-b788-f22a5be53608")
         private static TagType MDAASSOCDEP_ROLE;
 
-        @objid ("1e0a4004-3b17-4560-b751-c2c5bde5fa4e")
+        @objid ("d1223fe5-36e9-4cd5-b5f5-191e5bebc9d3")
         public static void init(final IModelingSession session) throws MdaProxyException {
             List <MRef> missingRefs = new ArrayList<>();
             MRef mRef;
@@ -166,7 +165,6 @@ public static void init(final IModelingSession session) throws MdaProxyException
             if (MDAASSOCDEP_ROLE==null) missingRefs.add(mRef);
 
             if (! missingRefs.isEmpty()) throw new MdaProxyException(MdaProxyException.MdaProxyExceptionReason.MISSING_MDA_ELEMENT, missingRefs);
-            
         }
 
     }