Skip to content

Commit 3197b7c

Browse files
relation between two tnodeTemplates implemented
1 parent cb455b0 commit 3197b7c

File tree

168 files changed

+12410
-1867
lines changed

Some content is hidden

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

168 files changed

+12410
-1867
lines changed

ToscaDesigner/src/main/conf/module.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifact_Template.label=Artifact Template
1616
group.Common.label=Common
17+
group.Connectors.label=Connectors
1718
group.Group0.label=Service Templates
1819
group.Node_Templates.label=Node Templates
1920
group.Plans.label=Plans
@@ -122,7 +123,7 @@ tool.NodeTypes.tooltip=
122123
tool.Plans.label=Plans
123124
tool.Plans.tooltip=
124125
tool.RelationshipTemplate.label=RelationshipTemplate
125-
tool.RelationshipTemplate.tooltip=
126+
tool.RelationshipTemplate.tooltip=Create a relationship template
126127
tool.RelationshipTypes.label=RelationshipTypes
127128
tool.RelationshipTypes.tooltip=
128129
tool.Service\ Template.label=Service Template

ToscaDesigner/src/main/conf/module.xml

Lines changed: 133 additions & 122 deletions
Large diffs are not rendered by default.

ToscaDesigner/src/main/conf/module_fr.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifact_Template.label=Artifact_Template
1616
group.Common.label=Common
17+
group.Connectors.label=Connectors
1718
group.Group0.label=Group0
1819
group.Node_Templates.label=Group0
1920
group.Plans.label=Group3
184 Bytes
Binary file not shown.

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

Lines changed: 65 additions & 74 deletions
Large diffs are not rendered by default.

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

Lines changed: 20 additions & 22 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 16/04/2024 16:51 by Modelio Studio.
5+
* This file was generated on 18/04/2024 10:28 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,14 @@
4040
*/
4141
@objid ("14644635-a422-47d2-a521-6f92f8f4c732")
4242
public class CloudServiceArchiveDiagram implements IMdaProxy {
43-
@objid ("d9674f19-6621-46b3-ba40-d4d7c4c3dc81")
43+
@objid ("2e95956e-3b09-41cc-b73a-0621c00d0f5d")
4444
public static final String STEREOTYPE_NAME = "CloudServiceArchiveDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
48+
*
4849
*/
49-
@objid ("e9203439-1a7b-493a-a2fa-a4de463027df")
50+
@objid ("969e0a3e-c105-4aeb-a1de-1052619773a7")
5051
protected final StaticDiagram elt;
5152

5253
/**
@@ -56,17 +57,16 @@ public class CloudServiceArchiveDiagram implements IMdaProxy {
5657
* @param elt a model object
5758
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
5859
*/
59-
@objid ("3ac94115-8cd9-42ce-849d-28fe359ff11e")
60+
@objid ("e67db89c-ec33-45bd-96ec-dea8d4010b55")
6061
public static boolean canInstantiate(final MObject elt) {
6162
return ((elt instanceof StaticDiagram) && (CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(CloudServiceArchiveDiagram.MdaTypes.STEREOTYPE_ELT));
6263
}
6364

6465
/**
6566
* Create a new {@link StaticDiagram} stereotyped << CloudServiceArchiveDiagram >> then instantiate a {@link CloudServiceArchiveDiagram} proxy.
66-
*
6767
* @return a {@link CloudServiceArchiveDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("52db8254-e211-4356-94fb-757c086c5c61")
69+
@objid ("33766d12-505a-4ad4-942a-0efeddbb0a3d")
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 ("33f8e273-9400-487c-bf89-f35c85236c2b")
83+
@objid ("085392c7-3a42-4200-ad4a-71d3a81d8cc5")
8484
public static CloudServiceArchiveDiagram instantiate(final StaticDiagram obj) {
8585
return CloudServiceArchiveDiagram.canInstantiate(obj) ? new CloudServiceArchiveDiagram(obj) : null;
8686
}
@@ -89,19 +89,19 @@ public static CloudServiceArchiveDiagram instantiate(final StaticDiagram obj) {
8989
* Tries to instantiate a {@link CloudServiceArchiveDiagram} proxy from a {@link StaticDiagram} stereotyped << CloudServiceArchiveDiagram >> checking its metaclass and its stereotype.
9090
* <p>
9191
* The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
92+
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9293
* @param obj a {@link StaticDiagram}
9394
* @return a {@link CloudServiceArchiveDiagram} proxy.
94-
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9595
*/
96-
@objid ("eafe9b2c-b6a4-4dec-a033-8c75aec88317")
96+
@objid ("9fe305e4-116f-4c6d-a1ea-a720b84ed233")
9797
public static CloudServiceArchiveDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
9898
if (CloudServiceArchiveDiagram.canInstantiate(obj))
99-
return new CloudServiceArchiveDiagram(obj);
99+
return new CloudServiceArchiveDiagram(obj);
100100
else
101-
throw new IllegalArgumentException("CloudServiceArchiveDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
101+
throw new IllegalArgumentException("CloudServiceArchiveDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
102102
}
103103

104-
@objid ("037435ce-6064-41bc-8f8e-894ad1c95edb")
104+
@objid ("19e38764-141b-40bc-a5af-3d99a20aec15")
105105
@Override
106106
public boolean equals(final Object obj) {
107107
if (this == obj) {
@@ -118,38 +118,37 @@ public boolean equals(final Object obj) {
118118
}
119119

120120
/**
121-
* Get the underlying {@link StaticDiagram}.
121+
* Get the underlying {@link StaticDiagram}.
122122
* @return the StaticDiagram represented by this proxy, never null.
123123
*/
124-
@objid ("f3f32d1d-12da-44d8-bc48-7a13fe83637e")
124+
@objid ("6341bcc5-6e32-4166-bcfa-c28727d97e70")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("e667332a-0d91-45af-9d85-b7b9c19b202c")
129+
@objid ("5e6f6d10-a8e9-4140-b902-c136943d3191")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133-
134133
}
135134

136-
@objid ("1a70eaec-4a71-44b0-b04b-e7262539ce40")
135+
@objid ("c9830b15-8934-48e9-9fef-43fffec5ec30")
137136
protected CloudServiceArchiveDiagram(final StaticDiagram elt) {
138137
this.elt = elt;
139138
}
140139

141140
@objid ("f9b8aa63-12e2-456c-a0b9-3c670d965b7a")
142141
public static final class MdaTypes {
143-
@objid ("bd2fb7e3-8992-4f3b-8fd8-67371fe7574d")
142+
@objid ("6f046e49-2dc5-4dce-8292-d789756bc442")
144143
public static Stereotype STEREOTYPE_ELT;
145144

146-
@objid ("e62c227c-1379-4f34-861b-d2ccc65b1dff")
145+
@objid ("0c9e81b7-68b9-48d5-8c4a-fd1a24017e8a")
147146
private static Stereotype MDAASSOCDEP;
148147

149-
@objid ("aaf0d0ec-3057-4eba-b23a-04ae70b5ce42")
148+
@objid ("a6f920b7-30fc-4be1-b15e-35e4178fce20")
150149
private static TagType MDAASSOCDEP_ROLE;
151150

152-
@objid ("818e679f-aabd-4f9d-b110-f6afec4e291b")
151+
@objid ("3729c1c9-9d25-47a1-8d7c-76e3887cc80c")
153152
public static void init(final IModelingSession session) throws MdaProxyException {
154153
List <MRef> missingRefs = new ArrayList<>();
155154
MRef mRef;
@@ -166,7 +165,6 @@ public static void init(final IModelingSession session) throws MdaProxyException
166165
if (MDAASSOCDEP_ROLE==null) missingRefs.add(mRef);
167166

168167
if (! missingRefs.isEmpty()) throw new MdaProxyException(MdaProxyException.MdaProxyExceptionReason.MISSING_MDA_ELEMENT, missingRefs);
169-
170168
}
171169

172170
}

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

Lines changed: 20 additions & 22 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 16/04/2024 16:51 by Modelio Studio.
5+
* This file was generated on 18/04/2024 10:28 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api.automatic.standard.staticdiagram;
88

@@ -40,13 +40,14 @@
4040
*/
4141
@objid ("9d4da9ca-2131-444a-a6d6-b665a5bed195")
4242
public class ServiceTemplateDiagram implements IMdaProxy {
43-
@objid ("99cdd2b1-332a-4d94-b008-185c0171d7dc")
43+
@objid ("a058b6ec-ba6a-4550-99d1-da37f7a5913a")
4444
public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
4545

4646
/**
4747
* The underlying {@link StaticDiagram} represented by this proxy, never null.
48+
*
4849
*/
49-
@objid ("163104aa-22ac-45f5-902a-3dedc4ad95d8")
50+
@objid ("c6c8fa2a-136f-43fe-9ba2-f6d9aa86893b")
5051
protected final StaticDiagram elt;
5152

5253
/**
@@ -56,17 +57,16 @@ public class ServiceTemplateDiagram implements IMdaProxy {
5657
* @param elt a model object
5758
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
5859
*/
59-
@objid ("caa40f8b-5058-4a60-b95b-59f3e7d379eb")
60+
@objid ("2c2f0145-084f-4ea4-9f89-4ad1d8a04e28")
6061
public static boolean canInstantiate(final MObject elt) {
6162
return ((elt instanceof StaticDiagram) && (ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
6263
}
6364

6465
/**
6566
* Create a new {@link StaticDiagram} stereotyped << ServiceTemplateDiagram >> then instantiate a {@link ServiceTemplateDiagram} proxy.
66-
*
6767
* @return a {@link ServiceTemplateDiagram} proxy on the created {@link StaticDiagram}.
6868
*/
69-
@objid ("9577eb65-3a6a-4611-8af5-f522ab16be29")
69+
@objid ("94a4d374-2ea5-44a1-bce2-ef5ab727ce40")
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 ("a2646238-5fbf-46eb-ba9d-396d3781633d")
83+
@objid ("e5663687-3dc2-43ae-9ad1-d7f74db0cb79")
8484
public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
8585
return ServiceTemplateDiagram.canInstantiate(obj) ? new ServiceTemplateDiagram(obj) : null;
8686
}
@@ -89,19 +89,19 @@ public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
8989
* Tries to instantiate a {@link ServiceTemplateDiagram} proxy from a {@link StaticDiagram} stereotyped << ServiceTemplateDiagram >> checking its metaclass and its stereotype.
9090
* <p>
9191
* The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
92+
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9293
* @param obj a {@link StaticDiagram}
9394
* @return a {@link ServiceTemplateDiagram} proxy.
94-
* @throws IllegalArgumentException if the instantiation cannot be carried out.
9595
*/
96-
@objid ("de55666f-a275-49c1-9eb3-8224e78745a6")
96+
@objid ("f47640cc-be2b-45e7-a3f3-bec8bab2b5f8")
9797
public static ServiceTemplateDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
9898
if (ServiceTemplateDiagram.canInstantiate(obj))
99-
return new ServiceTemplateDiagram(obj);
99+
return new ServiceTemplateDiagram(obj);
100100
else
101-
throw new IllegalArgumentException("ServiceTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
101+
throw new IllegalArgumentException("ServiceTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
102102
}
103103

104-
@objid ("a5dbc9b8-269b-4e8f-92fd-a3ba5b7cfc91")
104+
@objid ("c48bb448-1336-4727-a18f-49772f9fb5d9")
105105
@Override
106106
public boolean equals(final Object obj) {
107107
if (this == obj) {
@@ -118,38 +118,37 @@ public boolean equals(final Object obj) {
118118
}
119119

120120
/**
121-
* Get the underlying {@link StaticDiagram}.
121+
* Get the underlying {@link StaticDiagram}.
122122
* @return the StaticDiagram represented by this proxy, never null.
123123
*/
124-
@objid ("1609bef7-d07c-4142-9a82-e4f6e43e5594")
124+
@objid ("5fc40c1d-e858-44a3-b76e-07ef5f87171b")
125125
public StaticDiagram getElement() {
126126
return this.elt;
127127
}
128128

129-
@objid ("a8c45cfd-26d6-451f-8693-2382c16f4556")
129+
@objid ("366c6bdd-7fdb-4830-80dc-5be6014f7ca4")
130130
@Override
131131
public int hashCode() {
132132
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
133-
134133
}
135134

136-
@objid ("ed53d263-eba4-4206-b3d4-816fc34f9182")
135+
@objid ("f8eb4bde-31c2-418d-8a3b-f3dd55ad3bc6")
137136
protected ServiceTemplateDiagram(final StaticDiagram elt) {
138137
this.elt = elt;
139138
}
140139

141140
@objid ("08ba1b65-2498-47f4-8559-0403208b2c52")
142141
public static final class MdaTypes {
143-
@objid ("0ce9788b-a513-4496-aff5-bd823e3b52fe")
142+
@objid ("5ffb2f41-ef2e-474e-9577-4eb98a4ad38c")
144143
public static Stereotype STEREOTYPE_ELT;
145144

146-
@objid ("03d6f62b-a9b8-44f6-b538-7fca9dbfcb63")
145+
@objid ("fd91fa15-3b33-4a06-8bb2-8bd4a923a59c")
147146
private static Stereotype MDAASSOCDEP;
148147

149-
@objid ("46c5414e-d53d-43c2-bdaf-c7cf0f54061c")
148+
@objid ("ed1ec392-8b62-4ff3-859d-9c10a1ac044c")
150149
private static TagType MDAASSOCDEP_ROLE;
151150

152-
@objid ("930f522c-5cea-4c51-b683-b29ba143f145")
151+
@objid ("927d83ae-a21a-4827-ade6-13d104f1dfa4")
153152
public static void init(final IModelingSession session) throws MdaProxyException {
154153
List <MRef> missingRefs = new ArrayList<>();
155154
MRef mRef;
@@ -166,7 +165,6 @@ public static void init(final IModelingSession session) throws MdaProxyException
166165
if (MDAASSOCDEP_ROLE==null) missingRefs.add(mRef);
167166

168167
if (! missingRefs.isEmpty()) throw new MdaProxyException(MdaProxyException.MdaProxyExceptionReason.MISSING_MDA_ELEMENT, missingRefs);
169-
170168
}
171169

172170
}

0 commit comments

Comments
 (0)