Skip to content

Commit 97b2cd9

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Contextual commands added
1 parent 5aac77e commit 97b2cd9

File tree

133 files changed

+11798
-609
lines changed

Some content is hidden

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

133 files changed

+11798
-609
lines changed

‎ToscaDesigner/pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,5 +202,7 @@
202202
</plugins>
203203
</pluginManagement>
204204
</build>
205-
<description></description>
205+
<description>The TOSCA Designer module is a component within TOSCA-based cloud orchestration frameworks that facilitates the creation, editing, and visualization of TOSCA-compliant application and service templates.
206+
This module typically provides a graphical user interface (GUI) or integrated development environment (IDE) where users can visually design, model, and manipulate TOSCA templates, including topology templates, node types, relationship types, policies, and plans.
207+
</description>
206208
</project>

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
ModuleDescription=
2-
ModuleLabel=Tosca Designer
1+
ModuleDescription=The TOSCA Designer module is a component within TOSCA-based cloud orchestration frameworks that facilitates the creation, editing, and visualization of TOSCA-compliant application and service templates. \r\nThis module typically provides a graphical user interface (GUI) or integrated development environment (IDE) where users can visually design, model, and manipulate TOSCA templates, including topology templates, node types, relationship types, policies, and plans.\r\n
2+
ModuleLabel=ToscaDesigner
33

4-
command.Tosca_Model.label=Tosca Model
5-
command.Tosca_Model.tooltip=Create a Tosca Model
6-
command.Tosca_Model_Diagram.label=Tosca Model Diagram
7-
command.Tosca_Model_Diagram.tooltip=Create a Tosca Model Diagram
4+
command.Export.label=Export
5+
command.Export.tooltip=Export into a yaml file
6+
command.Tosca_Model.label=Tosca_Model
7+
command.Tosca_Model.tooltip=
8+
command.Tosca_Model_Diagram.label=Tosca_Model_Diagram
9+
command.Tosca_Model_Diagram.tooltip=
810

911
group.Group0.label=Group0
1012

@@ -44,7 +46,7 @@ stereotype.TCapability.label=TCapability
4446
stereotype.TCapabilityDefinition.description=
4547
stereotype.TCapabilityDefinition.label=TCapabilityDefinition
4648
stereotype.TCapabilityDefinitionsType.description=
47-
stereotype.TCapabilityDefinitionsType.label=TCapabilityDefinitionsType
49+
stereotype.TCapabilityDefinitionsType.label=CapabilityDefinitionsType
4850
stereotype.TDeploymentArtifact.description=
4951
stereotype.TDeploymentArtifact.label=TDeploymentArtifact
5052
stereotype.TDeploymentArtifacts.description=
@@ -64,7 +66,7 @@ stereotype.TRequirement.label=TRequirement
6466
stereotype.TRequirementDefinition.description=
6567
stereotype.TRequirementDefinition.label=TRequirementDefinition
6668
stereotype.TRequirementDefinitionType.description=
67-
stereotype.TRequirementDefinitionType.label=TRequirementDefinitionType
69+
stereotype.TRequirementDefinitionType.label=RequirementDefinitionsType
6870
stereotype.TTopologyElementInstanceStates.description=
6971
stereotype.TTopologyElementInstanceStates.label=TTopologyElementInstanceStates
7072
stereotype.TTopologyTemplate.description=
@@ -77,19 +79,19 @@ stereotype.ToscaModel.description=
7779
stereotype.ToscaModel.label=ToscaModel
7880

7981
tool.NodeTemplate.label=NodeTemplate
80-
tool.NodeTemplate.tooltip=Create a Node Template
82+
tool.NodeTemplate.tooltip=
8183
tool.NodeTypes.label=NodeTypes
82-
tool.NodeTypes.tooltip=Create NodeTypes
84+
tool.NodeTypes.tooltip=
8385
tool.Plans.label=Plans
84-
tool.Plans.tooltip=Create Plans
86+
tool.Plans.tooltip=
8587
tool.RelationshipTemplate.label=RelationshipTemplate
86-
tool.RelationshipTemplate.tooltip=Create RelationshipTemplate
88+
tool.RelationshipTemplate.tooltip=
8789
tool.RelationshipTypes.label=RelationshipTypes
88-
tool.RelationshipTypes.tooltip=Create Relationship Types
89-
tool.Service\ Template.label=ServiceTemplate
90-
tool.Service\ Template.tooltip=Create a Service Template
90+
tool.RelationshipTypes.tooltip=
91+
tool.Service\ Template.label=Service Template
92+
tool.Service\ Template.tooltip=
9193
tool.TopologyTemplate.label=TopologyTemplate
92-
tool.TopologyTemplate.tooltip=Create a Topology template
94+
tool.TopologyTemplate.tooltip=
9395

9496
wizard.CloudServiceArchiveDiagram.detail=
9597
wizard.CloudServiceArchiveDiagram.info=

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="5.4.01" version="0.0.00" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="" image="" url="">
2+
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="5.4.01" version="0.0.00" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="Softeam" image="" url="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
55
</ClassPath>
@@ -151,6 +151,10 @@
151151
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
152152
</Handler>
153153
</Command>
154+
<Command id="Export" label="%command.Export.label" tooltip="%command.Export.tooltip" image="res/icon/gui/script24.png" modify-model="false">
155+
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
156+
<Handler class="fr.softeam.toscadesigner.handlers.commands.CreateDiagramCommand"/>
157+
</Command>
154158
</Commands>
155159
<Tools>
156160
<Tool id="Service Template" label="%tool.Service Template.label" tooltip="%tool.Service Template.tooltip" image="res/icon/gui/2.ICON.png">
@@ -205,6 +209,11 @@
205209
</Handler>
206210
</Tool>
207211
</Tools>
212+
<ContextualMenu>
213+
<CommandRef refid="Export" group="" group-image=""/>
214+
<CommandRef refid="Tosca_Model" group="" group-image=""/>
215+
<CommandRef refid="Tosca_Model_Diagram" group="" group-image=""/>
216+
</ContextualMenu>
208217
<Diagrams>
209218
<DiagramType base-diagram="Standard.StaticDiagram" stereotype="ToscaDesigner#CloudServiceArchiveDiagram">
210219
<Palette keepBasePalette="false">

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
ModuleDescription=
22
ModuleLabel=ToscaDesigner
33

4+
command.Export.label=Export
5+
command.Export.tooltip=
46
command.Tosca_Model.label=Tosca_Model
57
command.Tosca_Model.tooltip=
68
command.Tosca_Model_Diagram.label=Tosca_Model_Diagram

‎ToscaDesigner/src/main/conf/res/icon/module.png‎

280 Bytes
Loading

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

-22 Bytes
Binary file not shown.

‎ToscaDesigner/src/main/java/CreateDiagramCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.modelio.vcore.smkernel.mapi.MObject;
66

77
@objid ("5907998c-bfb4-4619-853a-38bfb03ae5ef")
8-
public class CreateDiagramCommand extends DiagramCreationStandardHandler {
8+
public class CreateDiagramCommand extends DiagramCreationStandardHandler {
99
@objid ("3d5304a6-ce22-4e3d-95b3-4ffa78aafc2c")
1010
@Override
1111
public boolean accept(final List<MObject> selectedElements, final IModule module) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
public interface IToscaDesignerPeerModule extends IPeerModule {
88
@objid ("d8c00e1c-5e3d-46d0-8c79-bb999667b16d")
99
public static final String MODULE_NAME = "ToscaDesigner";
10-
public static final Object TOSCA_STYLE = "TOSCA_style";
1110
}
1211

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

Lines changed: 31 additions & 34 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 01/03/2024 11:13 by Modelio Studio.
5+
* This file was generated on 05/03/2024 12:38 by Modelio Studio.
66
*/
77
package fr.softeam.toscadesigner.api;
88

@@ -57,21 +57,20 @@
5757
* <li><< CloudServiceArchiveDiagram >> on a {@link org.modelio.metamodel.diagrams.StaticDiagram}: instantiates a {@link CloudServiceArchiveDiagram}
5858
* <li><< ServiceTemplateDiagram >> on a {@link org.modelio.metamodel.diagrams.StaticDiagram}: instantiates a {@link ServiceTemplateDiagram}
5959
* <li><< TopologyTemplateDiagram >> on a {@link org.modelio.metamodel.diagrams.StaticDiagram}: instantiates a {@link TopologyTemplateDiagram}
60-
* <li><< ToscaModelDiagram >> on a {@link org.modelio.metamodel.diagrams.StaticDiagram}: instantiates a {@link ToscaModelDiagram}
6160
* </ul>
6261
*/
6362
@objid ("365cd17d-2d04-4020-839d-7e7bdefdf43f")
6463
public class ToscaDesignerProxyFactory {
65-
@objid ("6953ff00-d592-4b58-97cf-26e11cfdbf64")
64+
@objid ("0fc27e62-ef20-4d25-a25a-9a9b8d000935")
6665
private static final String ASSETNAME = "ToscaDesigner";
6766

68-
@objid ("a3663e74-241d-471f-b13d-c9305f7cca3d")
67+
@objid ("21cbfad0-fe1b-477e-ba64-9c826695f91a")
6968
private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor();
7069

7170
/**
7271
* @param session The modeling session this factory is operating in.
7372
*/
74-
@objid ("647556fa-0ae6-49a1-8ad0-bd99998a4c10")
73+
@objid ("8205b0e7-d984-46ba-8f33-364be8161a54")
7574
public static final void initialize(final IModelingSession session) throws MdaProxyException {
7675
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilitiesType.MdaTypes.init(session);
7776
fr.softeam.toscadesigner.api.tosca.standard.class_.CapabilityDefinitionsType.MdaTypes.init(session);
@@ -104,7 +103,6 @@ public static final void initialize(final IModelingSession session) throws MdaPr
104103
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.MdaTypes.init(session);
105104
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.MdaTypes.init(session);
106105
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.MdaTypes.init(session);
107-
fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaModelDiagram.MdaTypes.init(session);
108106

109107
}
110108

@@ -116,7 +114,7 @@ public static final void initialize(final IModelingSession session) throws MdaPr
116114
* @param e A model element
117115
* @return the right proxy or <i>null</i>.
118116
*/
119-
@objid ("28518df3-7c68-4b97-8ef7-1d0520e83e0f")
117+
@objid ("6d7669bd-1957-4bfc-a7c3-eacd1d2d4f7d")
120118
public static final Object instantiate(final ModelElement e) {
121119
for (Stereotype s : e.getExtension()) {
122120
ModuleComponent module = s.getModule();
@@ -136,64 +134,66 @@ public static final Object instantiate(final ModelElement e) {
136134
* @param stName A stereotype name.
137135
* @return the right proxy or <i>null</i>.
138136
*/
139-
@objid ("5811b8c7-4ce7-4494-8ec5-8f64dd586e5e")
137+
@objid ("9382794d-15e0-4df4-9364-fa4b459b0573")
140138
public static final Object instantiate(final Element e, final String stName) {
141139
instantiateVisitor.setStereotype(stName);
142140
return e.accept(instantiateVisitor);
143141
}
144142

145-
@objid ("ab176a7b-2ef3-4394-9e83-5f6f967fc2aa")
143+
@objid ("ced485b8-9bb7-4c2f-adc9-cab48b400f5f")
146144
private static class InstantiateVisitor implements IDefaultModelVisitor {
147-
@objid ("10c2b606-dbee-42e8-b795-9b1c962a32ea")
145+
@objid ("5d62073b-044e-4f41-a756-b73a1ab64f04")
148146
private String stName;
149147

150-
@objid ("3f312fc3-1b59-4161-8f62-1b26dfcaa9ac")
148+
@objid ("c43b2540-9ca1-4f0b-86e8-e5ea1d643539")
151149
public final void setStereotype(final String stName) {
152150
this.stName = stName;
153151
}
154152

155-
@objid ("1920af69-7432-43f2-98cd-aa4efb937d92")
153+
@objid ("e3eddf75-32eb-4026-9283-da54155134f8")
156154
@Override
157-
public final Object visitPackage(Package obj) {
155+
public final Object visitConnector(Connector obj) {
158156
switch (this.stName) {
159-
case fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.instantiate(obj);
157+
case fr.softeam.toscadesigner.api.tosca.standard.connector.TRelationshipTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.connector.TRelationshipTemplate.instantiate(obj);
160158
default:
161159
break;
162160
}
163161

164-
return IDefaultModelVisitor.super.visitPackage(obj);
162+
return IDefaultModelVisitor.super.visitConnector(obj);
165163

166164
}
167165

168-
@objid ("065ae75a-f2f2-4c6a-94bb-7b696ec5c9ac")
166+
@objid ("40c552a1-69d8-4e2d-8b04-9b3769044bbd")
169167
@Override
170-
public final Object visitConnector(Connector obj) {
168+
public final Object visitDataType(DataType obj) {
171169
switch (this.stName) {
172-
case fr.softeam.toscadesigner.api.tosca.standard.connector.TRelationshipTemplate.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.connector.TRelationshipTemplate.instantiate(obj);
170+
case fr.softeam.toscadesigner.api.tosca.standard.datatype.MaxInstancesType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.datatype.MaxInstancesType.instantiate(obj);
171+
case fr.softeam.toscadesigner.api.tosca.standard.datatype.SourceElementType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.datatype.SourceElementType.instantiate(obj);
172+
case fr.softeam.toscadesigner.api.tosca.standard.datatype.TargetElementType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.datatype.TargetElementType.instantiate(obj);
173173
default:
174174
break;
175175
}
176176

177-
return IDefaultModelVisitor.super.visitConnector(obj);
177+
return IDefaultModelVisitor.super.visitDataType(obj);
178178

179179
}
180180

181-
@objid ("108a6982-9dc6-45b2-88ae-304e69654bf4")
181+
@objid ("01f86776-ac37-42ee-bb24-2c1e9c8ec3e8")
182182
@Override
183-
public final Object visitDataType(DataType obj) {
183+
public final Object visitStaticDiagram(StaticDiagram obj) {
184184
switch (this.stName) {
185-
case fr.softeam.toscadesigner.api.tosca.standard.datatype.MaxInstancesType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.datatype.MaxInstancesType.instantiate(obj);
186-
case fr.softeam.toscadesigner.api.tosca.standard.datatype.SourceElementType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.datatype.SourceElementType.instantiate(obj);
187-
case fr.softeam.toscadesigner.api.tosca.standard.datatype.TargetElementType.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.datatype.TargetElementType.instantiate(obj);
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);
188188
default:
189189
break;
190190
}
191191

192-
return IDefaultModelVisitor.super.visitDataType(obj);
192+
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
193193

194194
}
195195

196-
@objid ("f726aa93-e302-49e2-9975-db6473c60db5")
196+
@objid ("48a647c8-e743-4c96-846c-d7a50e5fcdc1")
197197
@Override
198198
public final Object visitClass(Class obj) {
199199
switch (this.stName) {
@@ -228,19 +228,16 @@ public final Object visitClass(Class obj) {
228228

229229
}
230230

231-
@objid ("d4cc0be5-6ce8-4e7d-815d-3d55131145cb")
231+
@objid ("64f68322-b7bc-4742-a7b4-b88e2afd67ed")
232232
@Override
233-
public final Object visitStaticDiagram(StaticDiagram obj) {
233+
public final Object visitPackage(Package obj) {
234234
switch (this.stName) {
235-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.CloudServiceArchiveDiagram.instantiate(obj);
236-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ServiceTemplateDiagram.instantiate(obj);
237-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.TopologyTemplateDiagram.instantiate(obj);
238-
case fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaModelDiagram.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.automatic.standard.staticdiagram.ToscaModelDiagram.instantiate(obj);
235+
case fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.STEREOTYPE_NAME: return fr.softeam.toscadesigner.api.tosca.standard.package_.ToscaModel.instantiate(obj);
239236
default:
240237
break;
241238
}
242239

243-
return IDefaultModelVisitor.super.visitStaticDiagram(obj);
240+
return IDefaultModelVisitor.super.visitPackage(obj);
244241

245242
}
246243

@@ -249,7 +246,7 @@ public final Object visitStaticDiagram(StaticDiagram obj) {
249246
* <p>If null is returned the caller will return null.
250247
* @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
251248
*/
252-
@objid ("d15951f8-eece-4d38-bf99-7ccbac27946e")
249+
@objid ("567c098f-9cb6-4d5b-b66f-056b5a936d23")
253250
@Override
254251
public IInfrastructureVisitor getInfrastructureVisitor() {
255252
return null;

0 commit comments

Comments
 (0)