Skip to content

Commit 4d2b44b

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
«TPolicy» and «TRequirement» from Attribute to Class + TpolicyType "derivedFrom" attribute added
1 parent e131876 commit 4d2b44b

File tree

102 files changed

+2161
-2137
lines changed

Some content is hidden

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

102 files changed

+2161
-2137
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@
763763
</PropertyDefinition>
764764
</PropertyTable>
765765
</Stereotype>
766-
<Stereotype name="TPolicy" metaclass="Standard.Attribute" owner-stereotype="" is-hidden="false" label="%stereotype.TPolicy.label" uid="afe2c9ed-9fab-4a53-a2d2-b52d849d0799" is-abstract="false">
766+
<Stereotype name="TPolicy" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TPolicy.label" uid="afe2c9ed-9fab-4a53-a2d2-b52d849d0799" is-abstract="false">
767767
<Icon path="res/icon/gui/tpolicy24.ICON.png"/>
768768
<Image path="res/icon/gui/tpolicy48.IMAGE.png"/>
769769
<PropertyTable id="TPolicyTable" label="%propertytable.TPolicyTable.label" uid="ca3978f9-9ac6-4b7b-8785-a9d502a40e86">
@@ -835,11 +835,11 @@
835835
</PropertyDefinition>
836836
</PropertyTable>
837837
</Stereotype>
838-
<Stereotype name="TRequirement" metaclass="Standard.Attribute" owner-stereotype="" is-hidden="false" label="%stereotype.TRequirement.label" uid="f0ddd3c2-c7ec-4156-84b0-d31b76098b17" is-abstract="false">
838+
<Stereotype name="TRequirement" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TRequirement.label" uid="f0ddd3c2-c7ec-4156-84b0-d31b76098b17" is-abstract="false">
839839
<Icon path="res/icon/gui/requirements2-24.png"/>
840840
<Image path="res/icon/gui/requirements2-48.png"/>
841841
</Stereotype>
842-
<Stereotype name="TRequirementDefinition" metaclass="Standard.Attribute" owner-stereotype="" is-hidden="false" label="%stereotype.TRequirementDefinition.label" uid="2637c4bd-ca93-4012-82ea-8ef2ba5ca444" is-abstract="false">
842+
<Stereotype name="TRequirementDefinition" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TRequirementDefinition.label" uid="2637c4bd-ca93-4012-82ea-8ef2ba5ca444" is-abstract="false">
843843
<Icon path="res/icon/gui/requirement24.png"/>
844844
<Image path="res/icon/gui/requirement48.png"/>
845845
<PropertyTable id="TRequirementDefinitionTable" label="%propertytable.TRequirementDefinitionTable.label" uid="620d9ee4-1487-4477-9f9c-f46321456d98">
@@ -1106,7 +1106,7 @@
11061106
<Scope-source metaclass="Infrastructure.ModelElement" stereotype=""/>
11071107
<Handler class="Box">
11081108
<HParameter name="stereotype" value="ToscaDesigner#TPolicy"/>
1109-
<HParameter name="metaclass" value="Standard.Attribute"/>
1109+
<HParameter name="metaclass" value="Standard.Class"/>
11101110
<HParameter name="name" value="Policy"/>
11111111
</Handler>
11121112
</Tool>
@@ -1154,15 +1154,15 @@
11541154
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#RequirementsType"/>
11551155
<Handler class="Box">
11561156
<HParameter name="stereotype" value="ToscaDesigner#TRequirement"/>
1157-
<HParameter name="metaclass" value="Standard.Attribute"/>
1157+
<HParameter name="metaclass" value="Standard.Class"/>
11581158
<HParameter name="name" value="Requirement"/>
11591159
</Handler>
11601160
</Tool>
11611161
<Tool id="Requirement_NodeType" label="%tool.Requirement_NodeType.label" tooltip="%tool.Requirement_NodeType.tooltip" image="res/icon/gui/requirement24.png">
1162-
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#TRequirementDefinitionType"/>
1162+
<Scope-source metaclass="Infrastructure.ModelElement" stereotype=""/>
11631163
<Handler class="Box">
11641164
<HParameter name="stereotype" value="ToscaDesigner#TRequirementDefinition"/>
1165-
<HParameter name="metaclass" value="Standard.Attribute"/>
1165+
<HParameter name="metaclass" value="Standard.Class"/>
11661166
<HParameter name="name" value="Requirement"/>
11671167
</Handler>
11681168
</Tool>

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

-160 Bytes
Binary file not shown.

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

Lines changed: 27 additions & 27 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 25/09/2024 11:42 by Modelio Studio.
5+
* This file was generated on 10/10/2024 11:39 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -101,16 +101,16 @@
101101
* <li><< TParameter >> on a {@link org.modelio.metamodel.uml.infrastructure.ModelElement}: instantiates a {@link TParameter}
102102
* <li><< TPlan >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TPlan}
103103
* <li><< TPlans >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TPlans}
104-
* <li><< TPolicy >> on a {@link org.modelio.metamodel.uml.statik.Attribute}: instantiates a {@link TPolicy}
104+
* <li><< TPolicy >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TPolicy}
105105
* <li><< TPolicyType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TPolicyType}
106106
* <li><< TPropertyConstraint >> on a {@link org.modelio.metamodel.uml.infrastructure.ModelElement}: instantiates a {@link TPropertyConstraint}
107107
* <li><< TPropertyDef >> on a {@link org.modelio.metamodel.uml.statik.Attribute}: instantiates a {@link TPropertyDef}
108108
* <li><< TPropertyMapping >> on a {@link org.modelio.metamodel.uml.infrastructure.ModelElement}: instantiates a {@link TPropertyMapping}
109109
* <li><< TRelationshipTemplate >> on a {@link org.modelio.metamodel.uml.statik.Association}: instantiates a {@link TRelationshipTemplate}
110110
* <li><< TRelationshipTemplateEnd >> on a {@link org.modelio.metamodel.uml.statik.AssociationEnd}: instantiates a {@link TRelationshipTemplateEnd}
111111
* <li><< TRelationshipType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRelationshipType}
112-
* <li><< TRequirement >> on a {@link org.modelio.metamodel.uml.statik.Attribute}: instantiates a {@link TRequirement}
113-
* <li><< TRequirementDefinition >> on a {@link org.modelio.metamodel.uml.statik.Attribute}: instantiates a {@link TRequirementDefinition}
112+
* <li><< TRequirement >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRequirement}
113+
* <li><< TRequirementDefinition >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRequirementDefinition}
114114
* <li><< TRequirementDefinitionType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRequirementDefinitionType}
115115
* <li><< TRequirementRef >> on a {@link org.modelio.metamodel.uml.infrastructure.ModelElement}: instantiates a {@link TRequirementRef}
116116
* <li><< TServiceTemplate >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TServiceTemplate}
@@ -124,16 +124,16 @@
124124
*/
125125
@objid ("f96166f4-8706-4930-8397-6424c7b3f767")
126126
public class ToscaDesignerProxyFactory {
127-
@objid ("9ebd9149-a34e-4e71-b216-b8826e96b6a1")
127+
@objid ("4a5651bd-b716-4350-8569-27e8c67c7132")
128128
private static final String ASSETNAME = "ToscaDesigner";
129129

130-
@objid ("1723d83f-5fb3-4fb4-b2fa-5d88bd41ee4a")
130+
@objid ("0a73ea07-2fb8-4450-bbbe-34c463ae597d")
131131
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
132132

133133
/**
134134
* @param session The modeling session this factory is operating in.
135135
*/
136-
@objid ("c617de77-0b72-46f5-8d6e-41dbbda57f04")
136+
@objid ("d84abcc9-6bfa-4f58-b29a-5a231b32c185")
137137
public static final void initialize(final IModelingSession session) throws MdaProxyException {
138138
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaDiagram.MdaTypes.init(session);
139139
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
@@ -207,16 +207,16 @@ public static final void initialize(final IModelingSession session) throws MdaPr
207207
fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TParameter.MdaTypes.init(session);
208208
fr.softeam.toscadesigner.api.tosca.standard.class_.TPlan.MdaTypes.init(session);
209209
fr.softeam.toscadesigner.api.tosca.standard.class_.TPlans.MdaTypes.init(session);
210-
fr.softeam.toscadesigner.api.tosca.standard.attribute.TPolicy.MdaTypes.init(session);
210+
fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicy.MdaTypes.init(session);
211211
fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicyType.MdaTypes.init(session);
212212
fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TPropertyConstraint.MdaTypes.init(session);
213213
fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef.MdaTypes.init(session);
214214
fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TPropertyMapping.MdaTypes.init(session);
215215
fr.softeam.toscadesigner.api.tosca.standard.association.TRelationshipTemplate.MdaTypes.init(session);
216216
fr.softeam.toscadesigner.api.tosca.standard.associationend.TRelationshipTemplateEnd.MdaTypes.init(session);
217217
fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType.MdaTypes.init(session);
218-
fr.softeam.toscadesigner.api.tosca.standard.attribute.TRequirement.MdaTypes.init(session);
219-
fr.softeam.toscadesigner.api.tosca.standard.attribute.TRequirementDefinition.MdaTypes.init(session);
218+
fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement.MdaTypes.init(session);
219+
fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.MdaTypes.init(session);
220220
fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinitionType.MdaTypes.init(session);
221221
fr.softeam.toscadesigner.api.tosca.infrastructure.modelelement.TRequirementRef.MdaTypes.init(session);
222222
fr.softeam.toscadesigner.api.tosca.standard.class_.TServiceTemplate.MdaTypes.init(session);
@@ -237,7 +237,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
237237
* @param e A model element
238238
* @return the right proxy or <i>null</i>.
239239
*/
240-
@objid ("a774a3a0-4456-4aef-b928-09f1a91e21c5")
240+
@objid ("38dd74cc-a0bb-400e-bf6c-ed723a2d3965")
241241
public static final Object instantiate(final ModelElement e) {
242242
for (Stereotype s : e.getExtension()) {
243243
ModuleComponent module = s.getModule();
@@ -257,23 +257,23 @@ public static final Object instantiate(final ModelElement e) {
257257
* @param stName A stereotype name.
258258
* @return the right proxy or <i>null</i>.
259259
*/
260-
@objid ("b75a8709-52f1-4166-9d50-0cfbd7659883")
260+
@objid ("f98058bf-2cec-4a11-a7ef-1d40027d550b")
261261
public static final Object instantiate(final Element e, final String stName) {
262262
instantiateVisitor.setStereotype(stName);
263263
return e.accept(instantiateVisitor);
264264
}
265265

266-
@objid ("653be2fa-4ba2-41a4-9c63-482f34bcd671")
266+
@objid ("cc6d62f2-d6fb-4274-ab87-45934a0bc9da")
267267
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
268-
@objid ("f0df66e2-2e3b-440c-ad65-159f2b1874bc")
268+
@objid ("b6b4b945-18c9-4af6-a669-7f57d2fa4f54")
269269
private String stName;
270270

271-
@objid ("0c98fc45-f94a-4c9d-9741-2e6a11a73b9a")
271+
@objid ("822a15ac-e531-4cc6-ac94-b1c9b7a8944f")
272272
public final void setStereotype(final String stName) {
273273
this.stName = stName;
274274
}
275275

276-
@objid ("1731cf06-8681-470a-bf18-2582410fd75b")
276+
@objid ("a1072bfb-de05-4555-82be-da79c0cd4d94")
277277
@Override
278278
public final Object visitAssociation(Association obj) {
279279
switch (this.stName) {
@@ -286,7 +286,7 @@ public final Object visitAssociation(Association obj) {
286286

287287
}
288288

289-
@objid ("e3b2253a-0369-4a74-a279-9508f108cdc1")
289+
@objid ("ab3fc703-2d42-4951-be3a-d8ed15ffe8ea")
290290
@Override
291291
public final Object visitAttribute(Attribute obj) {
292292
switch (this.stName) {
@@ -295,10 +295,7 @@ public final Object visitAttribute(Attribute obj) {
295295
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TCapabilityDefinition.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TCapabilityDefinition.instantiate(obj);
296296
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TCapabilityType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TCapabilityType.instantiate(obj);
297297
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TDeploymentArtifact.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TDeploymentArtifact.instantiate(obj);
298-
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TPolicy.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TPolicy.instantiate(obj);
299298
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TPropertyDef.instantiate(obj);
300-
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TRequirement.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TRequirement.instantiate(obj);
301-
case fr.softeam.toscadesigner.api.tosca.standard.attribute.TRequirementDefinition.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.attribute.TRequirementDefinition.instantiate(obj);
302299
default:
303300
break;
304301
}
@@ -307,7 +304,7 @@ public final Object visitAttribute(Attribute obj) {
307304

308305
}
309306

310-
@objid ("e45bb720-abcf-4348-9240-e1f01f3a761b")
307+
@objid ("2874ca94-baa7-4f0a-b813-51ba0644fcd9")
311308
@Override
312309
public final Object visitPackage(Package obj) {
313310
switch (this.stName) {
@@ -321,7 +318,7 @@ public final Object visitPackage(Package obj) {
321318

322319
}
323320

324-
@objid ("2edc7664-bd80-4bcf-a4dd-291e351a2188")
321+
@objid ("65133af0-9fdd-4182-a1ef-05bef39930b4")
325322
@Override
326323
public final Object visitAssociationEnd(AssociationEnd obj) {
327324
switch (this.stName) {
@@ -334,7 +331,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
334331

335332
}
336333

337-
@objid ("7dfe5158-f04b-4d28-96f0-45dc5a7c2212")
334+
@objid ("3e2be0f0-7f9d-4788-b11c-87d002f38e74")
338335
@Override
339336
public final Object visitDataType(DataType obj) {
340337
switch (this.stName) {
@@ -348,7 +345,7 @@ public final Object visitDataType(DataType obj) {
348345

349346
}
350347

351-
@objid ("4620fc78-7590-4dd9-b6cd-c20cb3168d38")
348+
@objid ("1ae9663d-ae73-4d59-91b2-5382b018d6e5")
352349
@Override
353350
public final Object visitClass(Class obj) {
354351
switch (this.stName) {
@@ -368,8 +365,11 @@ public final Object visitClass(Class obj) {
368365
case fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeType.instantiate(obj);
369366
case fr.softeam.toscadesigner.api.tosca.standard.class_.TPlan.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TPlan.instantiate(obj);
370367
case fr.softeam.toscadesigner.api.tosca.standard.class_.TPlans.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TPlans.instantiate(obj);
368+
case fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicy.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicy.instantiate(obj);
371369
case fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicyType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicyType.instantiate(obj);
372370
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType.instantiate(obj);
371+
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement.instantiate(obj);
372+
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.instantiate(obj);
373373
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinitionType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinitionType.instantiate(obj);
374374
case fr.softeam.toscadesigner.api.tosca.standard.class_.TServiceTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TServiceTemplate.instantiate(obj);
375375
case fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates.instantiate(obj);
@@ -382,7 +382,7 @@ public final Object visitClass(Class obj) {
382382

383383
}
384384

385-
@objid ("488c84f6-e7b7-4d6e-af73-4fd78abdb2b9")
385+
@objid ("d44b8e19-1a92-4c23-acad-85306c607fd5")
386386
@Override
387387
public final Object visitStaticDiagram(StaticDiagram obj) {
388388
switch (this.stName) {
@@ -397,7 +397,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
397397

398398
}
399399

400-
@objid ("92ea64d3-84b4-452e-962a-0693f5de919b")
400+
@objid ("5e960fd2-f621-46db-b127-89cb7b8b7e10")
401401
@Override
402402
public final Object visitModelElement(ModelElement obj) {
403403
switch (this.stName) {
@@ -465,7 +465,7 @@ public final Object visitModelElement(ModelElement obj) {
465465
* <p>If null is returned the caller will return null.
466466
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
467467
*/
468-
@objid ("7f1777a4-d8ea-44f8-b013-41500cb2c399")
468+
@objid ("ab592ccd-3f68-41ea-88f9-05d3c2c7bc87")
469469
@Override
470470
public IInfrastructureVisitor getInfrastructureVisitor() {
471471
return this;

0 commit comments

Comments
 (0)