Skip to content

Commit b5b61a8

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Tosca Designer V2 : Capability definition : Capability type fixed
1 parent 573931b commit b5b61a8

File tree

94 files changed

+2201
-2018
lines changed

Some content is hidden

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

94 files changed

+2201
-2018
lines changed

‎ToscaDesigner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- definition -->
66
<groupId>fr.softeam</groupId>
77
<artifactId>toscadesigner</artifactId>
8-
<version>0.0.00</version>
8+
<version>0.0.1</version>
99
<name>ToscaDesigner</name>
1010
<repositories>
1111
<repository>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,8 @@
674674
<Image path=""/>
675675
</Stereotype>
676676
<Stereotype name="TInterface" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.TInterface.label" uid="7a56a78f-21b0-463d-b927-b9a3a461b565" is-abstract="false">
677-
<Icon path=""/>
678-
<Image path=""/>
677+
<Icon path="res/icon/gui/TInterface24.png"/>
678+
<Image path="res/icon/gui/TInterface48.IMAGE.png"/>
679679
<PropertyTable id="TInterfaceTable" label="%propertytable.TInterfaceTable.label" uid="204ebc96-ec6b-46d3-9f88-bcec349cadc7">
680680
<PropertyDefinition id="name" label="%propertydefinition.TInterfaceTable.name.label" default-value="" is-editable="true" uid="abc12b37-e245-4073-9a9f-ebeeb2f4426d">
681681
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
@@ -931,6 +931,10 @@
931931
<Icon path=""/>
932932
<Image path=""/>
933933
</Stereotype>
934+
<Stereotype name="Tgroup" metaclass="Standard.Package" owner-stereotype="" is-hidden="false" label="%stereotype.Tgroup.label" uid="572d5cb4-54c7-45d0-a9c8-3dc3677f9ef3" is-abstract="false">
935+
<Icon path="res/icon/gui/Tgroup48.ICON.png"/>
936+
<Image path="res/icon/gui/Tgroup48.png"/>
937+
</Stereotype>
934938
</Profile>
935939
</Profiles>
936940
<PropertyTypes>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,8 @@ stereotype.TargetElementType.description=
511511
stereotype.TargetElementType.label=TargetElementType
512512
stereotype.TargetInterfacesType.description=
513513
stereotype.TargetInterfacesType.label=TargetInterfacesType
514+
stereotype.Tgroup.description=
515+
stereotype.Tgroup.label=Tgroup
514516
stereotype.TopologyTemplateDiagram.description=
515517
stereotype.TopologyTemplateDiagram.label=TopologyTemplateDiagram
516518
stereotype.ToscaDiagram.description=

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

703 Bytes
Binary file not shown.

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

Lines changed: 67 additions & 64 deletions
Large diffs are not rendered by default.

‎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 19/09/2024 15:04 by Modelio Studio.
5+
* This file was generated on 23/09/2024 12:50 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 ("fe38c249-9326-4ddd-8d95-a49a38f0a00f")
43+
@objid ("c6b038da-6059-48a0-8c20-dd10c6724b44")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("3e80429c-6442-43ad-9f3c-14a7716365a9")
49+
@objid ("326232ce-1889-47f4-a6d1-28de20807c7b")
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 ("d405ce69-f46f-4f8d-8273-cb4ea4a6e105")
59+
@objid ("880488d8-03a2-4e7d-8114-d9cd2d648b91")
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 ("1d1cdea4-da32-4488-b3f5-7cd7ff2fe2c9")
69+
@objid ("a89f6ad4-9123-4e09-b1e1-30b17be5eddf")
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 ("78c8ef09-91a0-44db-a9ac-d7229adefd07")
83+
@objid ("755390dd-e9e1-490b-b301-84d988cf591b")
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 ("53a10f1a-09e4-4bd1-b448-03758bb92272")
96+
@objid ("353c4cb7-5720-4840-a226-d43c7486defc")
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 ("d0107ee9-998f-4bc8-ae58-539294c332c9")
104+
@objid ("f4435fa9-d11f-4b7c-8180-5317f68352ea")
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 ("dcdcf4d6-f651-4c3f-8eab-9d40ce8c7022")
124+
@objid ("f1aa02ad-bd06-4abc-b214-223c9f5b1cd1")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("de8d58da-8cef-48d3-ae19-b35fd8288469")
129+
@objid ("d3afcafa-ce28-4cc0-b344-4ef141892282")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("3fc07a64-1daf-450e-89e9-b5adc58769bc")
136+
@objid ("a931f4fa-c870-41c0-8adb-cdd40aed8b52")
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 ("d088d5bd-84b5-441b-89e4-06c5b2935506")
143+
@objid ("43d8fb96-07fd-4b76-a3b1-b84990f5cd87")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("7001b96c-f899-4f84-93b4-31e07d73870c")
146+
@objid ("7c627735-5618-4b67-b06a-2a36acb2f983")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("605c173b-7b58-4c03-951b-17a190d2ae98")
149+
@objid ("bfd502d8-5542-4a80-bb8c-6d68b67004e2")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("328443cf-f66d-489b-b132-5e34b873813d")
152+
@objid ("d5ef9bc0-86b3-40e5-9cd7-3f363a58849a")
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.00
44
5-
* This file was generated on 19/09/2024 15:04 by Modelio Studio.
5+
* This file was generated on 23/09/2024 12:50 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,13 @@
4040
*/
4141
@objid ("286165ac-7512-43ba-9422-87db8260929c")
4242
public class TopologyTemplateDiagram implements IMdaProxy {
43-
@objid ("b3b85842-cf7b-4d31-8cfe-c9e391f78e16")
43+
@objid ("6f783df9-519f-4389-a437-120760e3fea8")
4444
public static final String STEREOTYPE_NAME = "TopologyTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("1b37e489-4370-4edd-b2bf-da20c9854e3c")
49+
@objid ("f93b97c8-84ed-4d31-aa64-9bfb0e0ae6a0")
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 ("86e589f6-6422-4343-9110-147ee49016cf")
59+
@objid ("baee87a8-c7cc-4d0d-a657-aecf8bf4d70e")
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 ("0620a00f-5a16-462e-bde2-dff4e535ecac")
69+
@objid ("462cfd75-90de-4371-903c-409fd9bf28f6")
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 ("9cf7af59-3077-45fe-89dd-ee7bb9befeee")
83+
@objid ("47d30d15-73e3-490b-9d0a-6ef9e68875d7")
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 ("538c3d55-6828-4bfc-9566-aa187896345b")
96+
@objid ("4411e802-21c3-4b6c-ac21-8697eadbad34")
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 ("f5d3f27e-b458-43cd-b4e8-99014612bf01")
104+
@objid ("ecc103ec-4d82-470f-8431-c6846bb904cd")
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 ("b04f6ba3-37c2-4a9c-951b-9415f59ffc1a")
124+
@objid ("3db0c2e2-ef37-41f3-a295-e49b5feb0af0")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("3ef2fb0c-bf8d-4b10-ba61-48ffc3ca3c98")
129+
@objid ("951c1a34-f2b6-45fe-aa72-d932b08a43d6")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("1fb993ef-6b76-4e77-9fe4-97d2a122fc9c")
136+
@objid ("e51acab6-6ff0-4f7d-a924-1cbaa84a87c6")
137137
protected TopologyTemplateDiagram(final StaticDiagram elt) {
138138
this.elt = elt;
139139
}
140140

141141
@objid ("b174b93b-03dc-4c73-8ed4-38e19e154add")
142142
public static final class MdaTypes {
143-
@objid ("de2350f1-36ad-46f0-a687-8ca3cf54a114")
143+
@objid ("c1540a0d-d8a0-47a8-aa64-f47f5ab3f2d8")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("e011974c-b7ea-4ba6-bbcd-bf64aa1f5da8")
146+
@objid ("dc7fce3b-adf4-40db-be39-e98de51c4bf2")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("92106e4d-ed27-467b-bb24-3c4bb6934a22")
149+
@objid ("4180191c-6dc9-4f3b-a96a-83d63d11c4fb")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("fb5fccc3-e51d-4043-be11-0b65f9e55537")
152+
@objid ("a35f3ca8-54ab-433c-bf64-2f97af0d41d7")
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/ToscaDiagram.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 19/09/2024 15:04 by Modelio Studio.
5+
* This file was generated on 23/09/2024 12:50 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,13 @@
4040
*/
4141
@objid ("0fa85812-9761-4c3b-b08a-6477551af622")
4242
public class ToscaDiagram implements IMdaProxy {
43-
@objid ("4bfd3169-539d-43b0-af3c-689b53613fd2")
43+
@objid ("fc4ac303-410b-4704-ab2d-817a2f7c75ee")
4444
public static final String STEREOTYPE_NAME = "ToscaDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("daaabaed-88f8-4297-9947-da9e2fcb43bf")
49+
@objid ("1ec86967-7289-4c61-8a8c-7dc177f2edc5")
5050
protected final StaticDiagram elt;
5151

5252
/**
@@ -56,7 +56,7 @@ public class ToscaDiagram 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 ("ba2b97ff-d083-41f4-8fd7-987c883de9f8")
59+
@objid ("d76015a2-f064-4034-8dd0-c92d8b100e8d")
6060
public static boolean canInstantiate(final MObject elt) {
6161
return ((elt instanceof StaticDiagram) && (ToscaDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(ToscaDiagram.MdaTypes.STEREOTYPE_ELT));
6262
}
@@ -66,7 +66,7 @@ public static boolean canInstantiate(final MObject elt) {
6666
*
6767
* @return a {@link ToscaDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("8375a4cb-b91c-45b3-882a-14b07a9ba4b2")
69+
@objid ("d5e57a36-a82d-4c3b-a4aa-f5a4eb7706e0")
7070
public static ToscaDiagram create(final IModelingSession session) {
7171
ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
7272
e.getExtension().add(ToscaDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static ToscaDiagram create(final IModelingSession session) {
8080
* @param obj a StaticDiagram
8181
* @return a {@link ToscaDiagram} proxy or <i>null</i>.
8282
*/
83-
@objid ("c0bab825-1f0e-4f3a-9de7-ecd81dd9c6ea")
83+
@objid ("3f94b915-0d21-4eb4-a441-9fa58601518d")
8484
public static ToscaDiagram instantiate(final StaticDiagram obj) {
8585
return ToscaDiagram.canInstantiate(obj) ? new ToscaDiagram(obj) : null;
8686
}
@@ -93,15 +93,15 @@ public static ToscaDiagram instantiate(final StaticDiagram obj) {
9393
* @return a {@link ToscaDiagram} proxy.
9494
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9595
*/
96-
@objid ("644aa1ac-9c05-47e7-abcd-71e55a86362f")
96+
@objid ("e519b5d2-b8b1-40ab-a35b-0e85e852a428")
9797
public static ToscaDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
9898
if (ToscaDiagram.canInstantiate(obj))
9999
return new ToscaDiagram(obj);
100100
else
101101
throw new IllegalArgumentException("ToscaDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
102102
}
103103

104-
@objid ("9cfed2e2-e021-474e-a871-8c80f469be8c")
104+
@objid ("b183be43-3a31-4b6d-8076-3cd8167e9112")
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 ("f464750f-bf3e-494e-b46b-3ca0c97583af")
124+
@objid ("8212cb03-ed44-4358-b933-986c18e8d1b3")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("4fb4e18b-a080-494e-b51e-ee1966266a5d")
129+
@objid ("d2c36cbc-887e-44ac-b4cf-b88da85f67c1")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("dc15221a-72aa-4d8d-afe9-b924644af24f")
136+
@objid ("d421fe55-9f1a-4906-af03-0df755ac4f92")
137137
protected ToscaDiagram(final StaticDiagram elt) {
138138
this.elt = elt;
139139
}
140140

141141
@objid ("cf3c32f5-d159-4ca0-91fa-0b4137560cc2")
142142
public static final class MdaTypes {
143-
@objid ("cbd4a21e-3efa-485d-8764-83818a438a4f")
143+
@objid ("4b991d4b-6340-410d-820e-11077e3ee4a9")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("1addd565-3b7d-40eb-b6db-34cf03706ebc")
146+
@objid ("a6a33b82-47f5-4e6f-8ac6-0119c6aee062")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("8f1fb280-c126-4784-b866-8a81eb9b8d21")
149+
@objid ("5dfb7d1b-8a3c-405b-b25b-9cb192ed5c8e")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("754b10be-2a1f-440a-94eb-a2e7fe661ba8")
152+
@objid ("e372b3ba-c934-4760-8df6-eef2ca2bf43f")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)