Skip to content

Commit 4e920d1

Browse files
TCapabilityDefinition: Valide source types is a collection of TNodeType
1 parent a4b7dd5 commit 4e920d1

99 files changed

Lines changed: 2214 additions & 2181 deletions

File tree

Some content is hidden

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

ToscaDesigner/src/main/conf/module.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
101101
propertydefinition.TCapabilityDefinitionTable.lowerBound.label=lowerBound
102102
propertydefinition.TCapabilityDefinitionTable.upperBound.description=
103103
propertydefinition.TCapabilityDefinitionTable.upperBound.label=upperBound
104-
propertydefinition.TCapabilityDefinitionTable.validSourceType.description=
105-
propertydefinition.TCapabilityDefinitionTable.validSourceType.label=validSourceType
106104
propertydefinition.TCapabilityRefTable.name.description=
107105
propertydefinition.TCapabilityRefTable.name.label=name
108106
propertydefinition.TCapabilityRefTable.ref.description=

ToscaDesigner/src/main/conf/module.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,6 @@
356356
<TypeRef id="mref#'Integer' {01a40888-0000-002d-0000-000000000000} Infrastructure.PropertyType"/>
357357
<Description>%propertydefinition.TCapabilityDefinitionTable.upperBound.description</Description>
358358
</PropertyDefinition>
359-
<PropertyDefinition id="validSourceType" label="%propertydefinition.TCapabilityDefinitionTable.validSourceType.label" default-value="" is-editable="true" uid="58a9cdcd-b57e-4a9e-bbd1-d353e9f42b56">
360-
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
361-
<Description>%propertydefinition.TCapabilityDefinitionTable.validSourceType.description</Description>
362-
</PropertyDefinition>
363359
</PropertyTable>
364360
</Stereotype>
365361
<Stereotype name="TCapabilityDefinitionsType" metaclass="Standard.Class" owner-stereotype="mref#'' {fecd81a5-da41-4a07-a507-6bfaf5bbadd2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.TCapabilityDefinitionsType.label" uid="ac0418b1-a726-46e6-ac59-310f0055050f" is-abstract="false">

ToscaDesigner/src/main/conf/module_fr.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
101101
propertydefinition.TCapabilityDefinitionTable.lowerBound.label=lowerBound
102102
propertydefinition.TCapabilityDefinitionTable.upperBound.description=
103103
propertydefinition.TCapabilityDefinitionTable.upperBound.label=upperBound
104-
propertydefinition.TCapabilityDefinitionTable.validSourceType.description=
105-
propertydefinition.TCapabilityDefinitionTable.validSourceType.label=validSourceType
106104
propertydefinition.TCapabilityRefTable.name.description=
107105
propertydefinition.TCapabilityRefTable.name.label=name
108106
propertydefinition.TCapabilityRefTable.ref.description=
-89 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.1.0
44
5-
* This file was generated on 10/04/2025 14:48 by Modelio Studio.
5+
* This file was generated on 10/04/2025 17:09 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -126,16 +126,16 @@
126126
*/
127127
@objid ("344538da-8f7b-4820-bee7-fad3a6c1b7e1")
128128
public class ToscaDesignerProxyFactory {
129-
@objid ("ca6f2842-2bac-4ea5-b392-4a5e42562962")
129+
@objid ("b3079891-d13b-47b1-a05e-89beeed29dfa")
130130
private static final String ASSETNAME = "ToscaDesigner";
131131

132-
@objid ("a93d13cd-e68a-4dc9-839f-7a4c0fd57fb4")
132+
@objid ("545497cb-8c43-4572-80d6-c326adbda7ad")
133133
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
134134

135135
/**
136136
* @param session The modeling session this factory is operating in.
137137
*/
138-
@objid ("6a2c2173-9d11-4e01-bde3-2867c5320196")
138+
@objid ("c49ec3d9-5a91-49df-8ccb-eca211de4328")
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 ("b703aeeb-215b-413b-b7fe-d28877d848fe")
244+
@objid ("a7239eb0-0537-4bd4-bd15-e7ec31613329")
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 ("e3cec617-48d3-4258-b0f5-6581a4ba8688")
264+
@objid ("71407d26-a594-4e63-b4b4-435dd3522db0")
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 ("552b77c3-fb9d-43f4-9184-73300efaa8e9")
270+
@objid ("deda8274-e8fe-4314-9b05-1932d4c428fe")
271271
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
272-
@objid ("5f5f4b05-899d-4b66-b3cd-bdad3e2e3294")
272+
@objid ("028c0eb0-ea01-4756-a700-82f7e4f5ac55")
273273
private String stName;
274274

275-
@objid ("f44a445a-6a70-413a-b874-ddb688b48f3e")
275+
@objid ("0f877700-4e1e-490c-a312-af89e0e02d4e")
276276
public final void setStereotype(final String stName) {
277277
this.stName = stName;
278278
}
279279

280-
@objid ("556c95ae-60c9-4be3-b846-f89f101519fd")
280+
@objid ("8cb71856-7028-4521-98aa-eeef3be646a1")
281281
@Override
282282
public final Object visitAttribute(Attribute obj) {
283283
switch (this.stName) {
@@ -292,7 +292,7 @@ public final Object visitAttribute(Attribute obj) {
292292

293293
}
294294

295-
@objid ("d7684998-d239-4f04-8c93-627ea1d2bb68")
295+
@objid ("0c602f00-774d-4753-a42a-8e239b57cfe5")
296296
@Override
297297
public final Object visitPackage(Package obj) {
298298
switch (this.stName) {
@@ -306,7 +306,7 @@ public final Object visitPackage(Package obj) {
306306

307307
}
308308

309-
@objid ("80d876c1-398f-4ea5-ae8d-eba9176bf3fe")
309+
@objid ("03d37b3f-cadd-48e7-990d-21e19822e211")
310310
@Override
311311
public final Object visitAssociation(Association obj) {
312312
switch (this.stName) {
@@ -319,7 +319,7 @@ public final Object visitAssociation(Association obj) {
319319

320320
}
321321

322-
@objid ("57f5b95c-082e-4c3a-a737-ee82e8ea205e")
322+
@objid ("3a901a03-eeb7-41b3-a96d-7d7f72f9aef5")
323323
@Override
324324
public final Object visitAssociationEnd(AssociationEnd obj) {
325325
switch (this.stName) {
@@ -332,7 +332,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
332332

333333
}
334334

335-
@objid ("ad3be60e-de22-480c-8ede-374a55908fd1")
335+
@objid ("052dd1c4-b62d-4861-9cb6-367d5dbc720a")
336336
@Override
337337
public final Object visitDataType(DataType obj) {
338338
switch (this.stName) {
@@ -346,7 +346,7 @@ public final Object visitDataType(DataType obj) {
346346

347347
}
348348

349-
@objid ("1f7e1588-1fd1-4893-8345-badef3dc338e")
349+
@objid ("8b146945-9092-4a6f-afb5-0d7dd1516e53")
350350
@Override
351351
public final Object visitStaticDiagram(StaticDiagram obj) {
352352
switch (this.stName) {
@@ -361,7 +361,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
361361

362362
}
363363

364-
@objid ("e5037394-2c27-4d4d-9972-9e23bb86cec7")
364+
@objid ("f5ec0ca8-345c-45fa-92e0-5dc88ede623d")
365365
@Override
366366
public final Object visitClass(Class obj) {
367367
switch (this.stName) {
@@ -403,7 +403,7 @@ public final Object visitClass(Class obj) {
403403

404404
}
405405

406-
@objid ("43da00d1-0db6-4e8f-bf33-7a7aa29b4a45")
406+
@objid ("b9e1a7a3-c696-459b-ad34-bc6a8ee78da2")
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 ("bc1d75d0-2874-454f-908d-7fdd4d5ee982")
474+
@objid ("6c1cb105-3920-45d4-8435-bbcfd2777bdd")
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.1.0
44
5-
* This file was generated on 10/04/2025 14:48 by Modelio Studio.
5+
* This file was generated on 10/04/2025 17:09 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,13 @@
4040
*/
4141
@objid ("ed792b19-3a0d-46f3-b2a8-c885af3a1414")
4242
public class ServiceTemplateDiagram implements IMdaProxy {
43-
@objid ("f167ad3b-8941-4175-86ea-29378b26a6fa")
43+
@objid ("c223bcb4-cf32-4543-bc8c-3a8595b85914")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("205fb0bc-b08e-410d-ada2-91062fc346c2")
49+
@objid ("3a69dcac-153a-4f0f-b60a-87fa91fd73a3")
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 ("8ed252a1-b272-4c65-b117-2eab50d6a0d4")
59+
@objid ("542df4fc-dcc7-4d0e-a48e-f95da2962261")
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 ("ff324110-dab8-4123-ab58-d60b3ccd1074")
69+
@objid ("4f52671f-b434-459c-9b50-934262a241be")
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 ("4e2fa795-0b14-45f8-86d8-eb081e03b03e")
83+
@objid ("735bb202-717c-4010-a404-16ac2bfbf75a")
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 ("6777b4c4-bff1-47d3-8c6d-10173a0acea4")
96+
@objid ("e969c99e-87c7-4b48-b2b1-abf672fe7fdc")
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 ("e5bdad48-05ae-4be1-85ae-05c462634858")
104+
@objid ("e020ce83-3f0f-43ee-8355-22907f59eae8")
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 ("36651741-af14-43fc-8104-cf4671045915")
124+
@objid ("e92c67a6-46c1-4cbf-a467-0bcd4eceaf97")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("a6c7aea9-713b-4a09-9116-f6b58832a538")
129+
@objid ("78a352c1-7a5c-4fc3-9dd5-4af77bc9e3cd")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("46e1a632-90e5-44ac-9b1d-4a73a26914a0")
136+
@objid ("348e7d84-0f6e-4221-aca7-4d16e5e4eaaf")
137137
protected ServiceTemplateDiagram(final StaticDiagram elt) {
138138
this.elt = elt;
139139
}
140140

141141
@objid ("4b6fef3f-101c-4384-86b5-c7c7a22b250c")
142142
public static final class MdaTypes {
143-
@objid ("75100483-d389-48c5-a592-4c9f1e59d0ab")
143+
@objid ("bbb1160e-41af-4bc4-9193-9289e19117a5")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("bb6eba6d-fee7-46bb-836c-941ece8aaf9e")
146+
@objid ("731b0af5-ba32-4b67-b6f2-29d1878a189c")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("f9b0b1c4-9fc8-4761-8845-c3bc4d32d134")
149+
@objid ("0db18285-5268-4d5b-b358-7f42a6a89032")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("0d069541-e7e0-434b-8065-b27029e0e828")
152+
@objid ("220ec95f-74fa-46b1-b461-5e79a0f110cb")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/automatic/standard/staticdiagram/TopologyTemplateDiagram.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.1.0
44
5-
* This file was generated on 10/04/2025 14:48 by Modelio Studio.
5+
* This file was generated on 10/04/2025 17:09 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,13 @@
4040
*/
4141
@objid ("5690a531-d748-4d21-a33e-03dd25aeea24")
4242
public class TopologyTemplateDiagram implements IMdaProxy {
43-
@objid ("c7f1f3c2-44af-4e1f-87c3-0d35d6bb12e9")
43+
@objid ("334d09c9-6033-4a8e-ad68-198fbd1579a0")
4444
public static final String STEREOTYPE_NAME = "TopologyTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("327c76d3-ef97-4ea3-a0b1-77322eb5915c")
49+
@objid ("c6aec5ac-fb09-4747-8605-cdaaacdca1af")
5050
protected final StaticDiagram elt;
5151

5252
/**
@@ -56,7 +56,7 @@ public class TopologyTemplateDiagram 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 ("ccf10406-ec9a-43e1-9828-99ba62332aae")
59+
@objid ("8b38f389-7bb6-4483-a5d3-9bbe15148bcf")
6060
public static boolean canInstantiate(final MObject elt) {
6161
return ((elt instanceof StaticDiagram) && (TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
6262
}
@@ -66,7 +66,7 @@ public static boolean canInstantiate(final MObject elt) {
6666
*
6767
* @return a {@link TopologyTemplateDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("0d72d339-fcc2-4833-8a3a-1de523f66953")
69+
@objid ("aeb29220-0f8d-4fbf-801a-4f1a2cb4a429")
7070
public static TopologyTemplateDiagram create(final IModelingSession session) {
7171
ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
7272
e.getExtension().add(TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static TopologyTemplateDiagram create(final IModelingSession session) {
8080
* @param obj a StaticDiagram
8181
* @return a {@link TopologyTemplateDiagram} proxy or <i>null</i>.
8282
*/
83-
@objid ("bfbfe0ca-3942-4d6c-9852-bb18e85c8a8a")
83+
@objid ("286651aa-d36f-4957-9322-93c0d3d098e9")
8484
public static TopologyTemplateDiagram instantiate(final StaticDiagram obj) {
8585
return TopologyTemplateDiagram.canInstantiate(obj) ? new TopologyTemplateDiagram(obj) : null;
8686
}
@@ -93,15 +93,15 @@ public static TopologyTemplateDiagram instantiate(final StaticDiagram obj) {
9393
* @return a {@link TopologyTemplateDiagram} proxy.
9494
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9595
*/
96-
@objid ("8c2f8c89-a19f-4d51-8bcf-9247b51bdbbc")
96+
@objid ("551d2fb4-4495-4144-abd5-b8356306a653")
9797
public static TopologyTemplateDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
9898
if (TopologyTemplateDiagram.canInstantiate(obj))
9999
return new TopologyTemplateDiagram(obj);
100100
else
101101
throw new IllegalArgumentException("TopologyTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
102102
}
103103

104-
@objid ("597ab468-4c79-48e5-94d0-9f727dfc2d56")
104+
@objid ("e088a16e-6c31-4947-bce3-41843d5afbae")
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 ("0d4ed2f6-b486-4a7b-8183-bd109db5f003")
124+
@objid ("60732594-24dd-48f3-b16d-0dca86451c2b")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("8a7fee4f-610a-4a1f-b330-be925554d66a")
129+
@objid ("39cfd626-ad87-45d2-a4f8-b0ab39bb086f")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("9d7efefa-13d1-4884-ba4c-8ca61b48f2ec")
136+
@objid ("3b7f16b9-423c-4abf-b5d4-b4aa1b642fe9")
137137
protected TopologyTemplateDiagram(final StaticDiagram elt) {
138138
this.elt = elt;
139139
}
140140

141141
@objid ("a75a5020-1077-4e84-8bb0-72f5c433615f")
142142
public static final class MdaTypes {
143-
@objid ("4b091f44-d536-4f9f-8ec9-05c070c79ec4")
143+
@objid ("1c7fe4ed-8aeb-4d4a-9ac7-28b8bc881612")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("ccaf18df-4b7c-4566-9114-8f2d50ad4564")
146+
@objid ("baefd922-4660-4ecc-91f0-052a7b0e7422")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("10261eaf-677b-479b-b03d-342b37d928f1")
149+
@objid ("b1e4a90c-d1e3-4402-9901-bebbedeb1ce3")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("0a726e6b-bf20-4271-9176-1f5ef6515114")
152+
@objid ("54a569b8-ade4-49b9-893d-38de88290f0a")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)