Skip to content

Commit e429ba8

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Open diagram when adding a tool
Diagram opens automatically when adding a tool in the camel model diagram
1 parent ec896f2 commit e429ba8

31 files changed

Lines changed: 793 additions & 415 deletions

‎pom.xml‎

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

‎src/main/conf/module.properties‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,20 @@ command.Camel_Model_Diagram.label=Camel_Model_Diagram
77
command.Camel_Model_Diagram.tooltip=
88
command.DataModel.label=DataModel
99
command.DataModel.tooltip=
10+
command.Data_Instance_Diagram.label=Data_Instance_Diagram
11+
command.Data_Instance_Diagram.tooltip=
12+
command.Data_Instance_Model.label=Data_Instance_Model
13+
command.Data_Instance_Model.tooltip=
1014
command.Data_Model_Diagram.label=Data_Model_Diagram
1115
command.Data_Model_Diagram.tooltip=
16+
command.Deployment_Instance_Diagram.label=Deployment_Instance_Diagram
17+
command.Deployment_Instance_Diagram.tooltip=
18+
command.Deployment_Instance_Model.label=Deployment_Instance_Model
19+
command.Deployment_Instance_Model.tooltip=
1220
command.Deployment_Model.label=Deployment_Model
1321
command.Deployment_Model.tooltip=
1422
command.Deployment_Model_diagram.label=Deployment_Model_diagram
1523
command.Deployment_Model_diagram.tooltip=
16-
command.Deployment_Type_Model.label=Deployment_Type_Model
17-
command.Deployment_Type_Model.tooltip=
18-
command.Deployment_Type_Model_Diagram.label=Deployment_Type_Model
19-
command.Deployment_Type_Model_Diagram.tooltip=
2024
command.Execution_Model.label=Execution_Model
2125
command.Execution_Model.tooltip=
2226
command.Execution_Model_Diagram.label=Execution_Model_Diagram
@@ -70,6 +74,7 @@ group.Constraint.label=Constraint
7074
group.Create\ diagram.label=Create diagram
7175
group.Create_element.label=Create_element
7276
group.Data.label=Data
77+
group.Data_Instance.label=Data_Instance
7378
group.Deployment_Instance.label=Deployment Instance
7479
group.Deployment_Type.label=Deployment_Type
7580
group.Execution.label=Execution
@@ -101,6 +106,8 @@ notetype.updateCommand.label=updateCommand
101106
notetype.uploadCommand.description=
102107
notetype.uploadCommand.label=uploadCommand
103108

109+
profile.Automatic.description=
110+
profile.Automatic.label=Automatic
104111
profile.CamelCore.description=
105112
profile.CamelCore.label=CamelCore
106113
profile.CamelDiagrams.description=
@@ -233,6 +240,8 @@ stereotype.Data.description=
233240
stereotype.Data.label=Data
234241
stereotype.DataInstance.description=
235242
stereotype.DataInstance.label=DataInstance
243+
stereotype.DataInstanceDiagram.description=
244+
stereotype.DataInstanceDiagram.label=DataInstanceDiagram
236245
stereotype.DataInstanceModel.description=
237246
stereotype.DataInstanceModel.label=DataInstanceModel
238247
stereotype.DataInstanceModelDiagram.description=
@@ -251,6 +260,8 @@ stereotype.DataSourceInstance.description=
251260
stereotype.DataSourceInstance.label=DataSourceInstance
252261
stereotype.DataTypeModel.description=
253262
stereotype.DataTypeModel.label=DataTypeModel
263+
stereotype.DeploymentInstanceDiagram.description=
264+
stereotype.DeploymentInstanceDiagram.label=DeploymentInstanceDiagram
254265
stereotype.DeploymentInstanceModel.description=
255266
stereotype.DeploymentInstanceModel.label=DeploymentInstanceModel
256267
stereotype.DeploymentInstanceModelDiagram.description=
@@ -1074,12 +1085,18 @@ wizard.CamelViewPoint.label=CamelViewPoint
10741085
wizard.ConstraintModelDiagram.detail=
10751086
wizard.ConstraintModelDiagram.info=
10761087
wizard.ConstraintModelDiagram.label=ConstraintModelDiagram
1088+
wizard.DataInstanceDiagram.detail=
1089+
wizard.DataInstanceDiagram.info=
1090+
wizard.DataInstanceDiagram.label=DataInstanceDiagram
10771091
wizard.DataModelDiagram.detail=
10781092
wizard.DataModelDiagram.info=
10791093
wizard.DataModelDiagram.label=DataModelDiagram
10801094
wizard.DeploymentModelDiagram.detail=
10811095
wizard.DeploymentModelDiagram.info=
10821096
wizard.DeploymentModelDiagram.label=DeploymentModelDiagram
1097+
wizard.Deployment_Instance_Diagram.detail=
1098+
wizard.Deployment_Instance_Diagram.info=
1099+
wizard.Deployment_Instance_Diagram.label=DeploymentInstanceDiagram
10831100
wizard.ExecutionModelDiagram.detail=
10841101
wizard.ExecutionModelDiagram.info=
10851102
wizard.ExecutionModelDiagram.label=ExecutionModelDiagram

‎src/main/conf/module.xml‎

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<Image path="res/icon/gui/typeModelDiagram_48.png"/>
216216
</Stereotype>
217217
<Stereotype name="UnitModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.UnitModelDiagram.label" uid="447f259a-1b5e-46e1-8721-8c09653baaff" is-abstract="false">
218-
<Icon path="res/icon/gui/unitModelDiagram_24.png"/>
218+
<Icon path="res/icon/gui/unitModel_24.png"/>
219219
<Image path="res/icon/gui/unitModelDiagram_48.png"/>
220220
</Stereotype>
221221
</Profile>
@@ -1235,6 +1235,16 @@
12351235
</TagTypes>
12361236
</Stereotype>
12371237
</Profile>
1238+
<Profile uid="399cff28-d0bd-43fe-8ac6-eb3d62a4cf57" id="Automatic">
1239+
<Stereotype name="DataInstanceDiagram" metaclass="Standard.StaticDiagram" owner-stereotype="" is-hidden="false" label="%stereotype.DataInstanceDiagram.label" uid="8ab145ba-4bc6-410d-be7a-b17e36147115" is-abstract="false">
1240+
<Icon path="res/icon/gui/DataInstanceEmpty_24.png"/>
1241+
<Image path=""/>
1242+
</Stereotype>
1243+
<Stereotype name="DeploymentInstanceDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="" is-hidden="false" label="%stereotype.DeploymentInstanceDiagram.label" uid="b5ff2f96-fb60-424e-ae18-02b24209d1af" is-abstract="false">
1244+
<Icon path="res/icon/gui/DeploymentTypeModelDiagram_24.png"/>
1245+
<Image path=""/>
1246+
</Stereotype>
1247+
</Profile>
12381248
</Profiles>
12391249
<Gui>
12401250
<Commands>
@@ -1423,19 +1433,36 @@
14231433
<HParameter name="style" value="CamelStyle"/>
14241434
</Handler>
14251435
</Command>
1426-
<Command id="Deployment_Type_Model" label="%command.Deployment_Type_Model.label" tooltip="%command.Deployment_Type_Model.tooltip" image="res/icon/gui/DeploymentTypeModel_48.ICON.png" modify-model="false">
1427-
<Scope metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
1428-
<Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateDeploymentModelCommand"/>
1436+
<Command id="Deployment_Instance_Model" label="%command.Deployment_Instance_Model.label" tooltip="%command.Deployment_Instance_Model.tooltip" image="res/icon/gui/DeploymentInstanceEmpty_24.png" modify-model="true">
1437+
<Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
1438+
<Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateDeploymentInstanceModelCommand">
1439+
<HParameter name="name" value=""/>
1440+
</Handler>
14291441
</Command>
1430-
<Command id="Deployment_Type_Model_Diagram" label="%command.Deployment_Type_Model_Diagram.label" tooltip="%command.Deployment_Type_Model_Diagram.tooltip" image="" modify-model="false">
1431-
<Scope metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
1442+
<Command id="Deployment_Instance_Diagram" label="%command.Deployment_Instance_Diagram.label" tooltip="%command.Deployment_Instance_Diagram.tooltip" image="res/icon/gui/DeploymentTypeModelDiagram_24.png" modify-model="false">
1443+
<Scope metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentInstanceModel"/>
14321444
<Handler class="DiagramCreate">
14331445
<HParameter name="name" value="Diagram"/>
1434-
<HParameter name="stereotype" value="CamelDesigner#DeploymentModelDiagram"/>
1446+
<HParameter name="stereotype" value="CamelDesigner#DeploymentInstanceDiagram"/>
14351447
<HParameter name="metaclass" value="Standard.ClassDiagram"/>
14361448
<HParameter name="style" value="CamelStyle"/>
14371449
</Handler>
14381450
</Command>
1451+
<Command id="Data_Instance_Model" label="%command.Data_Instance_Model.label" tooltip="%command.Data_Instance_Model.tooltip" image="res/icon/gui/DataInstanceEmpty_24.png" modify-model="true">
1452+
<Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
1453+
<Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateDataInstanceModelCommand">
1454+
<HParameter name="name" value="Diagram"/>
1455+
</Handler>
1456+
</Command>
1457+
<Command id="Data_Instance_Diagram" label="%command.Data_Instance_Diagram.label" tooltip="%command.Data_Instance_Diagram.tooltip" image="res/icon/gui/dataInstanceModelDiagram_48.ICON.png" modify-model="false">
1458+
<Scope metaclass="Standard.Package" stereotype="CamelDesigner#DataInstanceModel"/>
1459+
<Handler class="DiagramCreate">
1460+
<HParameter name="name" value="Diagram"/>
1461+
<HParameter name="stereotype" value="CamelDesigner#DataInstanceDiagram"/>
1462+
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
1463+
<HParameter name="style" value="CamelStyle"/>
1464+
</Handler>
1465+
</Command>
14391466
</Commands>
14401467
<Tools>
14411468
<Tool id="Action_Instance" label="%tool.Action_Instance.label" tooltip="%tool.Action_Instance.tooltip" image="res/icon/gui/ActionInstance_24.png">
@@ -2410,8 +2437,8 @@
24102437
</Handler>
24112438
</Tool>
24122439
<Tool id="UnitModel" label="%tool.UnitModel.label" tooltip="%tool.UnitModel.tooltip" image="res/icon/gui/unitModel_24.png">
2413-
<Scope-source metaclass="Standard.Package" stereotype=""/>
2414-
<Handler class="Box">
2440+
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
2441+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateUnitModelTool">
24152442
<HParameter name="stereotype" value="CamelDesigner#UnitModel"/>
24162443
<HParameter name="metaclass" value="Standard.Package"/>
24172444
<HParameter name="name" value="Unit Model"/>
@@ -2491,7 +2518,6 @@
24912518
<ContextualMenu>
24922519
<CommandRef refid="Camel_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
24932520
<CommandRef refid="Data_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
2494-
<CommandRef refid="Data_Intance_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
24952521
<CommandRef refid="Execution_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
24962522
<CommandRef refid="Location_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
24972523
<CommandRef refid="Metadata_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
@@ -2503,7 +2529,8 @@
25032529
<CommandRef refid="Unit_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
25042530
<CommandRef refid="Deployment_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
25052531
<CommandRef refid="Type_Model_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
2506-
<CommandRef refid="Constraint_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
2532+
<CommandRef refid="Data_Instance_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
2533+
<CommandRef refid="Deployment_Instance_Diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
25072534
<CommandRef refid="DataModel" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
25082535
<CommandRef refid="Deployment_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
25092536
<CommandRef refid="Execution_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
@@ -2517,6 +2544,8 @@
25172544
<CommandRef refid="TypeModel" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
25182545
<CommandRef refid="UnitModel" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
25192546
<CommandRef refid="Camel_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
2547+
<CommandRef refid="Data_Instance_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
2548+
<CommandRef refid="Deployment_Instance_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
25202549
<CommandRef refid="Export" group="" group-image=""/>
25212550
<CommandRef refid="Import" group="" group-image=""/>
25222551
</ContextualMenu>
@@ -2829,6 +2858,7 @@
28292858
</DiagramType>
28302859
<DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#TypeModelDiagram">
28312860
<Palette keepBasePalette="false">
2861+
<ToolRef refid="TypeModel" group="%group.Type.label"/>
28322862
<ToolRef refid="Feature" group="%group.Common.label"/>
28332863
<ToolRef refid="Attribute_Attribute" group="%group.Common.label"/>
28342864
<ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
@@ -2877,6 +2907,24 @@
28772907
<HParameter name="metaclass" value="Standard.ClassDiagram"/>
28782908
</Handler>
28792909
</DiagramType>
2910+
<DiagramType base-diagram="Standard.StaticDiagram" stereotype="CamelDesigner#DataInstanceDiagram">
2911+
<Palette keepBasePalette="false">
2912+
<ToolRef refid="DataInstance" group="%group.Data_Instance.label"/>
2913+
</Palette>
2914+
<Handler class="StandardCustomizer">
2915+
<HParameter name="stereotype" value="CamelDesigner#DataInstanceDiagram"/>
2916+
<HParameter name="metaclass" value="Standard.StaticDiagram"/>
2917+
</Handler>
2918+
</DiagramType>
2919+
<DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DeploymentInstanceDiagram">
2920+
<Palette keepBasePalette="false">
2921+
<ToolRef refid="Deployment_Instance_Model" group="%group.Deployment_Instance.label"/>
2922+
</Palette>
2923+
<Handler class="StandardCustomizer">
2924+
<HParameter name="stereotype" value="CamelDesigner#DeploymentInstanceDiagram"/>
2925+
<HParameter name="metaclass" value="Standard.ClassDiagram"/>
2926+
</Handler>
2927+
</DiagramType>
28802928
</Diagrams>
28812929
<Views>
28822930
<PropertyPage id="Camel" class="fr.softeam.cameldesigner.handlers.propertypages.CamelPropertyPageHandler" label="%propertypage.Camel.label" image="res/icon/gui/camel_only_24.png"/>

‎src/main/conf/res/generated/patterns/framework.umlt‎

-1 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)