Skip to content

Commit b2a1c30

Browse files
juancadavidjuancadavid
committed
Trigger tool. And we stay in this branch.
1 parent eb4fb70 commit b2a1c30

File tree

169 files changed

+6035
-4727
lines changed

Some content is hidden

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

169 files changed

+6035
-4727
lines changed

‎.classpath‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<attribute name="maven.pomderived" value="true"/>
2020
</attributes>
2121
</classpathentry>
22-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
2323
<attributes>
2424
<attribute name="maven.pomderived" value="true"/>
2525
</attributes>
@@ -36,5 +36,22 @@
3636
<attribute name="optional" value="true"/>
3737
</attributes>
3838
</classpathentry>
39+
<classpathentry kind="src" path="target/generated-sources/annotations">
40+
<attributes>
41+
<attribute name="optional" value="true"/>
42+
<attribute name="maven.pomderived" value="true"/>
43+
<attribute name="ignore_optional_problems" value="true"/>
44+
<attribute name="m2e-apt" value="true"/>
45+
</attributes>
46+
</classpathentry>
47+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
48+
<attributes>
49+
<attribute name="optional" value="true"/>
50+
<attribute name="maven.pomderived" value="true"/>
51+
<attribute name="ignore_optional_problems" value="true"/>
52+
<attribute name="m2e-apt" value="true"/>
53+
<attribute name="test" value="true"/>
54+
</attributes>
55+
</classpathentry>
3956
<classpathentry kind="output" path="target/classes"/>
4057
</classpath>

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
3-
org.eclipse.jdt.core.compiler.compliance=11
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
3+
org.eclipse.jdt.core.compiler.compliance=1.8
44
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
55
org.eclipse.jdt.core.compiler.debug.localVariable=generate
66
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
1111
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
1212
org.eclipse.jdt.core.compiler.processAnnotations=disabled
1313
org.eclipse.jdt.core.compiler.release=enabled
14-
org.eclipse.jdt.core.compiler.source=11
14+
org.eclipse.jdt.core.compiler.source=1.8

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- definition -->
88
<groupId>fr.softeam</groupId>
99
<artifactId>toscadesigner</artifactId>
10-
<version>0.5.3</version>
10+
<version>0.5.1</version>
1111
<name>ToscaDesigner</name>
1212

1313
<description>
@@ -64,7 +64,7 @@ This module typically provides a graphical user interface (GUI) or integrated de
6464
<artifactId>maven-compiler-plugin</artifactId>
6565
<version>3.14.0</version>
6666
<configuration>
67-
<release>8</release>
67+
<release>11</release>
6868
<encoding>${project.build.sourceEncoding}</encoding>
6969
</configuration>
7070
</plugin>

‎src/main/conf/module.properties‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
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. \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.\n
2-
ModuleLabel=ToscaDesigner
1+
ModuleDescription=
2+
ModuleLabel=
33

44
command.Export.label=Export
5-
command.Export.tooltip=Export
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=
1010
command.Tosca_Model.label=Tosca_Model
1111
command.Tosca_Model.tooltip=
12-
command.Tosca_Model_Diagram.label=Tosca Model
12+
command.Tosca_Model_Diagram.label=Tosca_Model_Diagram
1313
command.Tosca_Model_Diagram.tooltip=
1414

1515
group.Artifacts.label=Artifacts
1616
group.Attributes.label=Attributes
1717
group.Capabilities.label=Capabilities
1818
group.Constraints.label=Constraints
19-
group.Others.label=Others
19+
group.Others.label=Capabilities
2020
group.Plans.label=Plans
21+
group.Policies.label=Policies
2122
group.Policy.label=Policy
2223
group.Requirement.label=Requirement
2324
group.Requirements.label=Requirements
@@ -311,7 +312,7 @@ propertydefinition.TriggerTable.schedule.description=
311312
propertydefinition.TriggerTable.schedule.label=schedule
312313
propertydefinition.TriggerTable.target_filter.description=
313314
propertydefinition.TriggerTable.target_filter.label=target_filter
314-
propertypage.ToscaPropertyPage.label=ToscaAttributePage
315+
propertypage.ToscaPropertyPage.label=ToscaPropertyPage
315316
propertytable.CapabilitiesTypePropertyPage.label=CapabilitiesTypePropertyPage
316317
propertytable.ImportElementPropertyTable.label=ImportElementPropertyTable
317318
propertytable.InstanceStateTypeTable.label=InstanceStateTypeTable
@@ -339,7 +340,7 @@ propertytable.TExtensibleElementsTable.label=TExtensibleElementsTable
339340
propertytable.TExtensionTable.label=TExtensionTable
340341
propertytable.TImplementationArtifactTable.label=TImplementationArtifactTable
341342
propertytable.TInterfaceTable.label=TInterfaceTable
342-
propertytable.TNodeTemplateProperty.label=TNodeTemplateProperty
343+
propertytable.TNodeTemplateProperty.label=TNodeTemplatePropertyTable
343344
propertytable.TOperationTable.label=TOperationTable
344345
propertytable.TParameterTable.label=TParameterTable
345346
propertytable.TPlansPropertyTable.label=TPlansPropertyTable
@@ -468,7 +469,7 @@ stereotype.TCapability.label=TCapability
468469
stereotype.TCapabilityDefinition.description=
469470
stereotype.TCapabilityDefinition.label=TCapabilityDefinition
470471
stereotype.TCapabilityDefinitionsType.description=
471-
stereotype.TCapabilityDefinitionsType.label=CapabilityDefinitionsType
472+
stereotype.TCapabilityDefinitionsType.label=TCapabilityDefinitionsType
472473
stereotype.TCapabilityRef.description=
473474
stereotype.TCapabilityRef.label=TCapabilityRef
474475
stereotype.TCapabilityType.description=
@@ -499,6 +500,8 @@ stereotype.TExtension.description=
499500
stereotype.TExtension.label=TExtension
500501
stereotype.TExtensions.description=
501502
stereotype.TExtensions.label=TExtensions
503+
stereotype.TGroup.description=
504+
stereotype.TGroup.label=Tgroup
502505
stereotype.TGroupType.description=
503506
stereotype.TGroupType.label=TGroupType
504507
stereotype.TImplementationArtifact.description=
@@ -540,7 +543,7 @@ stereotype.TRequirement.label=TRequirement
540543
stereotype.TRequirementDefinition.description=
541544
stereotype.TRequirementDefinition.label=TRequirementDefinition
542545
stereotype.TRequirementDefinitionType.description=
543-
stereotype.TRequirementDefinitionType.label=RequirementDefinitionsType
546+
stereotype.TRequirementDefinitionType.label=TRequirementDefinitionType
544547
stereotype.TRequirementRef.description=
545548
stereotype.TRequirementRef.label=TRequirementRef
546549
stereotype.TServiceTemplate.description=
@@ -553,8 +556,6 @@ stereotype.TargetElementType.description=
553556
stereotype.TargetElementType.label=TargetElementType
554557
stereotype.TargetInterfacesType.description=
555558
stereotype.TargetInterfacesType.label=TargetInterfacesType
556-
stereotype.Tgroup.description=
557-
stereotype.Tgroup.label=Tgroup
558559
stereotype.TopologyTemplateDiagram.description=
559560
stereotype.TopologyTemplateDiagram.label=TopologyTemplateDiagram
560561
stereotype.ToscaDiagram.description=
@@ -571,61 +572,63 @@ tagtype.Tag.label=anyAttribute
571572
tagtype.ref.description=
572573
tagtype.ref.label=ref
573574
tool.ArtifactTemplate.label=ArtifactTemplate
574-
tool.ArtifactTemplate.tooltip=ArtifactTemplate
575-
tool.Capabilities_Type.label=Capabilities Type
576-
tool.Capabilities_Type.tooltip=Capabilities Type
575+
tool.ArtifactTemplate.tooltip=
576+
tool.Capabilities_Type.label=Capabilities_Type
577+
tool.Capabilities_Type.tooltip=
577578
tool.Capability.label=Capability
578-
tool.Capability.tooltip=Capability
579+
tool.Capability.tooltip=
579580
tool.CapabilityDefinition.label=CapabilityDefinition
580-
tool.CapabilityDefinition.tooltip=CapabilityDefinition
581+
tool.CapabilityDefinition.tooltip=
581582
tool.CapabilityDefinitions.label=CapabilityDefinitions
582-
tool.CapabilityDefinitions.tooltip=Capabilities
583+
tool.CapabilityDefinitions.tooltip=
583584
tool.Constraint.label=Constraint
584-
tool.Constraint.tooltip=Constraint
585+
tool.Constraint.tooltip=
585586
tool.Constraints.label=Constraints
586-
tool.Constraints.tooltip=Constraints
587+
tool.Constraints.tooltip=
587588
tool.DeploymentArtifact.label=DeploymentArtifact
588589
tool.DeploymentArtifact.tooltip=
589590
tool.DeploymentArtifacts.label=DeploymentArtifacts
590-
tool.DeploymentArtifacts.tooltip=Deployment Artifacts
591+
tool.DeploymentArtifacts.tooltip=
591592
tool.Import.label=Import
592-
tool.Import.tooltip=Import
593+
tool.Import.tooltip=
593594
tool.Interface.label=Interface
594595
tool.Interface.tooltip=
595596
tool.Metadata.label=Metadata
596-
tool.Metadata.tooltip=Metadata
597+
tool.Metadata.tooltip=
597598
tool.NodeTemplate.label=NodeTemplate
598-
tool.NodeTemplate.tooltip=NodeTemplate
599+
tool.NodeTemplate.tooltip=
599600
tool.NodeType.label=NodeType
600-
tool.NodeType.tooltip=NodeType
601+
tool.NodeType.tooltip=
601602
tool.Plans.label=Plans
602-
tool.Plans.tooltip=Plans
603-
tool.Policies_Type.label=Policies Type
604-
tool.Policies_Type.tooltip=PoliciesType
603+
tool.Plans.tooltip=
604+
tool.Policies_Type.label=Policies_Type
605+
tool.Policies_Type.tooltip=
605606
tool.Policy.label=Policy
606607
tool.Policy.tooltip=
607-
tool.PropertyDefinition.label=Property ( Node Type)
608-
tool.PropertyDefinition.tooltip=Property ( Node Type)
609-
tool.Property_(Node_Template).label=Property (Node Template)
608+
tool.PropertyDefinition.label=PropertyDefinition
609+
tool.PropertyDefinition.tooltip=
610+
tool.Property_(Node_Template).label=Property_(Node_Template)
610611
tool.Property_(Node_Template).tooltip=
611-
tool.Property_(Node_Type).label=Property (Node Type)
612+
tool.Property_(Node_Type).label=Property_(Node_Type)
612613
tool.Property_(Node_Type).tooltip=
613614
tool.RelationshipTemplate.label=RelationshipTemplate
614-
tool.RelationshipTemplate.tooltip=RelationshipTemplate
615+
tool.RelationshipTemplate.tooltip=
615616
tool.RelationshipType.label=RelationshipType
616-
tool.RelationshipType.tooltip=RelationshipType
617-
tool.Requirement_NodeTemplate.label=Requirement
618-
tool.Requirement_NodeTemplate.tooltip=Requirement
619-
tool.Requirement_NodeType.label=Requirement
620-
tool.Requirement_NodeType.tooltip=Requirement
621-
tool.Requirements_NodeTemplate.label=Requirements
622-
tool.Requirements_NodeTemplate.tooltip=Requirements
623-
tool.Requirements_NodeType.label=Requirements
624-
tool.Requirements_NodeType.tooltip=Node Type Requirements
617+
tool.RelationshipType.tooltip=
618+
tool.Requirement_NodeTemplate.label=Requirement_NodeTemplate
619+
tool.Requirement_NodeTemplate.tooltip=
620+
tool.Requirement_NodeType.label=Requirement_NodeType
621+
tool.Requirement_NodeType.tooltip=
622+
tool.Requirements_NodeTemplate.label=Requirements_NodeTemplate
623+
tool.Requirements_NodeTemplate.tooltip=
624+
tool.Requirements_NodeType.label=Requirements_NodeType
625+
tool.Requirements_NodeType.tooltip=
625626
tool.Service\ Template.label=Service Template
626627
tool.Service\ Template.tooltip=
627628
tool.TopologyTemplate.label=TopologyTemplate
628-
tool.TopologyTemplate.tooltip=TopologyTemplate
629+
tool.TopologyTemplate.tooltip=
630+
tool.Trigger.label=Trigger
631+
tool.Trigger.tooltip=
629632

630633
wizard.ServiceTemplateDiagram.detail=
631634
wizard.ServiceTemplateDiagram.info=

‎src/main/conf/module.xml‎

Lines changed: 13 additions & 4 deletions
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="6.1.01" version="0.1.0" schema-level="2" uid="942db9f9-6869-472c-b269-9ca7ec36a014" author="Softeam" image="" url="">
2+
<Module id="ToscaDesigner" class="fr.softeam.toscadesigner.impl.ToscaDesignerModule" binaryversion="6.1.01" version="0.5.1" 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
<PathEntry path="lib/handlebars-4.3.1.jar"/>
@@ -669,7 +669,7 @@
669669
<Icon path=""/>
670670
<Image path=""/>
671671
</Stereotype>
672-
<Stereotype name="TGroup" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.Tgroup.label" uid="572d5cb4-54c7-45d0-a9c8-3dc3677f9ef3" is-abstract="false">
672+
<Stereotype name="TGroup" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TGroup.label" uid="572d5cb4-54c7-45d0-a9c8-3dc3677f9ef3" is-abstract="false">
673673
<Icon path="res/icon/gui/Tgroup48.ICON.png"/>
674674
<Image path="res/icon/gui/Tgroup48.png"/>
675675
</Stereotype>
@@ -1333,6 +1333,14 @@
13331333
<HParameter name="name" value="Interface"/>
13341334
</Handler>
13351335
</Tool>
1336+
<Tool id="Trigger" label="%tool.Trigger.label" tooltip="%tool.Trigger.tooltip" image="res/icon/gui/Trigger24.ICON.png">
1337+
<Scope-source metaclass="Standard.Class" stereotype="ToscaDesigner#TPolicy"/>
1338+
<Handler class="Box">
1339+
<HParameter name="stereotype" value="ToscaDesigner#Trigger"/>
1340+
<HParameter name="metaclass" value="Standard.Class"/>
1341+
<HParameter name="name" value="Trigger1"/>
1342+
</Handler>
1343+
</Tool>
13361344
</Tools>
13371345
<ContextualMenu>
13381346
<CommandRef refid="Export" group="" group-image=""/>
@@ -1363,15 +1371,16 @@
13631371
<ToolRef refid="TopologyTemplate" group="%group.Templates.label"/>
13641372
<ToolRef refid="Metadata" group="%group.Attributes.label"/>
13651373
<ToolRef refid="Property_(Node_Type)" group="%group.Attributes.label"/>
1366-
<ToolRef refid="Policy" group="%group.Attributes.label"/>
1367-
<ToolRef refid="Policies_Type" group="%group.Attributes.label"/>
13681374
<ToolRef refid="Constraint" group="%group.Attributes.label"/>
13691375
<ToolRef refid="Constraints" group="%group.Attributes.label"/>
13701376
<ToolRef refid="Plans" group="%group.Plans.label"/>
13711377
<ToolRef refid="Requirements_NodeType" group="%group.Requirements.label"/>
13721378
<ToolRef refid="Requirement_NodeType" group="%group.Requirements.label"/>
13731379
<ToolRef refid="CapabilityDefinitions" group="%group.Others.label"/>
13741380
<ToolRef refid="CapabilityDefinition" group="%group.Others.label"/>
1381+
<ToolRef refid="Trigger" group="%group.Policies.label"/>
1382+
<ToolRef refid="Policy" group="%group.Policies.label"/>
1383+
<ToolRef refid="Policies_Type" group="%group.Policies.label"/>
13751384
</Palette>
13761385
<Handler class="StandardCustomizer">
13771386
<HParameter name="stereotype" value="ToscaDesigner#ServiceTemplateDiagram"/>

‎src/main/conf/module_fr.properties‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ command.Tosca_Model.tooltip=
1212
command.Tosca_Model_Diagram.label=Tosca_Model_Diagram
1313
command.Tosca_Model_Diagram.tooltip=
1414

15-
group.Artifacts.label=Relationship_Templates
16-
group.Attributes.label=Artifact_Template
15+
group.Artifacts.label=Artifacts
16+
group.Attributes.label=Attributes
1717
group.Capabilities.label=Capabilities
1818
group.Constraints.label=Constraints
19-
group.Others.label=Others
19+
group.Others.label=Capabilities
2020
group.Plans.label=Plans
21+
group.Policies.label=Policies
2122
group.Policy.label=Policy
2223
group.Requirement.label=Requirement
2324
group.Requirements.label=Requirements
2425
group.Service_Template.label=Service_Template
25-
group.Services.label=Group0
26-
group.Templates.label=Node_Templates
26+
group.Services.label=Services
27+
group.Templates.label=Templates
2728
group.Topology_Template.label=Topology_Template
2829
group.Types.label=Types
2930

@@ -311,7 +312,7 @@ propertydefinition.TriggerTable.schedule.description=
311312
propertydefinition.TriggerTable.schedule.label=schedule
312313
propertydefinition.TriggerTable.target_filter.description=
313314
propertydefinition.TriggerTable.target_filter.label=target_filter
314-
propertypage.ToscaPropertyPage.label=ToscaAttributePage
315+
propertypage.ToscaPropertyPage.label=ToscaPropertyPage
315316
propertytable.CapabilitiesTypePropertyPage.label=CapabilitiesTypePropertyPage
316317
propertytable.ImportElementPropertyTable.label=ImportElementPropertyTable
317318
propertytable.InstanceStateTypeTable.label=InstanceStateTypeTable
@@ -499,6 +500,8 @@ stereotype.TExtension.description=
499500
stereotype.TExtension.label=TExtension
500501
stereotype.TExtensions.description=
501502
stereotype.TExtensions.label=TExtensions
503+
stereotype.TGroup.description=
504+
stereotype.TGroup.label=TGroup
502505
stereotype.TGroupType.description=
503506
stereotype.TGroupType.label=TgroupType
504507
stereotype.TImplementationArtifact.description=
@@ -553,8 +556,6 @@ stereotype.TargetElementType.description=
553556
stereotype.TargetElementType.label=TargetElementType
554557
stereotype.TargetInterfacesType.description=
555558
stereotype.TargetInterfacesType.label=TargetInterfacesType
556-
stereotype.Tgroup.description=
557-
stereotype.Tgroup.label=Tgroup
558559
stereotype.TopologyTemplateDiagram.description=
559560
stereotype.TopologyTemplateDiagram.label=TopologyTemplateDiagram
560561
stereotype.ToscaDiagram.description=
@@ -578,7 +579,7 @@ tool.Capability.label=Capability
578579
tool.Capability.tooltip=
579580
tool.CapabilityDefinition.label=CapabilityDefinition
580581
tool.CapabilityDefinition.tooltip=
581-
tool.CapabilityDefinitions.label=CapabilityDefinition
582+
tool.CapabilityDefinitions.label=CapabilityDefinitions
582583
tool.CapabilityDefinitions.tooltip=
583584
tool.Constraint.label=Constraint
584585
tool.Constraint.tooltip=
@@ -596,7 +597,7 @@ tool.Metadata.label=Metadata
596597
tool.Metadata.tooltip=
597598
tool.NodeTemplate.label=NodeTemplate
598599
tool.NodeTemplate.tooltip=
599-
tool.NodeType.label=NodeTypes
600+
tool.NodeType.label=NodeType
600601
tool.NodeType.tooltip=
601602
tool.Plans.label=Plans
602603
tool.Plans.tooltip=
@@ -612,20 +613,22 @@ tool.Property_(Node_Type).label=Property_(Node_Type)
612613
tool.Property_(Node_Type).tooltip=
613614
tool.RelationshipTemplate.label=RelationshipTemplate
614615
tool.RelationshipTemplate.tooltip=
615-
tool.RelationshipType.label=RelationshipTypes
616+
tool.RelationshipType.label=RelationshipType
616617
tool.RelationshipType.tooltip=
617618
tool.Requirement_NodeTemplate.label=Requirement_NodeTemplate
618619
tool.Requirement_NodeTemplate.tooltip=
619620
tool.Requirement_NodeType.label=Requirement_NodeType
620621
tool.Requirement_NodeType.tooltip=
621622
tool.Requirements_NodeTemplate.label=Requirements_NodeTemplate
622623
tool.Requirements_NodeTemplate.tooltip=
623-
tool.Requirements_NodeType.label=Requirements
624+
tool.Requirements_NodeType.label=Requirements_NodeType
624625
tool.Requirements_NodeType.tooltip=
625626
tool.Service\ Template.label=Service Template
626627
tool.Service\ Template.tooltip=
627628
tool.TopologyTemplate.label=TopologyTemplate
628629
tool.TopologyTemplate.tooltip=
630+
tool.Trigger.label=Trigger
631+
tool.Trigger.tooltip=Add a trigger to a policy
629632

630633
wizard.ServiceTemplateDiagram.detail=
631634
wizard.ServiceTemplateDiagram.info=
@@ -635,4 +638,4 @@ wizard.TopologyTemplateDiagram.info=
635638
wizard.TopologyTemplateDiagram.label=TopologyTemplateDiagram
636639
wizard.ToscaDiagram.detail=
637640
wizard.ToscaDiagram.info=
638-
wizard.ToscaDiagram.label=CloudServiceArchiveDiagram
641+
wizard.ToscaDiagram.label=ToscaDiagram

‎src/main/conf/toscadesigner.ramc‎

54.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)