Skip to content

Commit 10cd63c

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
added "members" in removeMembers in Tgroup api
1 parent 89922c9 commit 10cd63c

File tree

102 files changed

+2363
-1998
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

+2363
-1998
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
<Icon path=""/>
333333
<Image path=""/>
334334
</Stereotype>
335-
<Stereotype name="TCapabilityDefinition" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TCapabilityDefinition.label" uid="92f8cb40-9498-4759-9c75-6b4df72de355" is-abstract="false">
335+
<Stereotype name="TCapabilityDefinition" metaclass="Standard.Attribute" owner-stereotype="" is-hidden="false" label="%stereotype.TCapabilityDefinition.label" uid="92f8cb40-9498-4759-9c75-6b4df72de355" is-abstract="false">
336336
<Icon path="res/icon/gui/capabilityDefinition24.png"/>
337337
<Image path="res/icon/gui/capabilityDefinition48.png"/>
338338
<PropertyTable id="TCapabilityDefinitionTable" label="%propertytable.TCapabilityDefinitionTable.label" uid="e2b2d181-f6b2-4a51-81dc-df962e137ef2">
@@ -1025,7 +1025,7 @@
10251025
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#TCapabilityDefinitionsType"/>
10261026
<Handler class="Box">
10271027
<HParameter name="stereotype" value="ToscaDesigner#TCapabilityDefinition"/>
1028-
<HParameter name="metaclass" value="Standard.Class"/>
1028+
<HParameter name="metaclass" value="Standard.Attribute"/>
10291029
<HParameter name="name" value="Capability"/>
10301030
</Handler>
10311031
</Tool>

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

11 Bytes
Binary file not shown.

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,16 @@
124124
*/
125125
@objid ("f96166f4-8706-4930-8397-6424c7b3f767")
126126
public class ToscaDesignerProxyFactory {
127-
@objid ("0e5c2de7-78c6-43d7-9169-ab8f46236da8")
127+
@objid ("65360487-e196-4740-9bd0-15f05a67e5ff")
128128
private static final String ASSETNAME = "ToscaDesigner";
129129

130-
@objid ("ab9b8416-fa52-41f5-90c8-16748dc8f75b")
130+
@objid ("a9948eb5-5dc5-4c82-b2e2-1232c6931e5d")
131131
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
132132

133133
/**
134134
* @param session The modeling session this factory is operating in.
135135
*/
136-
@objid ("1ea15427-364a-48bf-b81c-bb2040e5eb25")
136+
@objid ("b2c6dbbc-1d1e-4725-a896-2ff467b29b45")
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);
@@ -235,7 +235,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
235235
* @param e A model element
236236
* @return the right proxy or <i>null</i>.
237237
*/
238-
@objid ("e525db8f-ca44-47a7-b8b8-33681fbf31a6")
238+
@objid ("9e35a1e6-c035-471f-b06e-68f8d729b266")
239239
public static final Object instantiate(final ModelElement e) {
240240
for (Stereotype s : e.getExtension()) {
241241
ModuleComponent module = s.getModule();
@@ -254,23 +254,23 @@ public static final Object instantiate(final ModelElement e) {
254254
* @param stName A stereotype name.
255255
* @return the right proxy or <i>null</i>.
256256
*/
257-
@objid ("1157fa72-f8e4-45a3-89ff-84d16d248190")
257+
@objid ("bae7a250-ab43-48a1-855f-a211584c42d8")
258258
public static final Object instantiate(final Element e, final String stName) {
259259
instantiateVisitor.setStereotype(stName);
260260
return e.accept(instantiateVisitor);
261261
}
262262

263-
@objid ("0b7a51ac-1572-4903-8b59-112de52d7e84")
263+
@objid ("5da9db0c-dcc2-4388-a579-bb9b38743f90")
264264
private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor {
265-
@objid ("53ee0881-83ed-4dd2-95f5-91e46e2b5205")
265+
@objid ("aaaf212c-6be8-4033-8279-6dd1c73b4d50")
266266
private String stName;
267267

268-
@objid ("69f382c5-3c09-48d6-97e5-349c0bbe94b5")
268+
@objid ("99abebca-b68b-4ebf-8b4a-3e1de26265f1")
269269
public final void setStereotype(final String stName) {
270270
this.stName = stName;
271271
}
272272

273-
@objid ("6cd2b85d-127b-4f4e-b255-0bc03bfbc9ac")
273+
@objid ("410b9be5-a852-4309-aa4a-4549653c93c7")
274274
@Override
275275
public final Object visitAssociation(Association obj) {
276276
switch (this.stName) {
@@ -282,7 +282,7 @@ public final Object visitAssociation(Association obj) {
282282
return IDefaultModelVisitor.super.visitAssociation(obj);
283283
}
284284

285-
@objid ("ae3a95cd-de73-471e-808b-6eb14478efe0")
285+
@objid ("e1529b04-5c43-4660-a9ae-ee3f27fed814")
286286
@Override
287287
public final Object visitAttribute(Attribute obj) {
288288
switch (this.stName) {
@@ -298,7 +298,7 @@ public final Object visitAttribute(Attribute obj) {
298298
return IDefaultModelVisitor.super.visitAttribute(obj);
299299
}
300300

301-
@objid ("ab1651ed-04d1-4aaf-a7b7-94ed6b8812aa")
301+
@objid ("5ecbe1db-8e57-4e95-a2bb-233418b2419c")
302302
@Override
303303
public final Object visitPackage(Package obj) {
304304
switch (this.stName) {
@@ -311,7 +311,7 @@ public final Object visitPackage(Package obj) {
311311
return IDefaultModelVisitor.super.visitPackage(obj);
312312
}
313313

314-
@objid ("18afb1be-0492-4eb4-a725-56ce9a8237bc")
314+
@objid ("6611bde8-4d79-464e-a643-f82ad80cd28e")
315315
@Override
316316
public final Object visitAssociationEnd(AssociationEnd obj) {
317317
switch (this.stName) {
@@ -323,7 +323,7 @@ public final Object visitAssociationEnd(AssociationEnd obj) {
323323
return IDefaultModelVisitor.super.visitAssociationEnd(obj);
324324
}
325325

326-
@objid ("7381ad58-033b-4107-b2a5-c48ef70eeaf7")
326+
@objid ("c8f317c7-cf66-4138-b08d-37829d249f2f")
327327
@Override
328328
public final Object visitDataType(DataType obj) {
329329
switch (this.stName) {
@@ -336,7 +336,7 @@ public final Object visitDataType(DataType obj) {
336336
return IDefaultModelVisitor.super.visitDataType(obj);
337337
}
338338

339-
@objid ("7738bc84-b75e-433b-9f57-6144f8165934")
339+
@objid ("80b1a095-7b9d-4f41-9d22-d83339b9c11d")
340340
@Override
341341
public final Object visitClass(Class obj) {
342342
switch (this.stName) {
@@ -373,7 +373,7 @@ public final Object visitClass(Class obj) {
373373
return IDefaultModelVisitor.super.visitClass(obj);
374374
}
375375

376-
@objid ("af886196-9a46-4bf5-b347-54001d756af4")
376+
@objid ("0a70da1d-df86-468d-94d9-f9501e68c87f")
377377
@Override
378378
public final Object visitStaticDiagram(StaticDiagram obj) {
379379
switch (this.stName) {
@@ -387,7 +387,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
387387
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
388388
}
389389

390-
@objid ("3ad15760-72f9-44f4-a738-e371f4a92931")
390+
@objid ("afc85e16-d62e-492b-9704-86ca4de40850")
391391
@Override
392392
public final Object visitModelElement(ModelElement obj) {
393393
switch (this.stName) {
@@ -454,7 +454,7 @@ public final Object visitModelElement(ModelElement obj) {
454454
* <p>If null is returned the caller will return null.
455455
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
456456
*/
457-
@objid ("19184d87-5a52-4cb5-a65d-84810aa085ea")
457+
@objid ("e006591b-9cbb-4de7-86eb-f22bd5ba7758")
458458
@Override
459459
public IInfrastructureVisitor getInfrastructureVisitor() {
460460
return this;

‎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 ("6410d22d-7798-4501-8617-a7b9c2035a03")
4242
public class ServiceTemplateDiagram implements IMdaProxy {
43-
@objid ("38afe7ba-b491-4040-be8a-0c1afa19d5d8")
43+
@objid ("28bdb162-df8f-4b7d-b2f6-64b7d54971ba")
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 ("036b3717-9f9e-4ad4-9157-5dba7340723d")
50+
@objid ("aeeb95f7-a38a-464e-95d8-3fb76195e4d0")
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 ("5694ce48-6547-4808-b5bb-41ae2f24393c")
60+
@objid ("9e44be50-d709-486b-a490-b514bf7aba03")
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 ("fe64d01c-adbf-4bdd-a135-10f89967785e")
69+
@objid ("63166e6c-ec6c-44d3-ae08-765688068f7d")
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 ("b383a3f2-cff8-4d70-baa0-a92c0d915be8")
83+
@objid ("4189252a-170d-4851-a4b1-c8d00ce69da9")
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 ("74c224e5-61d3-4c6b-9f35-6b01226dfab5")
96+
@objid ("c957985c-5fad-46e6-9724-6743646f7afa")
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 ("c6931b32-95b9-4413-8ec8-4d7f28c90027")
104+
@objid ("adae0575-6211-4b5a-a4b1-2d4cb930a4a6")
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 ("92b5aa9e-219a-4719-85bf-8c1bf156b054")
124+
@objid ("6e0d25a6-c376-45c5-b372-079c2536dc63")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("f695c5b9-0a6e-4f12-8735-13d33bf8f755")
129+
@objid ("5ab1f51b-3c01-4f91-8e9d-6bf8add5eaf4")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133
}
134134

135-
@objid ("110789bf-95c0-4976-9e73-2847aff2f23e")
135+
@objid ("1fdd684f-8995-4d81-ab0c-9b2d38a4760d")
136136
protected ServiceTemplateDiagram(final StaticDiagram elt) {
137137
this.elt = elt;
138138
}
139139

140140
@objid ("f4f8acbe-52e0-4947-9cbf-c86b468b39dc")
141141
public static final class MdaTypes {
142-
@objid ("094cdc52-5f9f-449a-8b46-63a4f017214a")
142+
@objid ("4b215fcf-a854-4e54-8adf-06d541dd80be")
143143
public static Stereotype STEREOTYPE_ELT;
144144

145-
@objid ("4d252213-0961-49f6-b122-ac4793fad7c8")
145+
@objid ("7c6dd9c5-66e9-45af-9472-13b79f14d2c2")
146146
private static Stereotype MDAASSOCDEP;
147147

148-
@objid ("2888e86f-b02a-4a03-922e-bad06a3ead47")
148+
@objid ("42d2d1fe-9dc9-49dd-86ff-43dfb4f1d9eb")
149149
private static TagType MDAASSOCDEP_ROLE;
150150

151-
@objid ("e1de0f0c-2d94-414a-a823-556dc0546efe")
151+
@objid ("4f3904a5-cef8-41d2-ba8b-61f1b94b2909")
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/TopologyTemplateDiagram.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
*/
4141
@objid ("286165ac-7512-43ba-9422-87db8260929c")
4242
public class TopologyTemplateDiagram implements IMdaProxy {
43-
@objid ("60f683b5-8898-421a-b306-fdf7d91d37c1")
43+
@objid ("fd31abe1-c46f-40f1-a82c-a720aa4145ee")
4444
public static final String STEREOTYPE_NAME = "TopologyTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*
4949
*/
50-
@objid ("2df1006f-e404-4ede-8814-1a1140ea9005")
50+
@objid ("3626ea1d-295d-465f-9346-84540b5b73c5")
5151
protected final StaticDiagram elt;
5252

5353
/**
@@ -57,7 +57,7 @@ public class TopologyTemplateDiagram 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 ("aaa003e8-627e-4c75-800e-8f89d437abed")
60+
@objid ("7610ae7e-fb6b-439c-be89-24f765122d3f")
6161
public static boolean canInstantiate(final MObject elt) {
6262
return ((elt instanceof StaticDiagram) && (TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
6363
}
@@ -66,7 +66,7 @@ public static boolean canInstantiate(final MObject elt) {
6666
* Create a new {@link StaticDiagram} stereotyped << TopologyTemplateDiagram >> then instantiate a {@link TopologyTemplateDiagram} proxy.
6767
* @return a {@link TopologyTemplateDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("0f412291-5963-47b6-9503-0629201daaaf")
69+
@objid ("f1fe69d4-c84d-4c94-8df4-fed94ed39273")
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 ("1d00343f-d5d8-46a3-bd06-16fd523f0028")
83+
@objid ("dc6d768e-9e31-4e98-ac03-61268fbd5057")
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
* @param obj a {@link StaticDiagram}
9494
* @return a {@link TopologyTemplateDiagram} proxy.
9595
*/
96-
@objid ("f32812a1-2b8c-41a2-a4ac-8bddff2454da")
96+
@objid ("6af8534a-1791-437e-9463-d9a043666301")
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 ("c440a01d-0313-49c9-a1a3-1d0f4b136bfd")
104+
@objid ("9a05b902-f53e-4caa-8a5f-b205aa9a0782")
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 ("ed3c3a15-c3ee-4bac-bf69-fc78c4ec5a44")
124+
@objid ("fea9c4fa-7ce7-4479-8490-9a88467a65f2")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("3e40ab3b-5ca8-4488-bd61-d63738573cf1")
129+
@objid ("0680e6de-2d17-44c3-8a04-4f4aeff33619")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133
}
134134

135-
@objid ("12168ca2-d80e-48c3-9527-390720c1fbb7")
135+
@objid ("3fcf40d4-2651-4fee-9656-24bdd2c4116c")
136136
protected TopologyTemplateDiagram(final StaticDiagram elt) {
137137
this.elt = elt;
138138
}
139139

140140
@objid ("b174b93b-03dc-4c73-8ed4-38e19e154add")
141141
public static final class MdaTypes {
142-
@objid ("12049b01-20ed-49ef-a527-bbfe0c048231")
142+
@objid ("ce735864-925f-484a-b555-4b7f0e2a30d2")
143143
public static Stereotype STEREOTYPE_ELT;
144144

145-
@objid ("404ba0be-9b6d-493c-86d7-cff52a01cbf5")
145+
@objid ("426ac113-3024-42d4-ba7a-6ba83dad3aea")
146146
private static Stereotype MDAASSOCDEP;
147147

148-
@objid ("8effc1fe-6a0b-4076-b48b-6757f567f024")
148+
@objid ("5ba85b8e-901b-4c94-a8ce-bedbf33fe581")
149149
private static TagType MDAASSOCDEP_ROLE;
150150

151-
@objid ("a4fa65e0-999b-4b54-852d-ee3011b0dca6")
151+
@objid ("c5ef18de-ae09-49a1-9f6b-46188e422006")
152152
public static void init(final IModelingSession session) throws MdaProxyException {
153153
List <MRef> missingRefs = new ArrayList<>();
154154
MRef mRef;

0 commit comments

Comments
 (0)