Skip to content

Commit d4b2c31

Browse files
Code Cleanup: Reset to a previous working version
1 parent 5fb575d commit d4b2c31

File tree

179 files changed

+1402
-23485
lines changed

Some content is hidden

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

179 files changed

+1402
-23485
lines changed

ToscaDesigner/src/main/conf/module.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ ModuleDescription=The TOSCA Designer module is a component within TOSCA-based cl
22
ModuleLabel=ToscaDesigner
33

44
command.Export.label=Export
5-
command.Export.tooltip=Export into a yaml file
5+
command.Export.tooltip=
66
command.Service_Template_Diagram.label=Service_Template_Diagram
77
command.Service_Template_Diagram.tooltip=
88
command.Topology_Template_Diagram.label=Topology_Template_Diagram
99
command.Topology_Template_Diagram.tooltip=
10-
command.Tosca_Model.label=Tosca_Model
10+
command.Tosca_Model.label=Tosca Model
1111
command.Tosca_Model.tooltip=
1212
command.Tosca_Model_Diagram.label=Tosca_Model_Diagram
1313
command.Tosca_Model_Diagram.tooltip=

ToscaDesigner/src/main/conf/module.xml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,49 @@
194194
</Profile>
195195
</Profiles>
196196
<Gui>
197+
<Commands>
198+
<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">
199+
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
200+
<Handler class="DiagramCreate">
201+
<HParameter name="name" value="ToscaModelDiagram"/>
202+
<HParameter name="stereotype" value="ToscaDesigner#CloudServiceArchiveDiagram"/>
203+
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
204+
<HParameter name="style" value="ToscaStyle"/>
205+
</Handler>
206+
</Command>
207+
<Command id="Export" label="%command.Export.label" tooltip="%command.Export.tooltip" image="res/icon/gui/script24.png" modify-model="false">
208+
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
209+
<Handler class="fr.softeam.toscadesigner.handlers.commands.CreateDiagramCommand">
210+
<HParameter name="name" value=""/>
211+
</Handler>
212+
</Command>
213+
<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">
214+
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
215+
<Handler class="DiagramCreate">
216+
<HParameter name="name" value="ServiceTemplateDiagram"/>
217+
<HParameter name="stereotype" value="ToscaDesigner#ServiceTemplateDiagram"/>
218+
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
219+
<HParameter name="style" value="ToscaStyle"/>
220+
</Handler>
221+
</Command>
222+
<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">
223+
<Scope metaclass="Standard.Package" stereotype="ToscaDesigner#ToscaModel"/>
224+
<Handler class="DiagramCreate">
225+
<HParameter name="name" value="Topology Template Diagram"/>
226+
<HParameter name="stereotype" value="ToscaDesigner#TopologyTemplateDiagram"/>
227+
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
228+
<HParameter name="style" value="ToscaStyle"/>
229+
</Handler>
230+
</Command>
231+
<Command id="Tosca_Model" label="%command.Tosca_Model.label" tooltip="%command.Tosca_Model.tooltip" image="" modify-model="true">
232+
<Scope metaclass="Standard.Package" stereotype=""/>
233+
<Handler class="fr.softeam.toscadesigner.handlers.commands.CreateToscaModelCommand">
234+
<HParameter name="stereotype" value="ToscaDesigner#ToscaModel"/>
235+
<HParameter name="metaclass" value="Standard.Package"/>
236+
<HParameter name="name" value="Tosca Model"/>
237+
</Handler>
238+
</Command>
239+
</Commands>
197240
<Tools>
198241
<Tool id="Service Template" label="%tool.Service Template.label" tooltip="%tool.Service Template.tooltip" image="res/icon/gui/service_template24.png">
199242
<Scope-source metaclass="Standard.Package" stereotype=""/>
@@ -261,10 +304,10 @@
261304
</Tools>
262305
<ContextualMenu>
263306
<CommandRef refid="Export" group="" group-image=""/>
264-
<CommandRef refid="Tosca_Model" group="" group-image=""/>
265307
<CommandRef refid="Tosca_Model_Diagram" group="" group-image=""/>
266308
<CommandRef refid="Service_Template_Diagram" group="%group.Service_Template.label" group-image=""/>
267309
<CommandRef refid="Topology_Template_Diagram" group="%group.Topology_Template.label" group-image=""/>
310+
<CommandRef refid="Tosca_Model" group="" group-image=""/>
268311
</ContextualMenu>
269312
<Diagrams>
270313
<DiagramType base-diagram="Standard.StaticDiagram" stereotype="ToscaDesigner#CloudServiceArchiveDiagram">

ToscaDesigner/src/main/conf/module_fr.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ command.Topology_Template_Diagram.label=Topology_Template_Diagram
99
command.Topology_Template_Diagram.tooltip=
1010
command.Tosca_Model.label=Tosca_Model
1111
command.Tosca_Model.tooltip=
12-
command.Tosca_Model_Diagram.label=Cloud_Service_Archive_Diagram
12+
command.Tosca_Model_Diagram.label=Tosca_Model_Diagram
1313
command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifact_Template.label=Artifact_Template
49 Bytes
Binary file not shown.

ToscaDesigner/src/main/java/fr/CreateDiagramCommand.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import com.modeliosoft.modelio.javadesigner.annotations.objid;
44
import org.modelio.api.module.IPeerModule;
55

6-
@objid ("745e8552-1434-4a52-bbdb-a48099286cb1")
6+
@objid ("105df991-0621-4bda-aa85-b8dd3a5595d8")
77
public interface IToscaDesignerPeerModule extends IPeerModule {
8-
@objid ("d8c00e1c-5e3d-46d0-8c79-bb999667b16d")
8+
@objid ("3a68a8c0-4049-43a0-bf59-ce7c4b348f9b")
99
public static final String MODULE_NAME = "ToscaDesigner";
1010

11-
@objid ("4241d814-168c-43ef-8e0c-0f4c92a4d326")
11+
@objid ("de1cfebb-0162-472f-a6e6-c2c50320d325")
1212
public static final String TOSCA_STYLE = "ToscaStyle";
1313
}
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
import com.modeliosoft.modelio.javadesigner.annotations.objid;
44

5-
@objid ("aa191bd6-71da-46d9-a64c-1970b7129c0a")
5+
@objid ("ad8f54e4-287c-4af6-bc40-59ab40a14495")
66
public interface ToscaDesignerParameters {}
77

0 commit comments

Comments
 (0)