Skip to content

Commit 25d2662

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Tosca style
1 parent e79a7a5 commit 25d2662

File tree

121 files changed

+1214
-490
lines changed

Some content is hidden

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

121 files changed

+1214
-490
lines changed

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,32 +155,35 @@
155155
<HParameter name="name" value="Tosca Model"/>
156156
</Handler>
157157
</Command>
158-
<Command id="Tosca_Model_Diagram" label="%command.Tosca_Model_Diagram.label" tooltip="%command.Tosca_Model_Diagram.tooltip" image="res/icon/gui/2.ICON.png" modify-model="true">
158+
<Command id="Tosca_Model_Diagram" label="%command.Tosca_Model_Diagram.label" tooltip="%command.Tosca_Model_Diagram.tooltip" image="res/icon/gui/diagram/csar_diag24.png" modify-model="true">
159159
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
160160
<Handler class="fr.softeam.toscadesigner.handlers.commands.CreateDiagramCommand">
161-
<HParameter name="name" value="CloudServiceDiagram"/>
161+
<HParameter name="name" value="CloudServiceArchiveDiagram"/>
162162
<HParameter name="stereotype" value="ToscaDesigner#CloudServiceArchiveDiagram"/>
163163
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
164+
<HParameter name="style" value="ToscaStyle"/>
164165
</Handler>
165166
</Command>
166167
<Command id="Export" label="%command.Export.label" tooltip="%command.Export.tooltip" image="res/icon/gui/script24.png" modify-model="false">
167168
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
168169
<Handler class="fr.softeam.toscadesigner.handlers.commands.CreateDiagramCommand"/>
169170
</Command>
170-
<Command id="Service_Template_Diagram" label="%command.Service_Template_Diagram.label" tooltip="%command.Service_Template_Diagram.tooltip" image="" modify-model="true">
171+
<Command id="Service_Template_Diagram" label="%command.Service_Template_Diagram.label" tooltip="%command.Service_Template_Diagram.tooltip" image="res/icon/gui/diagram/service_template_diag24.png" modify-model="true">
171172
<Scope metaclass="Standard.Package" stereotype=""/>
172173
<Handler class="fr.softeam.toscadesigner.handlers.commands.CreateDiagramCommand">
173174
<HParameter name="name" value="ServiceTemplateDiagram"/>
174175
<HParameter name="stereotype" value="ToscaDesigner#ServiceTemplateDiagram"/>
175176
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
177+
<HParameter name="style" value="ToscaStyle"/>
176178
</Handler>
177179
</Command>
178-
<Command id="Topology_Template_Diagram" label="%command.Topology_Template_Diagram.label" tooltip="%command.Topology_Template_Diagram.tooltip" image="" modify-model="true">
180+
<Command id="Topology_Template_Diagram" label="%command.Topology_Template_Diagram.label" tooltip="%command.Topology_Template_Diagram.tooltip" image="res/icon/gui/diagram/topology_template_diag24.png" modify-model="true">
179181
<Scope metaclass="Standard.Package" stereotype=""/>
180182
<Handler class="fr.softeam.toscadesigner.handlers.commands.CreateDiagramCommand">
181183
<HParameter name="name" value="TopologyTemplateDiagram"/>
182184
<HParameter name="stereotype" value="ToscaDesigner#TopologyTemplateDiagram"/>
183185
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
186+
<HParameter name="style" value="ToscaStyle"/>
184187
</Handler>
185188
</Command>
186189
</Commands>
@@ -291,4 +294,9 @@
291294
</DiagramType>
292295
</Diagrams>
293296
</Gui>
297+
<Resources>
298+
<Styles>
299+
<Style id="ToscaStyle" path="res/generated/styles/ToscaStyle.style"/>
300+
</Styles>
301+
</Resources>
294302
</Module>

‎ToscaDesigner/src/main/conf/res/generated/styles/ToscaStyle.style‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
#Fri Mar 08 11:23:31 CET 2024
3+
CLASS_LINECOLOR=84 101 255
4+
COMPONENT_INNERVIEWMODE=DIAGRAM
5+
CLASS_INNERVIEWMODE=DIAGRAM
6+
DEPENDENCY_SHOWLABEL=true
7+
CLASS_FILLCOLOR=255 255 255
8+
CLASS_TEXTCOLOR=84 101 255
9+
basestyle=Modelio 5.3.x
10+
provider=Modelio
11+
stylename=ToscaStyle
12+
theme=false
13+
CLASS_SHOWSTEREOTYPES=ICON
14+
ABSTRACT_DIAGRAM_GRIDCOLOR=255 255 255
15+
CLASS_REPRES_MODE=STRUCTURED
16+

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

-11 Bytes
Binary file not shown.

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

Lines changed: 35 additions & 39 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 05/03/2024 18:02 by Modelio Studio.
5+
* This file was generated on 08/03/2024 09:55 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -15,7 +15,6 @@
1515
import org.modelio.metamodel.uml.infrastructure.ModelElement;
1616
import org.modelio.metamodel.uml.infrastructure.Stereotype;
1717
import org.modelio.metamodel.uml.statik.Class;
18-
import org.modelio.metamodel.uml.statik.Connector;
1918
import org.modelio.metamodel.uml.statik.DataType;
2019
import org.modelio.metamodel.uml.statik.Package;
2120
import org.modelio.metamodel.visitors.IDefaultModelVisitor;
@@ -26,7 +25,8 @@
2625
* <h2>Module description:</h2>
2726
* <br/><i>null</i></p>
2827
* <h2>Supported stereotypes:</h2>
29-
* <ul><li><< CapabilitiesType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link CapabilitiesType}
28+
* <ul><li><< ArtifactTemplate >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link ArtifactTemplate}
29+
* <li><< CapabilitiesType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link CapabilitiesType}
3030
* <li><< CapabilityDefinitionsType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link CapabilityDefinitionsType}
3131
* <li><< ConstraintsType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link ConstraintsType}
3232
* <li><< InstanceStateType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link InstanceStateType}
@@ -47,31 +47,34 @@
4747
* <li><< TNodeTemplate >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TNodeTemplate}
4848
* <li><< TNodeType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TNodeType}
4949
* <li><< TPolicy >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TPolicy}
50-
* <li><< TRelationshipTemplate >> on a {@link org.modelio.metamodel.uml.statik.Connector}: instantiates a {@link TRelationshipTemplate}
50+
* <li><< TRelationshipTemplate >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRelationshipTemplate}
5151
* <li><< TRequirement >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRequirement}
5252
* <li><< TRequirementDefinition >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRequirementDefinition}
5353
* <li><< TTopologyElementInstanceStates >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TTopologyElementInstanceStates}
5454
* <li><< TTopologyTemplate >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TTopologyTemplate}
5555
* <li><< TargetElementType >> on a {@link org.modelio.metamodel.uml.statik.DataType}: instantiates a {@link TargetElementType}
5656
* <li><< ToscaModel >> on a {@link org.modelio.metamodel.uml.statik.Package}: instantiates a {@link ToscaModel}
57+
* <li><< TServiceTemplate >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TServiceTemplate}
58+
* <li><< TRelationshipType >> on a {@link org.modelio.metamodel.uml.statik.Class}: instantiates a {@link TRelationshipType}
5759
* <li><< CloudServiceArchiveDiagram >> on a {@link org.modelio.metamodel.diagrams.StaticDiagram}: instantiates a {@link CloudServiceArchiveDiagram}
5860
* <li><< ServiceTemplateDiagram >> on a {@link org.modelio.metamodel.diagrams.StaticDiagram}: instantiates a {@link ServiceTemplateDiagram}
5961
* <li><< TopologyTemplateDiagram >> on a {@link org.modelio.metamodel.diagrams.StaticDiagram}: instantiates a {@link TopologyTemplateDiagram}
6062
* </ul>
6163
*/
6264
@objid ("365cd17d-2d04-4020-839d-7e7bdefdf43f")
6365
public class ToscaDesignerProxyFactory {
64-
@objid ("fd65ca08-f9a2-4589-ac4c-5ef63bf0eb3e")
66+
@objid ("716c6fce-0d5f-469a-aaf5-bdc92cec1c88")
6567
private static final String ASSETNAME = "ToscaDesigner";
6668

67-
@objid ("cb2651f2-24b0-46ec-97c7-d5ae02dbd4e1")
69+
@objid ("cc3db72f-6cf5-40dd-a9aa-26302b93b266")
6870
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
6971

7072
/**
7173
* @param session The modeling session this factory is operating in.
7274
*/
73-
@objid ("2f0573a0-7692-43b2-81dd-384d427ac0da")
75+
@objid ("4423cbcf-44fe-45b2-a98d-7ab590cfca53")
7476
public static final void initialize(final IModelingSession session) throws MdaProxyException {
77+
fr.softeam.toscadesigner.api.tosca.standard.class_.ArtifactTemplate.MdaTypes.init(session);
7578
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.MdaTypes.init(session);
7679
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.MdaTypes.init(session);
7780
fr.softeam.toscadesigner.api.tosca.standard.class_.ConstraintsType.MdaTypes.init(session);
@@ -93,13 +96,15 @@ public static final void initialize(final IModelingSession session) throws MdaPr
9396
fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate.MdaTypes.init(session);
9497
fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeType.MdaTypes.init(session);
9598
fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicy.MdaTypes.init(session);
96-
fr.softeam.toscadesigner.api.tosca.standard.connector.TRelationshipTemplate.MdaTypes.init(session);
99+
fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipTemplate.MdaTypes.init(session);
97100
fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement.MdaTypes.init(session);
98101
fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.MdaTypes.init(session);
99102
fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates.MdaTypes.init(session);
100103
fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyTemplate.MdaTypes.init(session);
101104
fr.softeam.toscadesigner.api.tosca.standard.datatype.TargetElementType.MdaTypes.init(session);
102105
fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.MdaTypes.init(session);
106+
fr.softeam.toscadesigner.api.tosca.standard.class_.TServiceTemplate.MdaTypes.init(session);
107+
fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType.MdaTypes.init(session);
103108
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.MdaTypes.init(session);
104109
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
105110
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.MdaTypes.init(session);
@@ -114,7 +119,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
114119
* @param e A model element
115120
* @return the right proxy or <i>null</i>.
116121
*/
117-
@objid ("d10793ef-2228-4a4a-8fb6-80614d06831f")
122+
@objid ("615529d6-370e-46b2-ac8c-9110d23f23e2")
118123
public static final Object instantiate(final ModelElement e) {
119124
for (Stereotype s : e.getExtension()) {
120125
ModuleComponent module = s.getModule();
@@ -134,36 +139,36 @@ public static final Object instantiate(final ModelElement e) {
134139
* @param stName A stereotype name.
135140
* @return the right proxy or <i>null</i>.
136141
*/
137-
@objid ("fa387ceb-dcca-4e49-a0d8-8bcdaebcd5f6")
142+
@objid ("63d4888e-3356-4cc1-a0ca-b11e36213183")
138143
public static final Object instantiate(final Element e, final String stName) {
139144
instantiateVisitor.setStereotype(stName);
140145
return e.accept(instantiateVisitor);
141146
}
142147

143-
@objid ("a69dbdc4-edd0-4a55-922c-acddcf5165fe")
148+
@objid ("debac363-8f6a-4f01-b4d9-2e0d218354ff")
144149
private static class InstantiateVisitor implements IDefaultModelVisitor {
145-
@objid ("179ae835-1d65-45e3-aede-13ac6652b9f3")
150+
@objid ("47a91884-5548-405e-be6e-132fe14d6b52")
146151
private String stName;
147152

148-
@objid ("d98106c0-5296-44b7-b84d-c7b22882b81c")
153+
@objid ("17259c67-4ade-43ef-8fa5-2b8909782888")
149154
public final void setStereotype(final String stName) {
150155
this.stName = stName;
151156
}
152157

153-
@objid ("b5cef303-a08f-48b7-9739-3b0f4cd8efd0")
158+
@objid ("d5cc1b4b-f7c1-4152-94aa-a69111ef8df2")
154159
@Override
155-
public final Object visitConnector(Connector obj) {
160+
public final Object visitPackage(Package obj) {
156161
switch (this.stName) {
157-
case fr.softeam.toscadesigner.api.tosca.standard.connector.TRelationshipTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.connector.TRelationshipTemplate.instantiate(obj);
162+
case fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.instantiate(obj);
158163
default:
159164
break;
160165
}
161166

162-
return IDefaultModelVisitor.super.visitConnector(obj);
167+
return IDefaultModelVisitor.super.visitPackage(obj);
163168

164169
}
165170

166-
@objid ("ce27cce4-49eb-4c68-a424-cdc1ea239bf5")
171+
@objid ("e3ddc2a6-85b3-49d9-9a16-b5246620d8a5")
167172
@Override
168173
public final Object visitDataType(DataType obj) {
169174
switch (this.stName) {
@@ -178,25 +183,11 @@ public final Object visitDataType(DataType obj) {
178183

179184
}
180185

181-
@objid ("940b889d-cda7-4d12-8a7b-37a013325264")
182-
@Override
183-
public final Object visitStaticDiagram(StaticDiagram obj) {
184-
switch (this.stName) {
185-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.instantiate(obj);
186-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.instantiate(obj);
187-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.instantiate(obj);
188-
default:
189-
break;
190-
}
191-
192-
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
193-
194-
}
195-
196-
@objid ("587f6c26-8b07-43e2-bd9c-e4e4b591c129")
186+
@objid ("807ae560-f337-4272-9b53-ecc5eb8ebc7c")
197187
@Override
198188
public final Object visitClass(Class obj) {
199189
switch (this.stName) {
190+
case fr.softeam.toscadesigner.api.tosca.standard.class_.ArtifactTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.ArtifactTemplate.instantiate(obj);
200191
case fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.instantiate(obj);
201192
case fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.instantiate(obj);
202193
case fr.softeam.toscadesigner.api.tosca.standard.class_.ConstraintsType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.ConstraintsType.instantiate(obj);
@@ -216,10 +207,13 @@ public final Object visitClass(Class obj) {
216207
case fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeTemplate.instantiate(obj);
217208
case fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TNodeType.instantiate(obj);
218209
case fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicy.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TPolicy.instantiate(obj);
210+
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipTemplate.instantiate(obj);
219211
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirement.instantiate(obj);
220212
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRequirementDefinition.instantiate(obj);
221213
case fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyElementInstanceStates.instantiate(obj);
222214
case fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TTopologyTemplate.instantiate(obj);
215+
case fr.softeam.toscadesigner.api.tosca.standard.class_.TServiceTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TServiceTemplate.instantiate(obj);
216+
case fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.class_.TRelationshipType.instantiate(obj);
223217
default:
224218
break;
225219
}
@@ -228,16 +222,18 @@ public final Object visitClass(Class obj) {
228222

229223
}
230224

231-
@objid ("4e8441a7-8df6-4a62-bcf5-110b2f123fdd")
225+
@objid ("c635b414-dd38-4f86-aba1-b0ea64935785")
232226
@Override
233-
public final Object visitPackage(Package obj) {
227+
public final Object visitStaticDiagram(StaticDiagram obj) {
234228
switch (this.stName) {
235-
case fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.instantiate(obj);
229+
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.instantiate(obj);
230+
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.instantiate(obj);
231+
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.instantiate(obj);
236232
default:
237233
break;
238234
}
239235

240-
return IDefaultModelVisitor.super.visitPackage(obj);
236+
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
241237

242238
}
243239

@@ -246,7 +242,7 @@ public final Object visitPackage(Package obj) {
246242
* <p>If null is returned the caller will return null.
247243
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
248244
*/
249-
@objid ("4579ff7b-da6b-4e66-9595-8911d19e09b7")
245+
@objid ("bfae3266-80eb-4473-b85c-f6fe990c2f7b")
250246
@Override
251247
public IInfrastructureVisitor getInfrastructureVisitor() {
252248
return null;

0 commit comments

Comments
 (0)