Skip to content

Commit df1f5e2

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Update TPropertyDef property page ( name <-> type)
1 parent 83b657f commit df1f5e2

File tree

103 files changed

+2294
-2291
lines changed

Some content is hidden

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

103 files changed

+2294
-2291
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ propertydefinition.PropertiesType1Table.any.description=
6161
propertydefinition.PropertiesType1Table.any.label=any
6262
propertydefinition.PropertiesType1Table.propertyMappings.description=
6363
propertydefinition.PropertiesType1Table.propertyMappings.label=propertyMappings
64-
propertydefinition.PropertyDefinitionTypeTable.PropertyTypeDefinition3.description=
65-
propertydefinition.PropertyDefinitionTypeTable.PropertyTypeDefinition3.label=PropertyTypeDefinition3
6664
propertydefinition.PropertyDefinitionTypeTable.description.description=
6765
propertydefinition.PropertyDefinitionTypeTable.description.label=description
6866
propertydefinition.PropertyDefinitionTypeTable.required.description=

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

-108 Bytes
Binary file not shown.

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

Lines changed: 44 additions & 44 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 17:52 by Modelio Studio.
5+
* This file was generated on 15/05/2025 11:44 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 ("f04b10cb-473b-4bef-904d-ff9b84affbad")
129+
@objid ("3bbd5158-1b09-4425-bfd7-b6cd71da3c1c")
130130
private static final String ASSETNAME = "ToscaDesigner";
131131

132-
@objid ("f879a017-13be-4ddd-8562-03c3b6b698c4")
132+
@objid ("3e6e35a6-ff14-43bc-80ef-32ba54f53859")
133133
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
134134

135135
/**
136136
* @param session The modeling session this factory is operating in.
137137
*/
138-
@objid ("af9742cb-70b3-4b11-ab32-acec44a261da")
138+
@objid ("c0edaabf-4761-4938-a511-54f115a44610")
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 ("295e4b68-3ba8-4def-86ce-da255244a6f3")
244+
@objid ("4416c7b2-7a42-4172-98a3-b53e7e4729b4")
245245
public static final Object instantiate(final ModelElement e) {
246246
for (Stereotype s : e.getExtension()) {
247247
ModuleComponent module = s.getModule();
@@ -261,65 +261,65 @@ 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 ("3a7a623e-81a5-4c6d-8458-3cdaae70c83a")
264+
@objid ("6869383a-f852-480c-851b-946037e2a2a0")
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 ("fdf5741d-5865-4a85-8e43-e21af11cfad2")
270+
@objid ("161e7695-8ebc-4970-9cab-3b9a65412fd7")
271271
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
272-
@objid ("567ecc3b-6509-42b6-8fef-10b6aef8564c")
272+
@objid ("89179f9e-658a-4c36-8109-502cacdfc919")
273273
private String stName;
274274

275-
@objid ("60c31561-6d46-4d39-b0ab-bb3b763e1e79")
275+
@objid ("84b7ac02-465d-4dd1-a2b9-010ca3143aac")
276276
public final void setStereotype(final String stName) {
277277
this.stName = stName;
278278
}
279279

280-
@objid ("4f6b1d50-99a6-409d-a391-150c67e35d01")
280+
@objid ("8e9ec5e0-8be9-480e-90c0-3152a85fa285")
281281
@Override
282-
public final Object visitAttribute(Attribute obj) {
282+
public final Object visitAssociation(Association obj) {
283283
switch (this.stName) {
284-
case fr.softeam.toscadesigner.api.tosca.standard.attribute.Metadata.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.Metadata.instantiate(obj);
285-
case fr.softeam.toscadesigner.api.tosca.standard.attribute.PropertyDefinitionType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.PropertyDefinitionType.instantiate(obj);
286-
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef.instantiate(obj);
284+
case fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate.instantiate(obj);
287285
default:
288286
break;
289287
}
290288

291-
return IDefaultModelVisitor.super.visitAttribute(obj);
289+
return IDefaultModelVisitor.super.visitAssociation(obj);
292290

293291
}
294292

295-
@objid ("24757a89-5c55-48c4-b915-69a0750f421a")
293+
@objid ("5980cdb4-78af-4593-b689-4d4c2dd299b2")
296294
@Override
297-
public final Object visitPackage(Package obj) {
295+
public final Object visitAttribute(Attribute obj) {
298296
switch (this.stName) {
299-
case fr.softeam.toscadesigner.api.tosca.standard.package_.TServiceTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.TServiceTemplate.instantiate(obj);
300-
case fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.instantiate(obj);
297+
case fr.softeam.toscadesigner.api.tosca.standard.attribute.Metadata.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.Metadata.instantiate(obj);
298+
case fr.softeam.toscadesigner.api.tosca.standard.attribute.PropertyDefinitionType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.PropertyDefinitionType.instantiate(obj);
299+
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef.instantiate(obj);
301300
default:
302301
break;
303302
}
304303

305-
return IDefaultModelVisitor.super.visitPackage(obj);
304+
return IDefaultModelVisitor.super.visitAttribute(obj);
306305

307306
}
308307

309-
@objid ("308673ac-37d3-4c11-ad50-4a8b93a6bbaa")
308+
@objid ("aed06588-ce38-4c50-b245-92ac128b15f8")
310309
@Override
311-
public final Object visitAssociation(Association obj) {
310+
public final Object visitPackage(Package obj) {
312311
switch (this.stName) {
313-
case fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate.instantiate(obj);
312+
case fr.softeam.toscadesigner.api.tosca.standard.package_.TServiceTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.TServiceTemplate.instantiate(obj);
313+
case fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.instantiate(obj);
314314
default:
315315
break;
316316
}
317317

318-
return IDefaultModelVisitor.super.visitAssociation(obj);
318+
return IDefaultModelVisitor.super.visitPackage(obj);
319319

320320
}
321321

322-
@objid ("5cabc5e1-941d-4efe-9c06-bc57a7fc21c6")
322+
@objid ("df795db8-b428-4ee1-815a-3ecab16b6688")
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 ("cd074ee8-30a3-4ed2-9507-a6447dde72b1")
335+
@objid ("f4070526-7df3-4730-883f-5c0bb2a4816f")
336336
@Override
337337
public final Object visitDataType(DataType obj) {
338338
switch (this.stName) {
@@ -346,22 +346,7 @@ public final Object visitDataType(DataType obj) {
346346

347347
}
348348

349-
@objid ("162da223-7805-4742-b745-ae72aaaf2e9c")
350-
@Override
351-
public final Object visitStaticDiagram(StaticDiagram obj) {
352-
switch (this.stName) {
353-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.instantiate(obj);
354-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.instantiate(obj);
355-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.instantiate(obj);
356-
default:
357-
break;
358-
}
359-
360-
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
361-
362-
}
363-
364-
@objid ("5eb8327e-5e62-4850-b03a-b3a0f08ddc2b")
349+
@objid ("d2e9608c-ded5-4566-8a79-3a08263224e7")
365350
@Override
366351
public final Object visitClass(Class obj) {
367352
switch (this.stName) {
@@ -403,7 +388,22 @@ public final Object visitClass(Class obj) {
403388

404389
}
405390

406-
@objid ("d0d6c947-eb47-431b-8db4-8ac9ec1b9b57")
391+
@objid ("e67f9a90-6441-427a-8c9c-fd4f10903dd9")
392+
@Override
393+
public final Object visitStaticDiagram(StaticDiagram obj) {
394+
switch (this.stName) {
395+
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.instantiate(obj);
396+
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.instantiate(obj);
397+
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.instantiate(obj);
398+
default:
399+
break;
400+
}
401+
402+
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
403+
404+
}
405+
406+
@objid ("1517055c-f3ae-4ddc-bdf3-9d24ff19d891")
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 ("8e7bebe3-0756-4d29-9715-1e5966ea3117")
474+
@objid ("24412da0-0b27-4f3b-8203-54284b7937fd")
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 17:52 by Modelio Studio.
5+
* This file was generated on 15/05/2025 11:44 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 ("80d3f7bd-50ae-4e2a-b0b7-4d10f5e415b2")
43+
@objid ("7fc22752-cf84-48ec-b223-9ce0cfe9e61b")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("2681c7d5-f1a0-4545-9ec3-294efdd63c67")
49+
@objid ("0a55d147-1304-4b76-9003-17f3e165f0ea")
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 ("8f6c0c72-a19d-4e3d-856d-e217438861a2")
59+
@objid ("ed8beefb-d75a-48da-a876-c5f1a6d1e483")
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 ("819a0b49-786e-4bc3-8531-318005d735d6")
69+
@objid ("041ec76c-98c3-453b-9072-8943fc8bfdfb")
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 ("24c6b420-9659-4f21-a4f2-0e60b17d4f28")
83+
@objid ("dc898290-1e06-4d64-a88b-e028b13b9f5b")
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 ("76dcd839-dbf5-41ec-bb96-4785efa855ec")
96+
@objid ("e2514b80-87f6-4e90-b916-2ea48caa30d3")
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 ("5cab7400-41b7-4727-b64b-a67adefc46ce")
104+
@objid ("4b5924c6-dae6-4c94-a12d-6a10db240242")
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 ("fdeb0a70-1674-46d7-b077-e6a8b7669717")
124+
@objid ("2467a6ae-f02d-453f-b1d6-6205a21cb0d9")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("53dcd803-92dd-423b-b39c-6734c4fc8966")
129+
@objid ("8f4f1176-d766-424e-806a-a07a8953ec2e")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("877735f1-8fe4-427e-ab7e-f9e3e0a103bb")
136+
@objid ("81b0aed9-5090-4bec-90e8-ece0cdbbb5bb")
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 ("90104799-1be6-4a32-a3bf-3824c85a57a0")
143+
@objid ("8e681867-7589-40bb-af6b-3225c8239fff")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("fe37d6c7-6097-4440-8753-9b9f8761e19c")
146+
@objid ("edb9082c-196e-4573-8723-992e9bae6634")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("088c9b5b-37ec-4984-89f2-1b2535224818")
149+
@objid ("2fa56a44-00e8-4e11-8226-2f6404df0753")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("c5274461-32b2-4543-8c58-943e3c952e65")
152+
@objid ("1e0a4004-3b17-4560-b751-c2c5bde5fa4e")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)