Skip to content

Commit c1018af

Browse files
juancadavidjuancadavid
committed
Merge remote-tracking branch 'origin/ToscaProfile' into toscaCodeGen
2 parents 725e258 + 15f63fe commit c1018af

File tree

164 files changed

+4720
-4700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+4720
-4700
lines changed

‎ToscaDesigner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependencies>
3030
<!-- api modelio -->
3131
<dependency>
32-
<groupId>com.modeliosoft.modelio</groupId>
32+
<groupId>org.modelio</groupId>
3333
<artifactId>MDAKit</artifactId>
3434
<version>[5.4.1,5.4.2)</version>
3535
<type>pom</type>

‎ToscaDesigner/src/main/conf/module.xml‎

Lines changed: 345 additions & 342 deletions
Large diffs are not rendered by default.

‎ToscaDesigner/src/main/conf/toscadesigner.ramc‎

-319 Bytes
Binary file not shown.

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/IToscaDesignerPeerModule.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package fr.softeam.toscadesigner.api;
22

3-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
43
import org.modelio.api.module.IPeerModule;
54

5+
import com.modeliosoft.modelio.javadesigner.annotations.objid;
6+
67
@objid ("0b3043c0-695b-42e5-a69a-8298dc63b89c")
78
public interface IToscaDesignerPeerModule extends IPeerModule {
89
@objid ("40e56225-331d-4513-ba49-a71b06c20f83")

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/ToscaDesignerAbstractProxy.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.util.List;
55

66
import org.modelio.metamodel.uml.infrastructure.ModelElement;
7-
import org.modelio.metamodel.uml.statik.DataType;
87

98
public class ToscaDesignerAbstractProxy {
109

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/ToscaDesignerProxyFactory.java‎

Lines changed: 112 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
* WARNING: GENERATED FILE - DO NOT EDIT
33
* Module: ToscaDesigner v0.1.0
44
5-
* This file was generated on 22/05/2025 15:02 by Modelio Studio.
5+
* This file was generated on 22/05/2025 15:07 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

9-
import com.modeliosoft.modelio.api.module.mda.MdaProxyException;
10-
import com.modeliosoft.modelio.javadesigner.annotations.objid;
119
import org.modelio.api.modelio.model.IModelingSession;
1210
import org.modelio.metamodel.diagrams.StaticDiagram;
1311
import org.modelio.metamodel.mda.ModuleComponent;
@@ -24,6 +22,99 @@
2422
import org.modelio.metamodel.visitors.IDefaultModelVisitor;
2523
import org.modelio.metamodel.visitors.IInfrastructureVisitor;
2624

25+
import com.modeliosoft.modelio.javadesigner.annotations.objid;
26+
27+
import fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram;
28+
import fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram;
29+
import fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram;
30+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ArtifactReferencesType;
31+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.CapabilitiesType;
32+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.CapabilitiesType1;
33+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ConstraintType1;
34+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.DefinitionType;
35+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.DocumentRoot;
36+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ImplementationArtifactType;
37+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ImportElement;
38+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.InputParameterType1;
39+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.InputParametersType;
40+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.InterfaceType1;
41+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.InterfacesType;
42+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.NodeOperationType;
43+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.NodeTypeReferenceType;
44+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.OutputParametersType;
45+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.OutputParametersType1;
46+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.PoliciesType;
47+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.PoliciesType1;
48+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.PropertiesDefinitionType;
49+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.PropertiesType1;
50+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.PropertyConstraintsType;
51+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.PropertyConstraintsType1;
52+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.PropertyMappingsType;
53+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.RelationshipConstraintType;
54+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.RelationshipConstraintsType;
55+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.RelationshipOperationType;
56+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.RequirementsType1;
57+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.SourceInterfacesType;
58+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TAppliesTo;
59+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TArtifactReference;
60+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TArtifactTemplate;
61+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TCapabilityRef;
62+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TCondition;
63+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TConstraint;
64+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TDefinitions;
65+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TEntityTemplate;
66+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TExportedInterface;
67+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TExportedOperation;
68+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TExtensibleElements;
69+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TExtension;
70+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TExtensions;
71+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TImplementationArtifact;
72+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TImplementationArtifacts;
73+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TOperation;
74+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TParameter;
75+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TPropertyConstraint;
76+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TPropertyMapping;
77+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TRequirementRef;
78+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TargetInterfacesType;
79+
import fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.ToscaElement;
80+
import fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate;
81+
import fr.softeam.toscadesigner.api.tosca.standard.associationend.TRelationshipTemplateEnd;
82+
import fr.softeam.toscadesigner.api.tosca.standard.attribute.PropertyDefinitionType;
83+
import fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef;
84+
import fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityStereotype;
85+
import fr.softeam.toscadesigner.api.tosca.standard.class_.ConstraintsType;
86+
import fr.softeam.toscadesigner.api.tosca.standard.class_.InstanceStateType;
87+
import fr.softeam.toscadesigner.api.tosca.standard.class_.RequirementsType;
88+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TArtifactType;
89+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TBoundaryDefinitions;
90+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TCapability;
91+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TCapabilityDefinition;
92+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TCapabilityDefinitionsType;
93+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TCapabilityType;
94+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TDeploymentArtifact;
95+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TDeploymentArtifacts;
96+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TDocumentation;
97+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TEntityType;
98+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TGroupType;
99+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TInterface;
100+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate;
101+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeType;
102+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TPlan;
103+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TPlans;
104+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicy;
105+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicyType;
106+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType;
107+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement;
108+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition;
109+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinitionType;
110+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates;
111+
import fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyTemplate;
112+
import fr.softeam.toscadesigner.api.tosca.standard.class_.Tgroup;
113+
import fr.softeam.toscadesigner.api.tosca.standard.datatype.SourceElementType;
114+
import fr.softeam.toscadesigner.api.tosca.standard.datatype.TargetElementType;
115+
import fr.softeam.toscadesigner.api.tosca.standard.package_.TServiceTemplate;
116+
import fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel;
117+
27118
/**
28119
* Factory that instantiates the right proxy class for a model element stereotyped by a 'ToscaDesigner' module stereotype.
29120
* <h2>Module description:</h2>
@@ -126,17 +217,17 @@
126217
*/
127218
@objid ("344538da-8f7b-4820-bee7-fad3a6c1b7e1")
128219
public class ToscaDesignerProxyFactory {
129-
@objid ("fc8177d1-75a4-4193-90f5-612fa7ebe204")
220+
@objid ("172d36b2-5475-4fba-9ab9-d61529acc97e")
130221
private static final String ASSETNAME = "ToscaDesigner";
131222

132-
@objid ("d8d9bd31-22cd-40fa-9d15-af62426f90be")
223+
@objid ("bb53fe3c-7613-4bfe-8353-950840c7b161")
133224
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
134225

135226
/**
136227
* @param session The modeling session this factory is operating in.
137228
*/
138-
@objid ("03437014-6288-4ff6-93e3-52d5af196acf")
139-
public static final void initialize(final IModelingSession session) throws MdaProxyException {
229+
@objid ("3084cd60-d913-4ce7-8d96-249a585e3084")
230+
public static final void initialize(final IModelingSession session) throws fr.softeam.toscadesigner.impl.MdaProxyException {
140231
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.MdaTypes.init(session);
141232
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
142233
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.MdaTypes.init(session);
@@ -241,7 +332,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
241332
* @param e A model element
242333
* @return the right proxy or <i>null</i>.
243334
*/
244-
@objid ("54524dcf-f80d-48f4-bef8-afb1f4fbe0fc")
335+
@objid ("a1a22bb3-7384-4f93-a8d2-024d0d1f79a8")
245336
public static final Object instantiate(final ModelElement e) {
246337
for (Stereotype s : e.getExtension()) {
247338
ModuleComponent module = s.getModule();
@@ -261,23 +352,23 @@ public static final Object instantiate(final ModelElement e) {
261352
* @param stName A stereotype name.
262353
* @return the right proxy or <i>null</i>.
263354
*/
264-
@objid ("86161449-a404-4d36-b197-2f049f6582c0")
355+
@objid ("3d4359da-f0ab-4562-852a-23ce0635e31b")
265356
public static final Object instantiate(final Element e, final String stName) {
266357
instantiateVisitor.setStereotype(stName);
267358
return e.accept(instantiateVisitor);
268359
}
269360

270-
@objid ("faf5aba4-dca0-40e9-8ee9-43b5e2b20487")
361+
@objid ("1efa49df-a510-4daa-80de-e2cf6486b1fa")
271362
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
272-
@objid ("61090378-24d4-4418-b883-7a0d5cadc791")
363+
@objid ("615e926f-c439-4b81-8ec0-70043cd15f50")
273364
private String stName;
274365

275-
@objid ("f98f9888-91a3-4dc7-9211-accddc39b553")
366+
@objid ("79877970-7094-4e5f-8e2c-b1e4e9005e40")
276367
public final void setStereotype(final String stName) {
277368
this.stName = stName;
278369
}
279370

280-
@objid ("24796db2-f6ba-4716-b9c0-96f9737a6582")
371+
@objid ("20215294-7fe0-416e-888e-204c1995d11f")
281372
@Override
282373
public final Object visitAssociation(Association obj) {
283374
switch (this.stName) {
@@ -290,7 +381,7 @@ public final Object visitAssociation(Association obj) {
290381

291382
}
292383

293-
@objid ("fb4e31f9-8ca0-4856-8d80-d1785d8bb9f0")
384+
@objid ("aae8b45e-5a28-411c-b428-2014741df7f3")
294385
@Override
295386
public final Object visitAttribute(Attribute obj) {
296387
switch (this.stName) {
@@ -305,7 +396,7 @@ public final Object visitAttribute(Attribute obj) {
305396

306397
}
307398

308-
@objid ("e0ceb5e7-0c6d-454e-9395-0216f511f65c")
399+
@objid ("6204efd2-71c8-46d5-81a1-c92a0e0109fb")
309400
@Override
310401
public final Object visitPackage(Package obj) {
311402
switch (this.stName) {
@@ -319,7 +410,7 @@ public final Object visitPackage(Package obj) {
319410

320411
}
321412

322-
@objid ("323338a9-f5c7-4e07-a89d-a23a27ae2087")
413+
@objid ("69d8128f-9cec-4c34-acc8-10f299df26db")
323414
@Override
324415
public final Object visitAssociationEnd(AssociationEnd obj) {
325416
switch (this.stName) {
@@ -332,7 +423,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
332423

333424
}
334425

335-
@objid ("dde3a8f3-50e9-48ed-8e1e-303f083a13fa")
426+
@objid ("02c62114-dc5a-4bd5-a628-8afe7ec0b7ad")
336427
@Override
337428
public final Object visitDataType(DataType obj) {
338429
switch (this.stName) {
@@ -346,7 +437,7 @@ public final Object visitDataType(DataType obj) {
346437

347438
}
348439

349-
@objid ("fcafc004-d890-4a17-936a-09d14fcdad96")
440+
@objid ("72c44376-5f92-421d-a1ee-2acef00dbe0c")
350441
@Override
351442
public final Object visitClass(Class obj) {
352443
switch (this.stName) {
@@ -388,7 +479,7 @@ public final Object visitClass(Class obj) {
388479

389480
}
390481

391-
@objid ("c5a0002d-f72a-4505-ba9b-2c2ca7f85cdc")
482+
@objid ("9c2e63e1-bf71-48e5-84ae-60c6e268a59f")
392483
@Override
393484
public final Object visitStaticDiagram(StaticDiagram obj) {
394485
switch (this.stName) {
@@ -403,7 +494,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
403494

404495
}
405496

406-
@objid ("9edcaf70-b221-4bb4-83b6-54ea08f272ae")
497+
@objid ("4838f70f-bdf6-450c-81b3-e23ed047a6b9")
407498
@Override
408499
public final Object visitModelElement(ModelElement obj) {
409500
switch (this.stName) {
@@ -471,7 +562,7 @@ public final Object visitModelElement(ModelElement obj) {
471562
* <p>If null is returned the caller will return null.
472563
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
473564
*/
474-
@objid ("2c1f88b3-952d-48db-affe-9ca255834808")
565+
@objid ("f1541e56-1d19-4231-b210-b059c9e54ea3")
475566
@Override
476567
public IInfrastructureVisitor getInfrastructureVisitor() {
477568
return this;

0 commit comments

Comments
 (0)