Skip to content

Commit 2f18880

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
TDeploymentArtifact: artifactType from sting to TArtifactType
1 parent d565e10 commit 2f18880

File tree

99 files changed

+2169
-2146
lines changed

Some content is hidden

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

99 files changed

+2169
-2146
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ propertydefinition.TDeploymentArtifactTable.file.description=
165165
propertydefinition.TDeploymentArtifactTable.file.label=file
166166
propertydefinition.TDeploymentArtifactTable.repository.description=
167167
propertydefinition.TDeploymentArtifactTable.repository.label=repository
168-
propertydefinition.TDeploymentArtifactTable.type.description=
169-
propertydefinition.TDeploymentArtifactTable.type.label=type
170168
propertydefinition.TDocumentationTable.any.description=
171169
propertydefinition.TDocumentationTable.any.label=any
172170
propertydefinition.TDocumentationTable.lang.description=

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,6 @@
494494
<Icon path="res/icon/gui/deploymentArtifact24.png"/>
495495
<Image path="res/icon/gui/deploymentArtifact48.png"/>
496496
<PropertyTable id="TDeploymentArtifactTable" label="%propertytable.TDeploymentArtifactTable.label" uid="e1a47f10-7786-44c4-b602-5f8eb918638d">
497-
<PropertyDefinition id="type" label="%propertydefinition.TDeploymentArtifactTable.type.label" default-value="" is-editable="true" uid="11b2ec8c-7e88-4012-b051-c5ff3843b3d7">
498-
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
499-
<Description>%propertydefinition.TDeploymentArtifactTable.type.description</Description>
500-
</PropertyDefinition>
501497
<PropertyDefinition id="file" label="%propertydefinition.TDeploymentArtifactTable.file.label" default-value="" is-editable="true" uid="7acf9bc4-9dc3-4663-8355-4368413f2578">
502498
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
503499
<Description>%propertydefinition.TDeploymentArtifactTable.file.description</Description>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ propertydefinition.TDeploymentArtifactTable.file.description=
165165
propertydefinition.TDeploymentArtifactTable.file.label=file
166166
propertydefinition.TDeploymentArtifactTable.repository.description=
167167
propertydefinition.TDeploymentArtifactTable.repository.label=repository
168-
propertydefinition.TDeploymentArtifactTable.type.description=
169-
propertydefinition.TDeploymentArtifactTable.type.label=type
170168
propertydefinition.TDocumentationTable.any.description=
171169
propertydefinition.TDocumentationTable.any.label=any
172170
propertydefinition.TDocumentationTable.lang.description=

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

67 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.0.1
44
5-
* This file was generated on 17/02/2025 18:02 by Modelio Studio.
5+
* This file was generated on 18/02/2025 10:30 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 ("1dcd93e4-d958-49dd-a257-8d3aa85e8221")
129+
@objid ("34f6e2a5-3f7e-498d-a723-38e49c5a0fdf")
130130
private static final String ASSETNAME = "ToscaDesigner";
131131

132-
@objid ("4856371a-dcb7-4cc7-8182-e2cdac8c85f0")
132+
@objid ("a933e47e-b46d-476a-86f2-977f62e9556c")
133133
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
134134

135135
/**
136136
* @param session The modeling session this factory is operating in.
137137
*/
138-
@objid ("457c3179-f752-4f0b-8226-69cc8c8bf969")
138+
@objid ("0111a3dc-7f11-4528-bb94-7fff1318b7ae")
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 ("3fa1d786-d0b6-4a3c-94d7-4a50b7a46713")
244+
@objid ("373fc310-c94c-4ba7-bb70-0034f9d046c8")
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 ("9fa912ba-7cc5-4976-a57b-efb03fc1814b")
264+
@objid ("306b4856-903a-4a9a-84e3-4a56ac8863ce")
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 ("e24ba44e-864e-478f-95fe-a9e8eaa7e107")
270+
@objid ("3412278d-540e-4001-a963-6c82e321f4ed")
271271
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
272-
@objid ("aa11b52c-b416-4440-bff4-a8374b6811b8")
272+
@objid ("93d34190-8e31-4941-b54f-4f632e25e8f5")
273273
private String stName;
274274

275-
@objid ("3954763c-29c5-4b2c-a201-187de41683f0")
275+
@objid ("b3cb4a12-0166-44e4-90a0-b79a6b917164")
276276
public final void setStereotype(final String stName) {
277277
this.stName = stName;
278278
}
279279

280-
@objid ("8e8c9082-7adf-453c-977f-5e243495e00b")
280+
@objid ("0d4d755e-df22-455b-a0ae-c4c281a77035")
281281
@Override
282282
public final Object visitAssociation(Association obj) {
283283
switch (this.stName) {
@@ -290,7 +290,7 @@ public final Object visitAssociation(Association obj) {
290290

291291
}
292292

293-
@objid ("a960b119-40ba-49a6-9737-aa30c1e447c4")
293+
@objid ("58e5a09c-92bd-4105-9178-9d22d1508c5f")
294294
@Override
295295
public final Object visitAttribute(Attribute obj) {
296296
switch (this.stName) {
@@ -305,7 +305,7 @@ public final Object visitAttribute(Attribute obj) {
305305

306306
}
307307

308-
@objid ("000e45b0-7eca-470b-b7b7-c6bfc99b3c81")
308+
@objid ("d93164f8-000c-41c1-b2dc-731a0f852531")
309309
@Override
310310
public final Object visitPackage(Package obj) {
311311
switch (this.stName) {
@@ -320,7 +320,7 @@ public final Object visitPackage(Package obj) {
320320

321321
}
322322

323-
@objid ("ca1e7cc0-db89-4d13-931a-8c0450ec728b")
323+
@objid ("67433f3c-6ca4-4605-8be2-4f1938a376e0")
324324
@Override
325325
public final Object visitAssociationEnd(AssociationEnd obj) {
326326
switch (this.stName) {
@@ -333,7 +333,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
333333

334334
}
335335

336-
@objid ("8e22ed0e-26a0-46ae-bfb9-57bc7265f519")
336+
@objid ("cf0bb4b3-ce56-4f35-ac8b-52a2a0d3c4c3")
337337
@Override
338338
public final Object visitDataType(DataType obj) {
339339
switch (this.stName) {
@@ -347,7 +347,7 @@ public final Object visitDataType(DataType obj) {
347347

348348
}
349349

350-
@objid ("ba0153af-43ff-4992-9aff-666b8f887d8b")
350+
@objid ("1297a1ea-f058-49f5-8e1a-8d384071f9c9")
351351
@Override
352352
public final Object visitClass(Class obj) {
353353
switch (this.stName) {
@@ -388,7 +388,7 @@ public final Object visitClass(Class obj) {
388388

389389
}
390390

391-
@objid ("73b71efa-c4e7-4f46-a57f-e03a7f36a95d")
391+
@objid ("3c6a9acf-e0ca-4839-897e-6ff954d7ebd8")
392392
@Override
393393
public final Object visitStaticDiagram(StaticDiagram obj) {
394394
switch (this.stName) {
@@ -403,7 +403,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
403403

404404
}
405405

406-
@objid ("d7d49f8d-1f7f-44da-9c5f-89c9c1e47ae7")
406+
@objid ("d3c0e4be-9a6e-45d3-ade4-77e4de41e021")
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 ("35ff7b54-aab4-4865-a765-aaa94bcdf72a")
474+
@objid ("0e7d6a26-7833-4a28-8b23-2608aaa37efa")
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.0.1
44
5-
* This file was generated on 17/02/2025 18:02 by Modelio Studio.
5+
* This file was generated on 18/02/2025 10:30 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 ("04762a51-c997-44a9-83df-d45a82b91ff3")
43+
@objid ("738e8a7a-e0a0-44fa-9a26-07641d5c9cd5")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("28441f6b-ac9d-4ea0-97a1-02ff5954d1ca")
49+
@objid ("60eaee9a-fd49-4638-bc31-db11042302ae")
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 ("f4ab80f5-c961-4a75-9555-b4e60e3e1d10")
59+
@objid ("2956928e-c643-47c4-87d9-c9cd0c612144")
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 ("23e90bf8-a37f-4507-a25c-2a9557636062")
69+
@objid ("0b052a4f-0470-495c-9102-1665e87dc3f0")
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 ("8a007889-f31f-4fef-8aff-a67f3fd20b8d")
83+
@objid ("f72c63d6-c4fe-4316-baa6-b0cf2d65a615")
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 ("f8817348-af74-4793-9ee5-f11c4ba7c558")
96+
@objid ("ba91e9aa-f32a-4451-89eb-79e54b3f799a")
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 ("e1034e73-1528-4756-9133-549a6a6e9c72")
104+
@objid ("0d736343-2468-418d-9a0c-ed80d38a05bb")
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 ("242690af-23e0-4b45-9aa0-562d3129ac6f")
124+
@objid ("c4ca918b-c7e1-4968-8742-7ff6bc238c2b")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("0925bb5b-224e-454c-a599-cf608e3989f0")
129+
@objid ("a39ed264-4201-4c9d-b34a-ed63c5d0d2ec")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("9d1209cb-d726-4a43-85ae-d4810da30416")
136+
@objid ("0959c39a-7646-4657-b540-3c45bf53a5af")
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 ("71f15e24-d7e3-42b1-a070-e808faf1553e")
143+
@objid ("68418bf0-e183-4cb5-b6c8-6fd654981f56")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("dc893ba4-1bb8-4f4e-8667-b35878aaea40")
146+
@objid ("9b3e0d1e-8235-499b-a746-5a44cc4fc1ab")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("378c4e41-0d6d-44b2-af1f-0db8b6c5d7e4")
149+
@objid ("6d94c9c1-561e-4cd2-bbeb-7bc969f87af6")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("b1c16a24-23b4-44fc-9dbc-4310613c0014")
152+
@objid ("30e6c91d-893e-4daf-9ce7-7f1be0472b9e")
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.0.1
44
5-
* This file was generated on 17/02/2025 18:02 by Modelio Studio.
5+
* This file was generated on 18/02/2025 10:30 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 ("8e592721-c7f3-4ef3-9836-8f6c911c7fd3")
43+
@objid ("94a3ff79-2414-4223-be3e-a89502c5762d")
4444
public static final String STEREOTYPE_NAME = "TopologyTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("ef79a52d-2282-40ee-95e4-6a74b230784b")
49+
@objid ("81ee9e2b-f81c-4536-95e4-bf61c1172482")
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 ("8f84fa6e-fc6d-4579-a156-46629807b4c4")
59+
@objid ("17b70251-4b40-43bf-b6a6-590818292776")
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 ("05a0da51-b614-4600-80a1-a4f5f13373af")
69+
@objid ("b5524cd2-a0b8-4ae0-959e-f710df80e2d9")
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 ("c2d2eb58-5604-49ed-b256-989e4d22bf68")
83+
@objid ("e576ceb4-020f-4cd8-9816-859fd52c16eb")
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 ("650c4b25-e8e0-488d-8d73-44e57286722c")
96+
@objid ("b1de92c3-276f-4c9c-a638-95ccf4c936c7")
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 ("8e386b7b-aab4-4d8b-b962-7a7bff4885b9")
104+
@objid ("d200eb0b-c95a-463c-95a6-9f1c3c884500")
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 ("0975831a-c3f4-4a5f-ac71-0a8c70871f94")
124+
@objid ("aab25a70-f635-49a5-a0cd-2daf3a042f8e")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("329239a8-7c55-4f7d-a2d3-2a57eb98b95a")
129+
@objid ("a373abbb-8621-44b7-bde8-33e49f19345c")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("b0c9fda6-61b4-4e54-972b-5909bd047f4b")
136+
@objid ("a0503d8c-893b-4306-a71d-e767e5820529")
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 ("b4f53eb6-aa6e-433d-b04e-dd94f9ebec0a")
143+
@objid ("b212e07d-0c42-4e84-9644-a5c987736ef7")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("cbe629cf-da53-4bbe-b35d-50f1cab30ad0")
146+
@objid ("dccaa58a-0569-4f8d-aac2-099a73bfe5c7")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("1ce85397-9a4c-4998-b1d0-2360d419f5ee")
149+
@objid ("36d7d5d0-9cc1-4ed2-aae7-6b1941ef3194")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("1a475036-719d-439c-adc4-a30324ca3928")
152+
@objid ("094cf872-978f-4102-8256-62a3fcb54042")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)