Skip to content

Commit 4b3b9dd

Browse files
juancadavidjuancadavid
committed
Merge remote-tracking branch 'origin/ToscaProfile' into toscaCodeGen
2 parents a9ee074 + be3265e commit 4b3b9dd

File tree

132 files changed

+2737
-2628
lines changed

Some content is hidden

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

132 files changed

+2737
-2628
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifacts.label=Artifacts
1616
group.Attributes.label=Attributes
17+
group.Capabilities.label=Capabilities
1718
group.Constraints.label=Constraints
1819
group.Others.label=Others
1920
group.Plans.label=Plans
@@ -548,6 +549,10 @@ tagtype.ref.description=
548549
tagtype.ref.label=ref
549550
tool.ArtifactTemplate.label=ArtifactTemplate
550551
tool.ArtifactTemplate.tooltip=ArtifactTemplate
552+
tool.Capabilities_Type.label=Capabilities Type
553+
tool.Capabilities_Type.tooltip=Capabilities Type
554+
tool.Capability.label=Capability
555+
tool.Capability.tooltip=Capability
551556
tool.CapabilityDefinition.label=CapabilityDefinition
552557
tool.CapabilityDefinition.tooltip=CapabilityDefinition
553558
tool.CapabilityDefinitions.label=CapabilityDefinitions

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,22 @@
12721272
<HParameter name="name" value="Constraints"/>
12731273
</Handler>
12741274
</Tool>
1275+
<Tool id="Capability" label="%tool.Capability.label" tooltip="%tool.Capability.tooltip" image="res/icon/gui/TCapability24.png">
1276+
<Scope-source metaclass="Infrastructure.ModelElement" stereotype=""/>
1277+
<Handler class="Box">
1278+
<HParameter name="stereotype" value="ToscaDesigner#TCapability"/>
1279+
<HParameter name="metaclass" value="Standard.Class"/>
1280+
<HParameter name="name" value="Capability"/>
1281+
</Handler>
1282+
</Tool>
1283+
<Tool id="Capabilities_Type" label="%tool.Capabilities_Type.label" tooltip="%tool.Capabilities_Type.tooltip" image="res/icon/gui/capabilitiesType48.ICON.png">
1284+
<Scope-source metaclass="Infrastructure.ModelElement" stereotype=""/>
1285+
<Handler class="Box">
1286+
<HParameter name="stereotype" value="ToscaDesigner#CapabilitiesType"/>
1287+
<HParameter name="metaclass" value="Standard.Class"/>
1288+
<HParameter name="name" value="Capabilities Type"/>
1289+
</Handler>
1290+
</Tool>
12751291
</Tools>
12761292
<ContextualMenu>
12771293
<CommandRef refid="Export" group="" group-image=""/>
@@ -1331,6 +1347,8 @@
13311347
<ToolRef refid="Policies_Type" group="%group.Attributes.label"/>
13321348
<ToolRef refid="Constraint" group="%group.Attributes.label"/>
13331349
<ToolRef refid="Constraints" group="%group.Attributes.label"/>
1350+
<ToolRef refid="Capability" group="%group.Capabilities.label"/>
1351+
<ToolRef refid="Capabilities_Type" group="%group.Capabilities.label"/>
13341352
</Palette>
13351353
<Handler class="StandardCustomizer">
13361354
<HParameter name="stereotype" value="ToscaDesigner#TopologyTemplateDiagram"/>

‎ToscaDesigner/src/main/conf/module_fr.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifacts.label=Relationship_Templates
1616
group.Attributes.label=Artifact_Template
17+
group.Capabilities.label=Capabilities
1718
group.Constraints.label=Constraints
1819
group.Others.label=Others
1920
group.Plans.label=Plans
@@ -548,6 +549,10 @@ tagtype.ref.description=
548549
tagtype.ref.label=ref
549550
tool.ArtifactTemplate.label=ArtifactTemplate
550551
tool.ArtifactTemplate.tooltip=
552+
tool.Capabilities_Type.label=Capabilities_Type
553+
tool.Capabilities_Type.tooltip=
554+
tool.Capability.label=Capability
555+
tool.Capability.tooltip=
551556
tool.CapabilityDefinition.label=CapabilityDefinition
552557
tool.CapabilityDefinition.tooltip=
553558
tool.CapabilityDefinitions.label=CapabilityDefinition

‎ToscaDesigner/src/main/conf/res/icon/gui/capabilitiesType48.ICON.png‎

379 Bytes
Loading

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

516 Bytes
Binary file not shown.

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: GENERATED FILE - DO NOT EDIT
33
* Module: ToscaDesigner v0.0.00
44
5-
* This file was generated on 09/01/2025 12:14 by Modelio Studio.
5+
* This file was generated on 09/01/2025 16:04 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -126,16 +126,16 @@
126126
*/
127127
@objid ("f96166f4-8706-4930-8397-6424c7b3f767")
128128
public class ToscaDesignerProxyFactory {
129-
@objid ("28b46dc2-a2b5-4bd1-888b-638da0fa99ee")
129+
@objid ("ce22a0b8-ada4-4b74-854f-78b5268d9d2a")
130130
private static final String ASSETNAME = "ToscaDesigner";
131131

132-
@objid ("d8a9957e-b942-4b95-ac9a-9d90b174c62c")
132+
@objid ("d31d37f1-b338-4fc0-a4bd-05e0163a516a")
133133
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
134134

135135
/**
136136
* @param session The modeling session this factory is operating in.
137137
*/
138-
@objid ("c6805870-98f6-4f0d-abb8-f1c598e71b09")
138+
@objid ("51242d93-ff31-4b5d-9e86-72480274d974")
139139
public static final void initialize(final IModelingSession session) throws MdaProxyException {
140140
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.MdaTypes.init(session);
141141
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
241241
* @param e A model element
242242
* @return the right proxy or <i>null</i>.
243243
*/
244-
@objid ("591667ed-380b-4eb5-8472-7a57525f6b53")
244+
@objid ("c72807f9-8399-4cf3-b747-2b121f968078")
245245
public static final Object instantiate(final ModelElement e) {
246246
for (Stereotype s : e.getExtension()) {
247247
ModuleComponent module = s.getModule();
@@ -261,23 +261,23 @@ public static final Object instantiate(final ModelElement e) {
261261
* @param stName A stereotype name.
262262
* @return the right proxy or <i>null</i>.
263263
*/
264-
@objid ("eaffa4f6-1dbb-4283-8ef7-fccc7e3ddd26")
264+
@objid ("e8c6d02e-1483-49b6-bf42-b798165d07d5")
265265
public static final Object instantiate(final Element e, final String stName) {
266266
instantiateVisitor.setStereotype(stName);
267267
return e.accept(instantiateVisitor);
268268
}
269269

270-
@objid ("3fb53a6a-bd94-4cfb-8f29-597d3e8666fc")
270+
@objid ("8ada5cb7-d330-4103-8488-4027e8c1810e")
271271
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
272-
@objid ("dc863696-af86-495d-a660-7ea33ad3fdf9")
272+
@objid ("b92e2626-3495-4f6e-8133-731629a9af64")
273273
private String stName;
274274

275-
@objid ("8645b43f-54b8-40e8-8a35-667c3c5c824d")
275+
@objid ("1f2ea83a-fa0e-44d5-a385-cf6bc04ed884")
276276
public final void setStereotype(final String stName) {
277277
this.stName = stName;
278278
}
279279

280-
@objid ("048b80df-a033-4f6d-95b4-458bf2408a04")
280+
@objid ("cb06ad02-a3fd-46a2-a269-f01a82e545bf")
281281
@Override
282282
public final Object visitAssociation(Association obj) {
283283
switch (this.stName) {
@@ -290,7 +290,7 @@ public final Object visitAssociation(Association obj) {
290290

291291
}
292292

293-
@objid ("bffc4a4d-45fb-4dc8-ae45-f4e6a03fc372")
293+
@objid ("c8ce7f1d-53f3-4da9-90c1-306accc7ebc3")
294294
@Override
295295
public final Object visitAttribute(Attribute obj) {
296296
switch (this.stName) {
@@ -306,7 +306,7 @@ public final Object visitAttribute(Attribute obj) {
306306

307307
}
308308

309-
@objid ("2a45888d-2ccc-4e28-9ada-3ac4f9ad980b")
309+
@objid ("82f54420-36ff-4aed-a5be-ebae0b79a92e")
310310
@Override
311311
public final Object visitPackage(Package obj) {
312312
switch (this.stName) {
@@ -322,7 +322,7 @@ public final Object visitPackage(Package obj) {
322322

323323
}
324324

325-
@objid ("ddbe4661-260f-4785-b559-3a37d2d635d4")
325+
@objid ("885a434f-1641-4ce4-94da-6d2439c166f8")
326326
@Override
327327
public final Object visitAssociationEnd(AssociationEnd obj) {
328328
switch (this.stName) {
@@ -335,7 +335,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
335335

336336
}
337337

338-
@objid ("cc86e818-973c-4ec9-a4d6-9b4e34f65a95")
338+
@objid ("b744320e-8f3c-47b1-b048-75ebf1f0cd9d")
339339
@Override
340340
public final Object visitDataType(DataType obj) {
341341
switch (this.stName) {
@@ -349,7 +349,7 @@ public final Object visitDataType(DataType obj) {
349349

350350
}
351351

352-
@objid ("c3095130-b79c-4924-aca6-b5b4a13e4b2f")
352+
@objid ("79c8682a-3011-4cee-88a3-077d5a32750d")
353353
@Override
354354
public final Object visitClass(Class obj) {
355355
switch (this.stName) {
@@ -388,7 +388,7 @@ public final Object visitClass(Class obj) {
388388

389389
}
390390

391-
@objid ("9c297da8-03d2-4e20-b527-aaf22371ae62")
391+
@objid ("14df8cab-9536-4c45-91e7-eb008137d578")
392392
@Override
393393
public final Object visitStaticDiagram(StaticDiagram obj) {
394394
switch (this.stName) {
@@ -403,7 +403,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
403403

404404
}
405405

406-
@objid ("62cd3d80-5217-437d-9f53-07f0925db628")
406+
@objid ("54494527-c2fc-4f20-93df-ce8c31f89326")
407407
@Override
408408
public final Object visitModelElement(ModelElement obj) {
409409
switch (this.stName) {
@@ -471,7 +471,7 @@ public final Object visitModelElement(ModelElement obj) {
471471
* <p>If null is returned the caller will return null.
472472
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
473473
*/
474-
@objid ("984203bc-ffeb-4659-b362-b5e04144a624")
474+
@objid ("a155719b-e807-4c5f-8f94-69ecb05f7a5d")
475475
@Override
476476
public IInfrastructureVisitor getInfrastructureVisitor() {
477477
return this;

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/automatic/standard/staticdiagram/ServiceTemplateDiagram.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: GENERATED FILE - DO NOT EDIT
33
* Module: ToscaDesigner v0.0.00
44
5-
* This file was generated on 09/01/2025 12:14 by Modelio Studio.
5+
* This file was generated on 09/01/2025 16:04 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,13 @@
4040
*/
4141
@objid ("6410d22d-7798-4501-8617-a7b9c2035a03")
4242
public class ServiceTemplateDiagram implements IMdaProxy {
43-
@objid ("44aa2d09-8d52-4896-84e2-cd8595bba3d1")
43+
@objid ("ced3af61-ae77-46fb-b605-13c149c43e2c")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("0c75083c-48ca-459e-9cba-31a71e29501c")
49+
@objid ("51c89b7e-7af7-4853-965d-d490c25b81a1")
5050
protected final StaticDiagram elt;
5151

5252
/**
@@ -56,7 +56,7 @@ public class ServiceTemplateDiagram implements IMdaProxy {
5656
* @param elt a model object
5757
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
5858
*/
59-
@objid ("eccb7543-dbc8-4cde-886e-d3b8faa363be")
59+
@objid ("b8f66326-642c-46f9-bf03-c5e4e0a605e4")
6060
public static boolean canInstantiate(final MObject elt) {
6161
return ((elt instanceof StaticDiagram) && (ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
6262
}
@@ -66,7 +66,7 @@ public static boolean canInstantiate(final MObject elt) {
6666
*
6767
* @return a {@link ServiceTemplateDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("d249b5c2-5d79-4c26-8203-37c04acf1ea2")
69+
@objid ("ddd54b58-3f42-4768-b6be-2186a4376b51")
7070
public static ServiceTemplateDiagram create(final IModelingSession session) {
7171
ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
7272
e.getExtension().add(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static ServiceTemplateDiagram create(final IModelingSession session) {
8080
* @param obj a StaticDiagram
8181
* @return a {@link ServiceTemplateDiagram} proxy or <i>null</i>.
8282
*/
83-
@objid ("6d385095-d571-4272-b93c-57fdeb5c65ee")
83+
@objid ("3a5a0c28-e270-481e-89be-196d5e0666fc")
8484
public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
8585
return ServiceTemplateDiagram.canInstantiate(obj) ? new ServiceTemplateDiagram(obj) : null;
8686
}
@@ -93,15 +93,15 @@ public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
9393
* @return a {@link ServiceTemplateDiagram} proxy.
9494
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9595
*/
96-
@objid ("d2fb8718-87f8-4ea0-863e-11b1b494412c")
96+
@objid ("9e8a4d68-609f-40ba-ae4d-bba3680cb92d")
9797
public static ServiceTemplateDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
9898
if (ServiceTemplateDiagram.canInstantiate(obj))
9999
return new ServiceTemplateDiagram(obj);
100100
else
101101
throw new IllegalArgumentException("ServiceTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
102102
}
103103

104-
@objid ("26fcc843-2ae6-4b1c-9854-c80193b10abc")
104+
@objid ("3c12aa05-881c-498a-8f81-37b732c86b8f")
105105
@Override
106106
public boolean equals(final Object obj) {
107107
if (this == obj) {
@@ -121,35 +121,35 @@ public boolean equals(final Object obj) {
121121
* Get the underlying {@link StaticDiagram}.
122122
* @return the StaticDiagram represented by this proxy, never null.
123123
*/
124-
@objid ("c4a60d0d-e53b-4f2f-ad48-812771a9b53a")
124+
@objid ("720dea68-6000-4ffe-887b-1029a4c16f1a")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("cb0abcad-4f53-494a-bfc7-3d16fec338a2")
129+
@objid ("36df3265-2c75-468c-af96-c9fa008b4119")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("c7265750-19d2-4315-bff8-1a85de010fbb")
136+
@objid ("e0cc92d9-fdb9-4f3f-b271-70bea1eb9252")
137137
protected ServiceTemplateDiagram(final StaticDiagram elt) {
138138
this.elt = elt;
139139
}
140140

141141
@objid ("f4f8acbe-52e0-4947-9cbf-c86b468b39dc")
142142
public static final class MdaTypes {
143-
@objid ("141e8799-2f10-486d-a085-4f7fd1809949")
143+
@objid ("b24f35be-55cf-419d-b08b-2627602eb09c")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("652c6e65-38c8-4adb-82f6-1028b914e9e0")
146+
@objid ("92651b97-86dd-4f4e-9389-0c02297ea79c")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("94423127-4f92-4ab6-b408-e82d4c694bae")
149+
@objid ("e43d407b-fc70-4c85-bbf8-d93fd9571960")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("9ca0b63d-26ea-4004-b1fc-a9bcc211e15a")
152+
@objid ("11e9da14-f780-44ee-825d-15279b85ced8")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)