Skip to content

Commit 239f5e6

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Capability type fixed in Tcapability definition property page
+ Fix: Policy type magically disappeared ( icon+ prop page)
1 parent 6a031ea commit 239f5e6

File tree

105 files changed

+3381
-2590
lines changed

Some content is hidden

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

105 files changed

+3381
-2590
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ propertydefinition.TBoundaryDefinitionsTable.propertyConstraints.description=
9292
propertydefinition.TBoundaryDefinitionsTable.propertyConstraints.label=propertyConstraints
9393
propertydefinition.TBoundaryDefinitionsTable.requirements.description=
9494
propertydefinition.TBoundaryDefinitionsTable.requirements.label=requirements
95-
propertydefinition.TCapabilityDefinitionTable.capabilityType.description=
96-
propertydefinition.TCapabilityDefinitionTable.capabilityType.label=capabilityType
9795
propertydefinition.TCapabilityDefinitionTable.constraints.description=
9896
propertydefinition.TCapabilityDefinitionTable.constraints.label=constraints
9997
propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
@@ -238,10 +236,10 @@ propertydefinition.TPlansPropertyTable.targetNamespace.description=
238236
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
239237
propertydefinition.TPolicyTable.policyRef.description=
240238
propertydefinition.TPolicyTable.policyRef.label=policyRef
241-
propertydefinition.TPolicyTypePropertyTable.description.description=
242-
propertydefinition.TPolicyTypePropertyTable.description.label=description
243-
propertydefinition.TPolicyTypePropertyTable.policyLanguage.description=
244-
propertydefinition.TPolicyTypePropertyTable.policyLanguage.label=policyLanguage
239+
propertydefinition.TPolicyTypePropertyPage.description.description=
240+
propertydefinition.TPolicyTypePropertyPage.description.label=description
241+
propertydefinition.TPolicyTypePropertyPage.policyLanguage.description=
242+
propertydefinition.TPolicyTypePropertyPage.policyLanguage.label=policyLanguage
245243
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.description=
246244
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.label=serviceTemplatePropertyRef
247245
propertydefinition.TPropertyMappingTable.targetObjectRef.description=
@@ -309,7 +307,7 @@ propertytable.TOperationTable.label=TOperationTable
309307
propertytable.TParameterTable.label=TParameterTable
310308
propertytable.TPlansPropertyTable.label=TPlansPropertyTable
311309
propertytable.TPolicyTable.label=TPolicyTable
312-
propertytable.TPolicyTypePropertyTable.label=TPolicyTypePropertyTable
310+
propertytable.TPolicyTypePropertyPage.label=TPolicyTypePropertyPage
313311
propertytable.TPropertyMappingTable.label=TPropertyMappingTable
314312
propertytable.TRelationshipTypePropertyTable.label=TRelationshipTypePropertyTable
315313
propertytable.TRequirementDefinitionTable.label=TRequirementDefinitionTable
@@ -433,6 +431,8 @@ stereotype.TCapabilityDefinitionsType.description=
433431
stereotype.TCapabilityDefinitionsType.label=CapabilityDefinitionsType
434432
stereotype.TCapabilityRef.description=
435433
stereotype.TCapabilityRef.label=TCapabilityRef
434+
stereotype.TCapabilityType.description=
435+
stereotype.TCapabilityType.label=TCapabilityType
436436
stereotype.TCondition.description=
437437
stereotype.TCondition.label=TCondition
438438
stereotype.TConstraint.description=

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,6 @@
340340
<TypeRef id="mref#'Element' {b58969db-144e-4a1f-b946-cd6deacca9bd} Infrastructure.PropertyType"/>
341341
<Description>%propertydefinition.TCapabilityDefinitionTable.constraints.description</Description>
342342
</PropertyDefinition>
343-
<PropertyDefinition id="capabilityType" label="%propertydefinition.TCapabilityDefinitionTable.capabilityType.label" default-value="" is-editable="true" uid="d92d0b5f-92dc-4ece-8007-afd0ea307098">
344-
<TypeRef id="mref#'Element' {b58969db-144e-4a1f-b946-cd6deacca9bd} Infrastructure.PropertyType"/>
345-
<Description>%propertydefinition.TCapabilityDefinitionTable.capabilityType.description</Description>
346-
</PropertyDefinition>
347343
<PropertyDefinition id="lowerBound" label="%propertydefinition.TCapabilityDefinitionTable.lowerBound.label" default-value="" is-editable="true" uid="2a352928-d0d5-4e77-bbb4-9f69dc69b952">
348344
<TypeRef id="mref#'Integer' {01a40888-0000-002d-0000-000000000000} Infrastructure.PropertyType"/>
349345
<Description>%propertydefinition.TCapabilityDefinitionTable.lowerBound.description</Description>
@@ -376,6 +372,10 @@
376372
</PropertyDefinition>
377373
</PropertyTable>
378374
</Stereotype>
375+
<Stereotype name="TCapabilityType" metaclass="Standard.Attribute" owner-stereotype="" is-hidden="false" label="%stereotype.TCapabilityType.label" uid="42438c96-0721-406a-a8b9-c4a85931cc60" is-abstract="false">
376+
<Icon path="res/icon/gui/capabilityType24.ICON.png"/>
377+
<Image path="res/icon/gui/capabilityType48.IMAGE.png"/>
378+
</Stereotype>
379379
<Stereotype name="TCondition" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.TCondition.label" uid="23173eee-1647-44eb-8aad-825b079ed69f" is-abstract="false">
380380
<Icon path=""/>
381381
<Image path=""/>
@@ -772,14 +772,14 @@
772772
<Stereotype name="TPolicyType" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.TPolicyType.label" uid="b76dbc7d-8b6f-46f8-89d4-f0ea8eea40d2" is-abstract="false">
773773
<Icon path="res/icon/gui/tpolicytype24.ICON.png"/>
774774
<Image path="res/icon/gui/tpolicytype48.IMAGE.png"/>
775-
<PropertyTable id="TPolicyTypePropertyTable" label="%propertytable.TPolicyTypePropertyTable.label" uid="98fa2d7e-8453-4cbc-9224-3dc54fc12503">
776-
<PropertyDefinition id="description" label="%propertydefinition.TPolicyTypePropertyTable.description.label" default-value="" is-editable="true" uid="bd925b2d-cb4e-4667-86d4-feaeda676f4b">
775+
<PropertyTable id="TPolicyTypePropertyPage" label="%propertytable.TPolicyTypePropertyPage.label" uid="89cd71c7-7594-4686-a240-f8226a802249">
776+
<PropertyDefinition id="policyLanguage" label="%propertydefinition.TPolicyTypePropertyPage.policyLanguage.label" default-value="" is-editable="true" uid="97ff5a65-420b-4f0b-bc9e-dcb36130f88e">
777777
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
778-
<Description>%propertydefinition.TPolicyTypePropertyTable.description.description</Description>
778+
<Description>%propertydefinition.TPolicyTypePropertyPage.policyLanguage.description</Description>
779779
</PropertyDefinition>
780-
<PropertyDefinition id="policyLanguage" label="%propertydefinition.TPolicyTypePropertyTable.policyLanguage.label" default-value="" is-editable="true" uid="a844e99e-6efe-4626-b992-ff0f50c5d6ff">
780+
<PropertyDefinition id="description" label="%propertydefinition.TPolicyTypePropertyPage.description.label" default-value="" is-editable="true" uid="cb984791-bc72-4469-91fa-ff5a2259f1a2">
781781
<TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
782-
<Description>%propertydefinition.TPolicyTypePropertyTable.policyLanguage.description</Description>
782+
<Description>%propertydefinition.TPolicyTypePropertyPage.description.description</Description>
783783
</PropertyDefinition>
784784
</PropertyTable>
785785
</Stereotype>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ propertydefinition.TBoundaryDefinitionsTable.propertyConstraints.description=
9292
propertydefinition.TBoundaryDefinitionsTable.propertyConstraints.label=propertyConstraints
9393
propertydefinition.TBoundaryDefinitionsTable.requirements.description=
9494
propertydefinition.TBoundaryDefinitionsTable.requirements.label=requirements
95-
propertydefinition.TCapabilityDefinitionTable.capabilityType.description=
96-
propertydefinition.TCapabilityDefinitionTable.capabilityType.label=capabilityType
9795
propertydefinition.TCapabilityDefinitionTable.constraints.description=
9896
propertydefinition.TCapabilityDefinitionTable.constraints.label=constraints
9997
propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
@@ -238,10 +236,10 @@ propertydefinition.TPlansPropertyTable.targetNamespace.description=
238236
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
239237
propertydefinition.TPolicyTable.policyRef.description=
240238
propertydefinition.TPolicyTable.policyRef.label=policyRef
241-
propertydefinition.TPolicyTypePropertyTable.description.description=
242-
propertydefinition.TPolicyTypePropertyTable.description.label=description
243-
propertydefinition.TPolicyTypePropertyTable.policyLanguage.description=
244-
propertydefinition.TPolicyTypePropertyTable.policyLanguage.label=policyLanguage
239+
propertydefinition.TPolicyTypePropertyPage.description.description=
240+
propertydefinition.TPolicyTypePropertyPage.description.label=description
241+
propertydefinition.TPolicyTypePropertyPage.policyLanguage.description=
242+
propertydefinition.TPolicyTypePropertyPage.policyLanguage.label=policyLanguage
245243
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.description=
246244
propertydefinition.TPropertyMappingTable.serviceTemplatePropertyRef.label=serviceTemplatePropertyRef
247245
propertydefinition.TPropertyMappingTable.targetObjectRef.description=
@@ -309,7 +307,7 @@ propertytable.TOperationTable.label=TOperationTable
309307
propertytable.TParameterTable.label=TParameterTable
310308
propertytable.TPlansPropertyTable.label=TPlansPropertyTable
311309
propertytable.TPolicyTable.label=TPolicyTable
312-
propertytable.TPolicyTypePropertyTable.label=TPolicyTypePropertyTable
310+
propertytable.TPolicyTypePropertyPage.label=TPolicyTypePropertyPage
313311
propertytable.TPropertyMappingTable.label=TPropertyMappingTable
314312
propertytable.TRelationshipTypePropertyTable.label=TRelationshipTypePropertyTable
315313
propertytable.TRequirementDefinitionTable.label=TRequirementDefinitionTable
@@ -433,6 +431,8 @@ stereotype.TCapabilityDefinitionsType.description=
433431
stereotype.TCapabilityDefinitionsType.label=CapabilityDefinitionsType
434432
stereotype.TCapabilityRef.description=
435433
stereotype.TCapabilityRef.label=TCapabilityRef
434+
stereotype.TCapabilityType.description=
435+
stereotype.TCapabilityType.label=TCapabilityType
436436
stereotype.TCondition.description=
437437
stereotype.TCondition.label=TCondition
438438
stereotype.TConstraint.description=

‎ToscaDesigner/src/main/conf/res/icon/gui/capabilityType24.ICON.png‎

422 Bytes
Loading

‎ToscaDesigner/src/main/conf/res/icon/gui/capabilityType24.png‎

859 Bytes
Loading

‎ToscaDesigner/src/main/conf/res/icon/gui/capabilityType48.IMAGE.png‎

516 Bytes
Loading

‎ToscaDesigner/src/main/conf/res/icon/gui/capabilityType48.png‎

1.7 KB
Loading

‎ToscaDesigner/src/main/conf/res/icon/gui/svg/capabilityType.svg‎

Lines changed: 63 additions & 0 deletions
Loading

‎ToscaDesigner/src/main/conf/res/icon/gui/tpolicy48.IMAGE.png‎

715 Bytes
Loading

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

434 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)