Skip to content

Commit 92a619d

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
«PropertyDefinitionType» property page: addind description and required fields
1 parent 4e920d1 commit 92a619d

100 files changed

Lines changed: 2244 additions & 2142 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ propertydefinition.PropertiesType1Table.any.description=
6161
propertydefinition.PropertiesType1Table.any.label=any
6262
propertydefinition.PropertiesType1Table.propertyMappings.description=
6363
propertydefinition.PropertiesType1Table.propertyMappings.label=propertyMappings
64+
propertydefinition.PropertyDefinitionTypeTable.description.description=
65+
propertydefinition.PropertyDefinitionTypeTable.description.label=description
66+
propertydefinition.PropertyDefinitionTypeTable.required.description=
67+
propertydefinition.PropertyDefinitionTypeTable.required.label=required
6468
propertydefinition.RelationshipConstraintTypeTable.any.description=
6569
propertydefinition.RelationshipConstraintTypeTable.any.label=any
6670
propertydefinition.RelationshipConstraintTypeTable.constraintType.description=
@@ -315,6 +319,7 @@ propertytable.NodeOperationTypeTable.label=NodeOperationTypeTable
315319
propertytable.NodeTypeReferenceTypeTable.label=NodeTypeReferenceTypeTable
316320
propertytable.PropertiesDefinitionType.label=PropertiesDefinitionType
317321
propertytable.PropertiesType1Table.label=PropertiesType1Table
322+
propertytable.PropertyDefinitionTypeTable.label=PropertyDefinitionTypeTable
318323
propertytable.RelationshipConstraintTypeTable.label=RelationshipConstraintTypeTable
319324
propertytable.RelationshipOperationTypeTable.label=RelationshipOperationTypeTable
320325
propertytable.TArtifactReferenceTable.label=TArtifactReferenceTable

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,16 @@
202202
<Stereotype name="PropertyDefinitionType" metaclass="Standard.Attribute" owner-stereotype="" is-hidden="false" label="%stereotype.PropertyDefinitionType.label" uid="34943474-c962-4064-b5f1-c6008ebb3c9d" is-abstract="false">
203203
<Icon path="res/icon/gui/PropertyDefinitionType24.png"/>
204204
<Image path="res/icon/gui/PropertyDefinitionType48.png"/>
205+
<PropertyTable id="PropertyDefinitionTypeTable" label="%propertytable.PropertyDefinitionTypeTable.label" uid="10a88662-c943-4c1c-92a8-9212d97d684d">
206+
<PropertyDefinition id="description" label="%propertydefinition.PropertyDefinitionTypeTable.description.label" default-value="" is-editable="true" uid="d7bd8dcf-45a6-4906-95f9-a874b3a36709">
207+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
208+
<Description>%propertydefinition.PropertyDefinitionTypeTable.description.description</Description>
209+
</PropertyDefinition>
210+
<PropertyDefinition id="required" label="%propertydefinition.PropertyDefinitionTypeTable.required.label" default-value="" is-editable="true" uid="f35e9a83-e034-47a1-95bf-a2e1a1203952">
211+
<TypeRef id="mref#'Boolean' {01a40888-0000-002b-0000-000000000000} Infrastructure.PropertyType"/>
212+
<Description>%propertydefinition.PropertyDefinitionTypeTable.required.description</Description>
213+
</PropertyDefinition>
214+
</PropertyTable>
205215
</Stereotype>
206216
<Stereotype name="PropertyMappingsType" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.PropertyMappingsType.label" uid="3d7421b3-1723-4400-8e4f-48176ac40c34" is-abstract="false">
207217
<Icon path=""/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ propertydefinition.PropertiesType1Table.any.description=
6161
propertydefinition.PropertiesType1Table.any.label=any
6262
propertydefinition.PropertiesType1Table.propertyMappings.description=
6363
propertydefinition.PropertiesType1Table.propertyMappings.label=propertyMappings
64+
propertydefinition.PropertyDefinitionTypeTable.description.description=
65+
propertydefinition.PropertyDefinitionTypeTable.description.label=description
66+
propertydefinition.PropertyDefinitionTypeTable.required.description=
67+
propertydefinition.PropertyDefinitionTypeTable.required.label=required
6468
propertydefinition.RelationshipConstraintTypeTable.any.description=
6569
propertydefinition.RelationshipConstraintTypeTable.any.label=any
6670
propertydefinition.RelationshipConstraintTypeTable.constraintType.description=
@@ -315,6 +319,7 @@ propertytable.NodeOperationTypeTable.label=NodeOperationTypeTable
315319
propertytable.NodeTypeReferenceTypeTable.label=NodeTypeReferenceTypeTable
316320
propertytable.PropertiesDefinitionType.label=PropertiesDefinitionType
317321
propertytable.PropertiesType1Table.label=PropertiesType1Table
322+
propertytable.PropertyDefinitionTypeTable.label=PropertyDefinitionTypeTable
318323
propertytable.RelationshipConstraintTypeTable.label=RelationshipConstraintTypeTable
319324
propertytable.RelationshipOperationTypeTable.label=RelationshipOperationTypeTable
320325
propertytable.TArtifactReferenceTable.label=TArtifactReferenceTable

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

2.13 KB
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 17:09 by Modelio Studio.
5+
* This file was generated on 10/04/2025 17:52 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 ("b3079891-d13b-47b1-a05e-89beeed29dfa")
129+
@objid ("f04b10cb-473b-4bef-904d-ff9b84affbad")
130130
private static final String ASSETNAME = "ToscaDesigner";
131131

132-
@objid ("545497cb-8c43-4572-80d6-c326adbda7ad")
132+
@objid ("f879a017-13be-4ddd-8562-03c3b6b698c4")
133133
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
134134

135135
/**
136136
* @param session The modeling session this factory is operating in.
137137
*/
138-
@objid ("c49ec3d9-5a91-49df-8ccb-eca211de4328")
138+
@objid ("af9742cb-70b3-4b11-ab32-acec44a261da")
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 ("a7239eb0-0537-4bd4-bd15-e7ec31613329")
244+
@objid ("295e4b68-3ba8-4def-86ce-da255244a6f3")
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 ("71407d26-a594-4e63-b4b4-435dd3522db0")
264+
@objid ("3a7a623e-81a5-4c6d-8458-3cdaae70c83a")
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 ("deda8274-e8fe-4314-9b05-1932d4c428fe")
270+
@objid ("fdf5741d-5865-4a85-8e43-e21af11cfad2")
271271
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
272-
@objid ("028c0eb0-ea01-4756-a700-82f7e4f5ac55")
272+
@objid ("567ecc3b-6509-42b6-8fef-10b6aef8564c")
273273
private String stName;
274274

275-
@objid ("0f877700-4e1e-490c-a312-af89e0e02d4e")
275+
@objid ("60c31561-6d46-4d39-b0ab-bb3b763e1e79")
276276
public final void setStereotype(final String stName) {
277277
this.stName = stName;
278278
}
279279

280-
@objid ("8cb71856-7028-4521-98aa-eeef3be646a1")
280+
@objid ("4f6b1d50-99a6-409d-a391-150c67e35d01")
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 ("0c602f00-774d-4753-a42a-8e239b57cfe5")
295+
@objid ("24757a89-5c55-48c4-b915-69a0750f421a")
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 ("03d37b3f-cadd-48e7-990d-21e19822e211")
309+
@objid ("308673ac-37d3-4c11-ad50-4a8b93a6bbaa")
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 ("3a901a03-eeb7-41b3-a96d-7d7f72f9aef5")
322+
@objid ("5cabc5e1-941d-4efe-9c06-bc57a7fc21c6")
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 ("052dd1c4-b62d-4861-9cb6-367d5dbc720a")
335+
@objid ("cd074ee8-30a3-4ed2-9507-a6447dde72b1")
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 ("8b146945-9092-4a6f-afb5-0d7dd1516e53")
349+
@objid ("162da223-7805-4742-b745-ae72aaaf2e9c")
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 ("f5ec0ca8-345c-45fa-92e0-5dc88ede623d")
364+
@objid ("5eb8327e-5e62-4850-b03a-b3a0f08ddc2b")
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 ("b9e1a7a3-c696-459b-ad34-bc6a8ee78da2")
406+
@objid ("d0d6c947-eb47-431b-8db4-8ac9ec1b9b57")
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 ("6c1cb105-3920-45d4-8435-bbcfd2777bdd")
474+
@objid ("8e7bebe3-0756-4d29-9715-1e5966ea3117")
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:09 by Modelio Studio.
5+
* This file was generated on 10/04/2025 17:52 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 ("c223bcb4-cf32-4543-bc8c-3a8595b85914")
43+
@objid ("80d3f7bd-50ae-4e2a-b0b7-4d10f5e415b2")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("3a69dcac-153a-4f0f-b60a-87fa91fd73a3")
49+
@objid ("2681c7d5-f1a0-4545-9ec3-294efdd63c67")
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 ("542df4fc-dcc7-4d0e-a48e-f95da2962261")
59+
@objid ("8f6c0c72-a19d-4e3d-856d-e217438861a2")
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 ("4f52671f-b434-459c-9b50-934262a241be")
69+
@objid ("819a0b49-786e-4bc3-8531-318005d735d6")
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 ("735bb202-717c-4010-a404-16ac2bfbf75a")
83+
@objid ("24c6b420-9659-4f21-a4f2-0e60b17d4f28")
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 ("e969c99e-87c7-4b48-b2b1-abf672fe7fdc")
96+
@objid ("76dcd839-dbf5-41ec-bb96-4785efa855ec")
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 ("e020ce83-3f0f-43ee-8355-22907f59eae8")
104+
@objid ("5cab7400-41b7-4727-b64b-a67adefc46ce")
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 ("e92c67a6-46c1-4cbf-a467-0bcd4eceaf97")
124+
@objid ("fdeb0a70-1674-46d7-b077-e6a8b7669717")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("78a352c1-7a5c-4fc3-9dd5-4af77bc9e3cd")
129+
@objid ("53dcd803-92dd-423b-b39c-6734c4fc8966")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("348e7d84-0f6e-4221-aca7-4d16e5e4eaaf")
136+
@objid ("877735f1-8fe4-427e-ab7e-f9e3e0a103bb")
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 ("bbb1160e-41af-4bc4-9193-9289e19117a5")
143+
@objid ("90104799-1be6-4a32-a3bf-3824c85a57a0")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("731b0af5-ba32-4b67-b6f2-29d1878a189c")
146+
@objid ("fe37d6c7-6097-4440-8753-9b9f8761e19c")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("0db18285-5268-4d5b-b358-7f42a6a89032")
149+
@objid ("088c9b5b-37ec-4984-89f2-1b2535224818")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("220ec95f-74fa-46b1-b461-5e79a0f110cb")
152+
@objid ("c5274461-32b2-4543-8c58-943e3c952e65")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)