Skip to content

Commit f0fac10

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
api generation fixes + deleting export module due to erros
1 parent cb54cdf commit f0fac10

File tree

109 files changed

+2691
-2616
lines changed

Some content is hidden

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

109 files changed

+2691
-2616
lines changed

‎ToscaDesigner/pom.xml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<id>modelio</id>
1313
<url>https://repository.modelio.org</url>
1414
</repository>
15-
<repository>
16-
<id>central</id>
17-
<url>https://repo1.maven.org/maven2</url>
18-
</repository>
1915
</repositories>
2016

2117
<pluginRepositories>
@@ -39,12 +35,7 @@
3935
<type>pom</type>
4036
<scope>provided</scope>
4137
</dependency>
42-
<dependency>
43-
<groupId>com.github.jknack</groupId>
44-
<artifactId>handlebars</artifactId>
45-
<version>4.3.1</version>
46-
<type>jar</type>
47-
</dependency>
38+
4839
</dependencies>
4940

5041
<!-- // Build // -->

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
101101
propertydefinition.TCapabilityDefinitionTable.lowerBound.label=lowerBound
102102
propertydefinition.TCapabilityDefinitionTable.upperBound.description=
103103
propertydefinition.TCapabilityDefinitionTable.upperBound.label=upperBound
104-
propertydefinition.TCapabilityDefinitionTable.valid_source_tyoes.description=
105-
propertydefinition.TCapabilityDefinitionTable.valid_source_tyoes.label=valid_source_tyoes
104+
propertydefinition.TCapabilityDefinitionTable.valid_source_types.description=
105+
propertydefinition.TCapabilityDefinitionTable.valid_source_types.label=valid_source_types
106106
propertydefinition.TCapabilityRefTable.name.description=
107107
propertydefinition.TCapabilityRefTable.name.label=name
108108
propertydefinition.TCapabilityRefTable.ref.description=
@@ -235,6 +235,8 @@ propertydefinition.TParameterTable.type.description=
235235
propertydefinition.TParameterTable.type.label=type
236236
propertydefinition.TPlansPropertyTable.targetNamespace.description=
237237
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
238+
propertydefinition.TPolicyTable.description.description=
239+
propertydefinition.TPolicyTable.description.label=description
238240
propertydefinition.TPolicyTable.policyRef.description=
239241
propertydefinition.TPolicyTable.policyRef.label=policyRef
240242
propertydefinition.TPolicyTypePropertyPage.description.description=

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

Lines changed: 336 additions & 347 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
101101
propertydefinition.TCapabilityDefinitionTable.lowerBound.label=lowerBound
102102
propertydefinition.TCapabilityDefinitionTable.upperBound.description=
103103
propertydefinition.TCapabilityDefinitionTable.upperBound.label=upperBound
104-
propertydefinition.TCapabilityDefinitionTable.valid_source_tyoes.description=
105-
propertydefinition.TCapabilityDefinitionTable.valid_source_tyoes.label=valid_source_tyoes
104+
propertydefinition.TCapabilityDefinitionTable.valid_source_types.description=
105+
propertydefinition.TCapabilityDefinitionTable.valid_source_types.label=valid_source_types
106106
propertydefinition.TCapabilityRefTable.name.description=
107107
propertydefinition.TCapabilityRefTable.name.label=name
108108
propertydefinition.TCapabilityRefTable.ref.description=
@@ -235,6 +235,8 @@ propertydefinition.TParameterTable.type.description=
235235
propertydefinition.TParameterTable.type.label=type
236236
propertydefinition.TPlansPropertyTable.targetNamespace.description=
237237
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
238+
propertydefinition.TPolicyTable.description.description=
239+
propertydefinition.TPolicyTable.description.label=description
238240
propertydefinition.TPolicyTable.policyRef.description=
239241
propertydefinition.TPolicyTable.policyRef.label=policyRef
240242
propertydefinition.TPolicyTypePropertyPage.description.description=

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

126 Bytes
Binary file not shown.

‎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 09/01/2025 16:04 by Modelio Studio.
5+
* This file was generated on 14/01/2025 15:42 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 ("ced3af61-ae77-46fb-b605-13c149c43e2c")
43+
@objid ("1fd99a4c-6543-4376-88a4-b448d5d750fd")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("51c89b7e-7af7-4853-965d-d490c25b81a1")
49+
@objid ("ec5ad19f-1708-4435-b2e2-2d43f5d7f0c4")
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 ("b8f66326-642c-46f9-bf03-c5e4e0a605e4")
59+
@objid ("ca44e1f7-ca93-4cf9-b332-a450e61e0514")
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 ("ddd54b58-3f42-4768-b6be-2186a4376b51")
69+
@objid ("5254b898-fd46-4c99-b39e-34e032498715")
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 ("3a5a0c28-e270-481e-89be-196d5e0666fc")
83+
@objid ("c3a890ae-793a-4c74-8262-73dd5dac1cb4")
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 ("9e8a4d68-609f-40ba-ae4d-bba3680cb92d")
96+
@objid ("21f77903-10ce-4092-a1b9-154ce19d1601")
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 ("3c12aa05-881c-498a-8f81-37b732c86b8f")
104+
@objid ("47c79eb6-a8ed-4a70-a3cf-8bad9f08d30e")
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 ("720dea68-6000-4ffe-887b-1029a4c16f1a")
124+
@objid ("604c0646-4d28-43c7-866e-6c0601cdb1fe")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("36df3265-2c75-468c-af96-c9fa008b4119")
129+
@objid ("13323c4d-0ca6-4d44-bf0e-024b11042889")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("e0cc92d9-fdb9-4f3f-b271-70bea1eb9252")
136+
@objid ("80cb49fc-03ac-4079-a0b5-2d88ed307763")
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 ("b24f35be-55cf-419d-b08b-2627602eb09c")
143+
@objid ("dad4bde6-36c1-4245-835f-2e76c279d065")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("92651b97-86dd-4f4e-9389-0c02297ea79c")
146+
@objid ("f6ecb835-df71-4615-a268-dfa60f168e73")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("e43d407b-fc70-4c85-bbf8-d93fd9571960")
149+
@objid ("d1999988-0a3b-4180-8076-9b8096b9110e")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("11e9da14-f780-44ee-825d-15279b85ced8")
152+
@objid ("44e2f01e-1411-4811-b7d4-bd45f6ab2b27")
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 09/01/2025 16:04 by Modelio Studio.
5+
* This file was generated on 14/01/2025 15:42 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 ("09efcea3-273e-4454-8600-c23d5d3c852a")
43+
@objid ("d503b2b9-2d52-4e9d-bc84-ebac3742ef40")
4444
public static final String STEREOTYPE_NAME = "TopologyTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
4848
*/
49-
@objid ("7f4ce13f-a84b-43c9-b577-1778edcd39d5")
49+
@objid ("226ea452-c6bd-4c9d-8ded-cdbf180c9207")
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 ("b1d81234-6963-4ac0-a9e2-efac2ef514e0")
59+
@objid ("3e0ab1cd-0b8b-43e7-bc2a-830ca7d263c7")
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 ("31d08698-e1e2-424a-a665-2c92002ee9c7")
69+
@objid ("4b3bce7f-dda9-4c8b-a547-95a91f6f7d33")
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 ("f7425e5b-4906-4ed7-b2ac-fde291975c0f")
83+
@objid ("fb4b72df-2896-4f0b-828a-910a2e64cd43")
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 ("462708ff-5071-4244-b315-094cf6e9b2de")
96+
@objid ("c949bd4f-a460-4256-a7aa-2b75a3c76ddc")
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 ("a33d6224-7bcb-4dbf-9657-3d8bd6a42c2b")
104+
@objid ("d6a0fec8-4d74-49d5-8ae8-fdd5489710b7")
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 ("97224350-e474-45f6-b2af-043a6f606f9e")
124+
@objid ("6d04bdc7-7f50-4eae-84cf-16624d3fe362")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("8918f7cf-547e-43fd-bbc6-081d667be350")
129+
@objid ("496769c0-0c64-474d-90df-4eb4e3a7304d")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133133

134134
}
135135

136-
@objid ("92796542-e67c-405f-926d-525b8842c09e")
136+
@objid ("52ef7a0c-3850-43e9-96e8-28152168b6f2")
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 ("8c8c80f7-3e49-425d-ae50-35809134e708")
143+
@objid ("00bb547d-086b-4937-b28f-59448288b308")
144144
public static Stereotype STEREOTYPE_ELT;
145145

146-
@objid ("3e7533a6-ba3a-4a75-90e9-1a3ecae4dfc4")
146+
@objid ("907f72a4-cd6e-4d97-8a4b-5b659f5cf867")
147147
private static Stereotype MDAASSOCDEP;
148148

149-
@objid ("5a84c5f8-a70b-47b0-8aea-2159aadc2dde")
149+
@objid ("8978be50-9049-4870-a70f-6f5b60a98e3f")
150150
private static TagType MDAASSOCDEP_ROLE;
151151

152-
@objid ("8c103483-08be-42f8-a8a5-6302eb19858d")
152+
@objid ("fc30a89e-2f3f-42ee-8efa-66dea1a40598")
153153
public static void init(final IModelingSession session) throws MdaProxyException {
154154
List <MRef> missingRefs = new ArrayList<>();
155155
MRef mRef;

0 commit comments

Comments
 (0)