Skip to content

Commit 4c5288d

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
TPolicyType property page + stereotype update
1 parent dad3910 commit 4c5288d

File tree

98 files changed

+2199
-1996
lines changed

Some content is hidden

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

98 files changed

+2199
-1996
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,10 @@ propertydefinition.TPlansPropertyTable.targetNamespace.description=
238238
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
239239
propertydefinition.TPolicyTable.policyRef.description=
240240
propertydefinition.TPolicyTable.policyRef.label=policyRef
241+
propertydefinition.TPolicyTypePropertyTable.description.description=
242+
propertydefinition.TPolicyTypePropertyTable.description.label=description
243+
propertydefinition.TPolicyTypePropertyTable.policyLanguage.description=
244+
propertydefinition.TPolicyTypePropertyTable.policyLanguage.label=policyLanguage
241245
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.description=
242246
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.label=serviceTemplatePropertyRef
243247
propertydefinition.TPropertyMappingTable.targetObjectRef.description=
@@ -305,6 +309,7 @@ propertytable.TOperationTable.label=TOperationTable
305309
propertytable.TParameterTable.label=TParameterTable
306310
propertytable.TPlansPropertyTable.label=TPlansPropertyTable
307311
propertytable.TPolicyTable.label=TPolicyTable
312+
propertytable.TPolicyTypePropertyTable.label=TPolicyTypePropertyTable
308313
propertytable.TPropertyMappingTable.label=TPropertyMappingTable
309314
propertytable.TRelationshipTypePropertyTable.label=TRelationshipTypePropertyTable
310315
propertytable.TRequirementDefinitionTable.label=TRequirementDefinitionTable

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,16 @@
772772
<Stereotype name="TPolicyType" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.TPolicyType.label" uid="b76dbc7d-8b6f-46f8-89d4-f0ea8eea40d2" is-abstract="false">
773773
<Icon path="res/icon/gui/tpolicytype24.ICON.png"/>
774774
<Image path="res/icon/gui/tpolicytype48.IMAGE.png"/>
775+
<PropertyTable id="TPolicyTypePropertyTable" label="%propertytable.TPolicyTypePropertyTable.label" uid="8b63b4bf-4185-48af-a337-faa6a3a19337">
776+
<PropertyDefinition id="description" label="%propertydefinition.TPolicyTypePropertyTable.description.label" default-value="" is-editable="true" uid="eb0df9aa-0b7c-4235-a8a1-f7498491e32d">
777+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
778+
<Description>%propertydefinition.TPolicyTypePropertyTable.description.description</Description>
779+
</PropertyDefinition>
780+
<PropertyDefinition id="policyLanguage" label="%propertydefinition.TPolicyTypePropertyTable.policyLanguage.label" default-value="" is-editable="true" uid="d2f2bc40-5d08-4ac9-a826-094f3fe2974a">
781+
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
782+
<Description>%propertydefinition.TPolicyTypePropertyTable.policyLanguage.description</Description>
783+
</PropertyDefinition>
784+
</PropertyTable>
775785
</Stereotype>
776786
<Stereotype name="TPropertyConstraint" metaclass="Infrastructure.ModelElement" owner-stereotype="mref#'' {78fc63ae-0ad0-45f4-840f-4dbadc0922cb} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.TPropertyConstraint.label" uid="85f116c1-fe2c-435b-a801-c3389c84beef" is-abstract="false">
777787
<Icon path=""/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,10 @@ propertydefinition.TPlansPropertyTable.targetNamespace.description=
238238
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
239239
propertydefinition.TPolicyTable.policyRef.description=
240240
propertydefinition.TPolicyTable.policyRef.label=policyRef
241+
propertydefinition.TPolicyTypePropertyTable.description.description=
242+
propertydefinition.TPolicyTypePropertyTable.description.label=description
243+
propertydefinition.TPolicyTypePropertyTable.policyLanguage.description=
244+
propertydefinition.TPolicyTypePropertyTable.policyLanguage.label=policyLanguage
241245
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.description=
242246
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.label=serviceTemplatePropertyRef
243247
propertydefinition.TPropertyMappingTable.targetObjectRef.description=
@@ -305,6 +309,7 @@ propertytable.TOperationTable.label=TOperationTable
305309
propertytable.TParameterTable.label=TParameterTable
306310
propertytable.TPlansPropertyTable.label=TPlansPropertyTable
307311
propertytable.TPolicyTable.label=TPolicyTable
312+
propertytable.TPolicyTypePropertyTable.label=TPolicyTypePropertyTable
308313
propertytable.TPropertyMappingTable.label=TPropertyMappingTable
309314
propertytable.TRelationshipTypePropertyTable.label=TRelationshipTypePropertyTable
310315
propertytable.TRequirementDefinitionTable.label=TRequirementDefinitionTable

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

1.16 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.0.00
44
5-
* This file was generated on 18/09/2024 12:38 by Modelio Studio.
5+
* This file was generated on 18/09/2024 13:03 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -120,16 +120,16 @@
120120
*/
121121
@objid ("f96166f4-8706-4930-8397-6424c7b3f767")
122122
public class ToscaDesignerProxyFactory {
123-
@objid ("de987790-8093-4e22-ac3a-576ed324a573")
123+
@objid ("7d2499cd-a3ee-46fb-8582-e06600b221da")
124124
private static final String ASSETNAME = "ToscaDesigner";
125125

126-
@objid ("477476e7-b1a9-4715-a2bc-b8de4c387ac9")
126+
@objid ("2bc612ff-f95d-4b69-86f7-00757f337bd8")
127127
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
128128

129129
/**
130130
* @param session The modeling session this factory is operating in.
131131
*/
132-
@objid ("de6455b2-17e5-49e6-be9c-a58be0fd7e21")
132+
@objid ("5a5bd1c1-d18e-4096-981d-679358b5ae4d")
133133
public static final void initialize(final IModelingSession session) throws MdaProxyException {
134134
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.MdaTypes.init(session);
135135
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
@@ -229,7 +229,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
229229
* @param e A model element
230230
* @return the right proxy or <i>null</i>.
231231
*/
232-
@objid ("08c30484-1135-4dde-a73c-399dc87c4418")
232+
@objid ("e13b244b-5987-4c4e-a024-edc22c41111e")
233233
public static final Object instantiate(final ModelElement e) {
234234
for (Stereotype s : e.getExtension()) {
235235
ModuleComponent module = s.getModule();
@@ -249,23 +249,23 @@ public static final Object instantiate(final ModelElement e) {
249249
* @param stName A stereotype name.
250250
* @return the right proxy or <i>null</i>.
251251
*/
252-
@objid ("8d5fe345-55bb-4296-a708-a5c197158ad1")
252+
@objid ("12151265-f93b-4e7f-b9a1-6834dad17867")
253253
public static final Object instantiate(final Element e, final String stName) {
254254
instantiateVisitor.setStereotype(stName);
255255
return e.accept(instantiateVisitor);
256256
}
257257

258-
@objid ("c3219767-5608-4c25-816b-deeb41f3b849")
258+
@objid ("5a938360-da01-410a-ad1f-9abe9fba8364")
259259
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
260-
@objid ("c59ff690-8c0f-48ae-aab6-638ac5df52b9")
260+
@objid ("4671dd53-4812-417b-8f90-f765981c3491")
261261
private String stName;
262262

263-
@objid ("ab98d665-e136-4c83-9042-afaf5e423a1e")
263+
@objid ("bae41a01-f874-4673-acfe-3b700db8a60c")
264264
public final void setStereotype(final String stName) {
265265
this.stName = stName;
266266
}
267267

268-
@objid ("68a0fc55-78eb-42ff-9cf5-530d00051498")
268+
@objid ("70c1665b-1dbb-4697-b6b7-f4007c8aa700")
269269
@Override
270270
public final Object visitAttribute(Attribute obj) {
271271
switch (this.stName) {
@@ -285,7 +285,7 @@ public final Object visitAttribute(Attribute obj) {
285285

286286
}
287287

288-
@objid ("e21a4f65-1352-469d-b4ed-ede445c97f72")
288+
@objid ("eb7e92d6-83cd-4ae5-a1f1-3c962299b0be")
289289
@Override
290290
public final Object visitPackage(Package obj) {
291291
switch (this.stName) {
@@ -298,7 +298,7 @@ public final Object visitPackage(Package obj) {
298298

299299
}
300300

301-
@objid ("f05448a7-0b7e-4175-a0eb-141a6ebbd06d")
301+
@objid ("b91e2709-6ee3-4d19-8c86-935aed36f31f")
302302
@Override
303303
public final Object visitStaticDiagram(StaticDiagram obj) {
304304
switch (this.stName) {
@@ -313,7 +313,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
313313

314314
}
315315

316-
@objid ("4c400535-1a55-4831-9e75-437abe43d1fa")
316+
@objid ("f22b20b2-71db-4d55-945a-1c6840833873")
317317
@Override
318318
public final Object visitClass(Class obj) {
319319
switch (this.stName) {
@@ -344,7 +344,7 @@ public final Object visitClass(Class obj) {
344344

345345
}
346346

347-
@objid ("90e531b0-85d2-40da-a6f7-1f838aed4f53")
347+
@objid ("23cfb496-7f2c-40e3-8a00-bd5f633726e6")
348348
@Override
349349
public final Object visitAssociationEnd(AssociationEnd obj) {
350350
switch (this.stName) {
@@ -357,7 +357,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
357357

358358
}
359359

360-
@objid ("03266eba-6db5-4e20-9ff1-ac3789806e0b")
360+
@objid ("bdb8e75b-d6da-4ca8-9500-df7aa6210eff")
361361
@Override
362362
public final Object visitModelElement(ModelElement obj) {
363363
switch (this.stName) {
@@ -421,7 +421,7 @@ public final Object visitModelElement(ModelElement obj) {
421421

422422
}
423423

424-
@objid ("dabd9e88-ae90-4928-8d3e-cadd083c3045")
424+
@objid ("d5419b53-672e-4bed-b5ac-5851536edc48")
425425
@Override
426426
public final Object visitDataType(DataType obj) {
427427
switch (this.stName) {
@@ -435,7 +435,7 @@ public final Object visitDataType(DataType obj) {
435435

436436
}
437437

438-
@objid ("722295f3-cc28-4d3d-b9bd-97548af397dc")
438+
@objid ("d248ec56-4352-4865-8c48-fa188e404ebd")
439439
@Override
440440
public final Object visitAssociation(Association obj) {
441441
switch (this.stName) {
@@ -453,7 +453,7 @@ public final Object visitAssociation(Association obj) {
453453
* <p>If null is returned the caller will return null.
454454
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
455455
*/
456-
@objid ("198ecb79-8cf6-47d4-b290-37ea070c824e")
456+
@objid ("22985b43-b6e1-4407-b839-a00e03cea370")
457457
@Override
458458
public IInfrastructureVisitor getInfrastructureVisitor() {
459459
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 18/09/2024 12:38 by Modelio Studio.
5+
* This file was generated on 18/09/2024 13:03 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 ("fa9f5271-439a-45f0-ba82-01fb47160215")
43+
@objid ("e71b2d81-023d-4ae3-a9d7-fef4a8335508")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("010f108b-8ed6-499c-ae2f-c06352c67231")
49+
@objid ("25c439c9-e394-4594-b65c-43a559cb0f50")
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 ("f2695664-14aa-4238-88bf-eba884f53fc2")
59+
@objid ("47ec9d12-03ae-4e79-a59b-7a6906f588d8")
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 ("b6c8308b-b33a-4577-9c4d-42954030fea5")
69+
@objid ("ddeccfcf-4aca-410a-bc44-58bfd8466ad9")
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 ("f0952800-0365-4a1c-8b2b-8f050e763375")
83+
@objid ("a740f3ff-bc4f-4205-bb7f-7e0225efd9d9")
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 ("6e1e563b-bfb1-47d8-82d4-af7f86fee163")
96+
@objid ("0e497c63-cff8-4f3c-946d-eb1e93f9b615")
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 ("3387cbbe-17fe-4058-a59c-22a50cf4ae03")
104+
@objid ("ad02dd4c-12ff-4b66-af7a-3921dbe4ecff")
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 ("8ebb6d51-790c-4091-859f-64b821150554")
124+
@objid ("60e89067-656a-48bd-9c8a-088753658208")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("0e0d4491-b21e-4fdf-b5f0-81ccc4b313cb")
129+
@objid ("e4cec8c9-fe0a-41e8-b6cd-ecc25933144d")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("9b2e382d-d098-432f-a5b9-f7b63ed183c4")
136+
@objid ("6191acb8-9cec-4d4b-aa39-034825588178")
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 ("87b243d8-3fd4-49b5-b14d-17f9edbab7e4")
143+
@objid ("cc52d1ff-f177-40b1-88ab-e8da06729826")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("57560616-a420-4882-b28c-df3ada638978")
146+
@objid ("166ab64a-ca1e-44b3-8135-3974d3959fa5")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("d4d39c53-7c96-4689-abd9-aa8965f59959")
149+
@objid ("8c514fea-e779-4aa5-a602-300f33782c46")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("2a392925-204f-4a68-93d3-7129f0077f46")
152+
@objid ("c9a2785d-2420-4a20-b464-6c526c4d9bb2")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)