Skip to content

Commit 5fb575d

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
fixes
1 parent 6864021 commit 5fb575d

File tree

158 files changed

+1011
-860
lines changed

Some content is hidden

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

158 files changed

+1011
-860
lines changed

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

Lines changed: 120 additions & 162 deletions
Large diffs are not rendered by default.

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

-228 Bytes
Binary file not shown.

‎ToscaDesigner/src/main/java/fr/CreateDiagramCommand.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import org.modelio.api.module.command.standard.DiagramCreationStandardHandler;
77
import org.modelio.vcore.smkernel.mapi.MObject;
88

9-
@objid ("1ca6f8a9-f91f-447a-85ec-fe406259bc82")
9+
@objid ("ee94dac7-85af-4f31-8bc3-9e641d3a1704")
1010
public class CreateDiagramCommand extends DiagramCreationStandardHandler {
11-
@objid ("06b8f51d-2b5e-486f-9b15-ce9375cf1bd1")
11+
@objid ("07055804-ffef-4f0d-ab2e-029516cf4101")
1212
@Override
1313
public boolean accept(final List<MObject> selectedElements, final IModule module) {
1414
// Generated call to the super method will check the scope conditions defined in Studio.
@@ -20,7 +20,7 @@ public boolean accept(final List<MObject> selectedElements, final IModule module
2020
return true;
2121
}
2222

23-
@objid ("be5d3271-f668-4e2a-93df-3f1544359e80")
23+
@objid ("58c4ec31-1102-4bef-a120-2e38990c47b6")
2424
@Override
2525
protected void postConfigureElement(final MObject newDiagram, final IModule module) {
2626
// This method is a hook called once the element is created and configured and before the transaction is committed.
@@ -31,8 +31,6 @@ protected void postConfigureElement(final MObject newDiagram, final IModule modu
3131
super.postConfigureElement(newDiagram, module);
3232

3333
// TODO Add additional behavior below
34-
35-
3634
}
3735

3836
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@
6868
*/
6969
@objid ("365cd17d-2d04-4020-839d-7e7bdefdf43f")
7070
public class ToscaDesignerProxyFactory {
71-
@objid ("b29f8c73-e52c-4c4d-b38b-c9e3511160ff")
71+
@objid ("8785a548-ad4e-48ae-958e-a541125d116c")
7272
private static final String ASSETNAME = "ToscaDesigner";
7373

74-
@objid ("36d96e9c-c167-4e85-ac47-872daac584f4")
74+
@objid ("5d45285a-6bb1-4704-9e3c-6c357f3d921d")
7575
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
7676

7777
/**
7878
* @param session The modeling session this factory is operating in.
7979
*/
80-
@objid ("8ff2d2f9-0629-420e-8a75-1e852839db51")
80+
@objid ("55bffeda-0fee-4e70-b17a-5ff2bded7be2")
8181
public static final void initialize(final IModelingSession session) throws MdaProxyException {
8282
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.MdaTypes.init(session);
8383
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.MdaTypes.init(session);
@@ -125,7 +125,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
125125
* @param e A model element
126126
* @return the right proxy or <i>null</i>.
127127
*/
128-
@objid ("7fd76c98-42ef-4240-90c1-ba50640ffe53")
128+
@objid ("94353782-2c5f-4d2c-b616-1ee15da10387")
129129
public static final Object instantiate(final ModelElement e) {
130130
for (Stereotype s : e.getExtension()) {
131131
ModuleComponent module = s.getModule();
@@ -144,23 +144,23 @@ public static final Object instantiate(final ModelElement e) {
144144
* @param stName A stereotype name.
145145
* @return the right proxy or <i>null</i>.
146146
*/
147-
@objid ("087a2fe9-9ca8-4bc2-b8d4-a824e3f543f2")
147+
@objid ("9a2bf4fb-99dc-4955-87e6-0ad956f13b58")
148148
public static final Object instantiate(final Element e, final String stName) {
149149
instantiateVisitor.setStereotype(stName);
150150
return e.accept(instantiateVisitor);
151151
}
152152

153-
@objid ("1d18b186-91d3-44f5-ab81-e4c9ca13ae4c")
153+
@objid ("38941d83-49a6-4bb0-9ef9-63250e6113dc")
154154
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
155-
@objid ("9cbc7480-01df-4b36-b875-7e1ddeb2bb78")
155+
@objid ("65840f5c-554b-427e-a1d3-2eab8f98ca19")
156156
private String stName;
157157

158-
@objid ("97a8a0c7-10eb-4665-aa02-f626f984c906")
158+
@objid ("5c5b7f63-2b18-4de9-9870-2b4ba3fb6cfb")
159159
public final void setStereotype(final String stName) {
160160
this.stName = stName;
161161
}
162162

163-
@objid ("8427d151-945b-4026-91d4-1074a522eb44")
163+
@objid ("1a449d3d-877e-47df-994f-aee560befe9b")
164164
@Override
165165
public final Object visitAssociation(Association obj) {
166166
switch (this.stName) {
@@ -172,7 +172,7 @@ public final Object visitAssociation(Association obj) {
172172
return IDefaultModelVisitor.super.visitAssociation(obj);
173173
}
174174

175-
@objid ("e89532f7-24a1-4e30-a081-c1b48493475f")
175+
@objid ("eb05faa8-7032-4459-a84c-00ce5f32fb35")
176176
@Override
177177
public final Object visitPackage(Package obj) {
178178
switch (this.stName) {
@@ -184,7 +184,7 @@ public final Object visitPackage(Package obj) {
184184
return IDefaultModelVisitor.super.visitPackage(obj);
185185
}
186186

187-
@objid ("5e0f96bd-7cf2-4286-9fb4-a51de290fd58")
187+
@objid ("55004d1c-9c2f-4ff8-9ccd-4375aad7452b")
188188
@Override
189189
public final Object visitDataType(DataType obj) {
190190
switch (this.stName) {
@@ -198,7 +198,7 @@ public final Object visitDataType(DataType obj) {
198198
return IDefaultModelVisitor.super.visitDataType(obj);
199199
}
200200

201-
@objid ("36d774a6-9b5a-4ef7-a58f-0d78cf5fba78")
201+
@objid ("ed41c4d4-da73-494e-9bff-d555e0aa48ef")
202202
@Override
203203
public final Object visitClass(Class obj) {
204204
switch (this.stName) {
@@ -236,7 +236,7 @@ public final Object visitClass(Class obj) {
236236
return IDefaultModelVisitor.super.visitClass(obj);
237237
}
238238

239-
@objid ("97e17b65-b624-4691-8f0b-73f82f590257")
239+
@objid ("93dd0f83-62aa-4352-9ef1-426faf857a7a")
240240
@Override
241241
public final Object visitStaticDiagram(StaticDiagram obj) {
242242
switch (this.stName) {
@@ -250,7 +250,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
250250
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
251251
}
252252

253-
@objid ("586ac0e5-5914-44d2-8f0a-fafb57f1e23b")
253+
@objid ("bf179841-bbe4-47c8-b0f7-cb1fc6b64c5b")
254254
@Override
255255
public final Object visitModelElement(ModelElement obj) {
256256
switch (this.stName) {
@@ -268,7 +268,7 @@ public final Object visitModelElement(ModelElement obj) {
268268
* <p>If null is returned the caller will return null.
269269
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
270270
*/
271-
@objid ("42d74501-6571-4fea-b4ae-c5a10a8f12f6")
271+
@objid ("b362d271-0ca0-49a6-afae-d52e7c50f5eb")
272272
@Override
273273
public IInfrastructureVisitor getInfrastructureVisitor() {
274274
return this;

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/automatic/standard/staticdiagram/CloudServiceArchiveDiagram.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
*/
4141
@objid ("14644635-a422-47d2-a521-6f92f8f4c732")
4242
public class CloudServiceArchiveDiagram implements IMdaProxy {
43-
@objid ("2e95956e-3b09-41cc-b73a-0621c00d0f5d")
43+
@objid ("e6ed4c0d-a3b3-45ae-a573-c71052e5c139")
4444
public static final String STEREOTYPE_NAME = "CloudServiceArchiveDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*
4949
*/
50-
@objid ("969e0a3e-c105-4aeb-a1de-1052619773a7")
50+
@objid ("d46930bc-758c-4388-a27d-aecdde7d542c")
5151
protected final StaticDiagram elt;
5252

5353
/**
@@ -57,7 +57,7 @@ public class CloudServiceArchiveDiagram implements IMdaProxy {
5757
* @param elt a model object
5858
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
5959
*/
60-
@objid ("e67db89c-ec33-45bd-96ec-dea8d4010b55")
60+
@objid ("088e68b7-59a5-4070-9df7-85138304770a")
6161
public static boolean canInstantiate(final MObject elt) {
6262
return ((elt instanceof StaticDiagram) && (CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT));
6363
}
@@ -66,7 +66,7 @@ public static boolean canInstantiate(final MObject elt) {
6666
* Create a new {@link StaticDiagram} stereotyped << CloudServiceArchiveDiagram >> then instantiate a {@link CloudServiceArchiveDiagram} proxy.
6767
* @return a {@link CloudServiceArchiveDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("33766d12-505a-4ad4-942a-0efeddbb0a3d")
69+
@objid ("6fddd832-e404-4d11-8558-332b04125904")
7070
public static CloudServiceArchiveDiagram create(final IModelingSession session) {
7171
ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
7272
e.getExtension().add(CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static CloudServiceArchiveDiagram create(final IModelingSession session)
8080
* @param obj a StaticDiagram
8181
* @return a {@link CloudServiceArchiveDiagram} proxy or <i>null</i>.
8282
*/
83-
@objid ("085392c7-3a42-4200-ad4a-71d3a81d8cc5")
83+
@objid ("4b52d290-a669-41ea-b7c5-e0f6399fb366")
8484
public static CloudServiceArchiveDiagram instantiate(final StaticDiagram obj) {
8585
return CloudServiceArchiveDiagram.canInstantiate(obj) ? new CloudServiceArchiveDiagram(obj) : null;
8686
}
@@ -93,15 +93,15 @@ public static CloudServiceArchiveDiagram instantiate(final StaticDiagram obj) {
9393
* @param obj a {@link StaticDiagram}
9494
* @return a {@link CloudServiceArchiveDiagram} proxy.
9595
*/
96-
@objid ("9fe305e4-116f-4c6d-a1ea-a720b84ed233")
96+
@objid ("92a92062-7b25-4348-8981-e27ad7a79017")
9797
public static CloudServiceArchiveDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
9898
if (CloudServiceArchiveDiagram.canInstantiate(obj))
9999
return new CloudServiceArchiveDiagram(obj);
100100
else
101101
throw new IllegalArgumentException("CloudServiceArchiveDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
102102
}
103103

104-
@objid ("19e38764-141b-40bc-a5af-3d99a20aec15")
104+
@objid ("10e3160d-68fa-4efb-bf8c-5f4e2e96092e")
105105
@Override
106106
public boolean equals(final Object obj) {
107107
if (this == obj) {
@@ -121,34 +121,34 @@ 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 ("6341bcc5-6e32-4166-bcfa-c28727d97e70")
124+
@objid ("1b157bef-46f2-4af3-9804-6b39536565e0")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("5e6f6d10-a8e9-4140-b902-c136943d3191")
129+
@objid ("2a736f3b-f53f-4e0b-a727-22391b0e959a")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133
}
134134

135-
@objid ("c9830b15-8934-48e9-9fef-43fffec5ec30")
135+
@objid ("0bb13038-0f58-46e8-ab4e-7abefd4605cb")
136136
protected CloudServiceArchiveDiagram(final StaticDiagram elt) {
137137
this.elt = elt;
138138
}
139139

140140
@objid ("f9b8aa63-12e2-456c-a0b9-3c670d965b7a")
141141
public static final class MdaTypes {
142-
@objid ("6f046e49-2dc5-4dce-8292-d789756bc442")
142+
@objid ("345a13b7-0308-4a2f-bc23-9ee3ee3521d6")
143143
public static Stereotype STEREOTYPE_ELT;
144144

145-
@objid ("0c9e81b7-68b9-48d5-8c4a-fd1a24017e8a")
145+
@objid ("9fde3ba8-b7c2-4e04-b72b-ba56001ff178")
146146
private static Stereotype MDAASSOCDEP;
147147

148-
@objid ("a6f920b7-30fc-4be1-b15e-35e4178fce20")
148+
@objid ("18a3b15c-c29d-40f6-b65f-1dbcf4806dc7")
149149
private static TagType MDAASSOCDEP_ROLE;
150150

151-
@objid ("3729c1c9-9d25-47a1-8d7c-76e3887cc80c")
151+
@objid ("a1829755-3553-4dac-a612-9341909a8e1d")
152152
public static void init(final IModelingSession session) throws MdaProxyException {
153153
List <MRef> missingRefs = new ArrayList<>();
154154
MRef mRef;

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/automatic/standard/staticdiagram/ServiceTemplateDiagram.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
*/
4141
@objid ("9d4da9ca-2131-444a-a6d6-b665a5bed195")
4242
public class ServiceTemplateDiagram implements IMdaProxy {
43-
@objid ("a058b6ec-ba6a-4550-99d1-da37f7a5913a")
43+
@objid ("21a0ec94-4aee-40bf-a2db-024b65c6b54e")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*
4949
*/
50-
@objid ("c6c8fa2a-136f-43fe-9ba2-f6d9aa86893b")
50+
@objid ("cf7fd625-c2d7-4ab3-98b5-1e73d7fb9887")
5151
protected final StaticDiagram elt;
5252

5353
/**
@@ -57,7 +57,7 @@ public class ServiceTemplateDiagram implements IMdaProxy {
5757
* @param elt a model object
5858
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
5959
*/
60-
@objid ("2c2f0145-084f-4ea4-9f89-4ad1d8a04e28")
60+
@objid ("94317c6d-6804-4088-9820-30c7170d473c")
6161
public static boolean canInstantiate(final MObject elt) {
6262
return ((elt instanceof StaticDiagram) && (ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
6363
}
@@ -66,7 +66,7 @@ public static boolean canInstantiate(final MObject elt) {
6666
* Create a new {@link StaticDiagram} stereotyped << ServiceTemplateDiagram >> then instantiate a {@link ServiceTemplateDiagram} proxy.
6767
* @return a {@link ServiceTemplateDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("94a4d374-2ea5-44a1-bce2-ef5ab727ce40")
69+
@objid ("1c08aae1-18b8-4b67-b7a1-fe37cb93a494")
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 ("e5663687-3dc2-43ae-9ad1-d7f74db0cb79")
83+
@objid ("19719dae-94ec-4f58-85a0-62b927c76e6a")
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
* @param obj a {@link StaticDiagram}
9494
* @return a {@link ServiceTemplateDiagram} proxy.
9595
*/
96-
@objid ("f47640cc-be2b-45e7-a3f3-bec8bab2b5f8")
96+
@objid ("8f91e285-9f29-4120-b2dd-22af1055f32f")
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 ("c48bb448-1336-4727-a18f-49772f9fb5d9")
104+
@objid ("5ba12858-e8f5-4f53-a4d5-1b2bac37136f")
105105
@Override
106106
public boolean equals(final Object obj) {
107107
if (this == obj) {
@@ -121,34 +121,34 @@ 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 ("5fc40c1d-e858-44a3-b76e-07ef5f87171b")
124+
@objid ("1c5e86b4-5e6e-497a-81eb-d0064bf465f0")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("366c6bdd-7fdb-4830-80dc-5be6014f7ca4")
129+
@objid ("aef99d38-015b-4d5f-b7c4-d3efc76d7d36")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133
}
134134

135-
@objid ("f8eb4bde-31c2-418d-8a3b-f3dd55ad3bc6")
135+
@objid ("1792f4c6-34b5-4a78-99f4-99f94550b187")
136136
protected ServiceTemplateDiagram(final StaticDiagram elt) {
137137
this.elt = elt;
138138
}
139139

140140
@objid ("08ba1b65-2498-47f4-8559-0403208b2c52")
141141
public static final class MdaTypes {
142-
@objid ("5ffb2f41-ef2e-474e-9577-4eb98a4ad38c")
142+
@objid ("86c501f4-cb66-4e1d-84f5-f8a7d8754f2b")
143143
public static Stereotype STEREOTYPE_ELT;
144144

145-
@objid ("fd91fa15-3b33-4a06-8bb2-8bd4a923a59c")
145+
@objid ("c4681250-720d-4302-b8b5-3555b86b57eb")
146146
private static Stereotype MDAASSOCDEP;
147147

148-
@objid ("ed1ec392-8b62-4ff3-859d-9c10a1ac044c")
148+
@objid ("e24f1504-0ec3-4b5b-b0d4-f82b60801935")
149149
private static TagType MDAASSOCDEP_ROLE;
150150

151-
@objid ("927d83ae-a21a-4827-ade6-13d104f1dfa4")
151+
@objid ("9c11ebe5-38e1-41c1-af4b-c73c55ade808")
152152
public static void init(final IModelingSession session) throws MdaProxyException {
153153
List <MRef> missingRefs = new ArrayList<>();
154154
MRef mRef;

0 commit comments

Comments
 (0)