Merge remote-tracking branch 'origin/ToscaProfile' into toscaCodeGen

Author: juancadavid

ToscaDesigner/src/main/conf/module.properties

@@ -30,6 +30,8 @@ profile.Automatic.description=
 profile.Automatic.label=Automatic
 profile.Tosca.description=
 profile.Tosca.label=Tosca
+propertydefinition.CapabilitiesTypePropertyPage.name.description=
+propertydefinition.CapabilitiesTypePropertyPage.name.label=name
 propertydefinition.ImportElementPropertyTable.File.description=
 propertydefinition.ImportElementPropertyTable.File.label=File
 propertydefinition.ImportElementPropertyTable.Namespace_prefix.description=
@@ -287,6 +289,7 @@ propertydefinition.TriggerTable.schedule.label=schedule
 propertydefinition.TriggerTable.target_filter.description=
 propertydefinition.TriggerTable.target_filter.label=target_filter
 propertypage.ToscaPropertyPage.label=ToscaAttributePage
+propertytable.CapabilitiesTypePropertyPage.label=CapabilitiesTypePropertyPage
 propertytable.ImportElementPropertyTable.label=ImportElementPropertyTable
 propertytable.InstanceStateTypeTable.label=InstanceStateTypeTable
 propertytable.NodeOperationTypeTable.label=NodeOperationTypeTable
@@ -358,6 +361,8 @@ stereotype.CapabilitiesType.description=
 stereotype.CapabilitiesType.label=CapabilitiesType
 stereotype.CapabilitiesType1.description=
 stereotype.CapabilitiesType1.label=CapabilitiesType1
+stereotype.CapabilityStereotype.description=
+stereotype.CapabilityStereotype.label=CapabilityStereotype
 stereotype.ConstraintType1.description=
 stereotype.ConstraintType1.label=ConstraintType1
 stereotype.ConstraintsType.description=

ToscaDesigner/src/main/conf/module.xml

@@ -36,8 +36,14 @@
                 <Image path=""/>
             </Stereotype>
             <Stereotype name="CapabilitiesType" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.CapabilitiesType.label" uid="37787f67-5e3f-4ce9-93fc-cc3101d5cb6f" is-abstract="false">
-                <Icon path=""/>
-                <Image path=""/>
+                <Icon path="res/icon/gui/capabilitiesType24.ICON.png"/>
+                <Image path="res/icon/gui/capabilitiesType48.IMAGE.png"/>
+                <PropertyTable id="CapabilitiesTypePropertyPage" label="%propertytable.CapabilitiesTypePropertyPage.label" uid="383dac8c-6413-4776-bb28-4277f87ea347">
+                    <PropertyDefinition id="name" label="%propertydefinition.CapabilitiesTypePropertyPage.name.label" default-value="" is-editable="true" uid="e4e6c35d-6cf7-42a3-a06c-d2932cba1eda">
+                        <TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
+                        <Description>%propertydefinition.CapabilitiesTypePropertyPage.name.description</Description>
+                    </PropertyDefinition>
+                </PropertyTable>
             </Stereotype>
             <Stereotype name="CapabilitiesType1" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.CapabilitiesType1.label" uid="1e88dd5b-b484-4f79-a6c6-4e4180c79c4a" is-abstract="false">
                 <Icon path=""/>
@@ -341,10 +347,10 @@
                 </PropertyTable>
             </Stereotype>
             <Stereotype name="TCapability" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TCapability.label" uid="92831533-b614-4124-8961-3cd7ebcad536" is-abstract="false">
-                <Icon path=""/>
-                <Image path=""/>
+                <Icon path="res/icon/gui/TCapability24.png"/>
+                <Image path="res/icon/gui/TCapability48.png"/>
             </Stereotype>
-            <Stereotype name="TCapabilityDefinition" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TCapabilityDefinition.label" uid="92f8cb40-9498-4759-9c75-6b4df72de355" is-abstract="false">
+            <Stereotype name="TCapabilityDefinition" metaclass="Standard.Class" owner-stereotype="mref#'' {54f6e81a-afca-4381-aad4-5cf823fcf192} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.TCapabilityDefinition.label" uid="92f8cb40-9498-4759-9c75-6b4df72de355" is-abstract="false">
                 <Icon path="res/icon/gui/capabilityDefinition24.png"/>
                 <Image path="res/icon/gui/capabilityDefinition48.png"/>
                 <PropertyTable id="TCapabilityDefinitionTable" label="%propertytable.TCapabilityDefinitionTable.label" uid="e2b2d181-f6b2-4a51-81dc-df962e137ef2">
@@ -384,7 +390,7 @@
                     </PropertyDefinition>
                 </PropertyTable>
             </Stereotype>
-            <Stereotype name="TCapabilityType" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.TCapabilityType.label" uid="42438c96-0721-406a-a8b9-c4a85931cc60" is-abstract="false">
+            <Stereotype name="TCapabilityType" metaclass="Standard.Class" owner-stereotype="mref#'' {54f6e81a-afca-4381-aad4-5cf823fcf192} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.TCapabilityType.label" uid="42438c96-0721-406a-a8b9-c4a85931cc60" is-abstract="false">
                 <Icon path="res/icon/gui/capabilityType24.ICON.png"/>
                 <Image path="res/icon/gui/capabilityType48.IMAGE.png"/>
             </Stereotype>
@@ -981,6 +987,10 @@
                     </PropertyDefinition>
                 </PropertyTable>
             </Stereotype>
+            <Stereotype name="CapabilityStereotype" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.CapabilityStereotype.label" uid="54f6e81a-afca-4381-aad4-5cf823fcf192" is-abstract="false">
+                <Icon path=""/>
+                <Image path=""/>
+            </Stereotype>
         </Profile>
     </Profiles>
     <PropertyTypes>

ToscaDesigner/src/main/conf/module_fr.properties

@@ -30,6 +30,8 @@ profile.Automatic.description=
 profile.Automatic.label=Automatic
 profile.Tosca.description=
 profile.Tosca.label=Tosca
+propertydefinition.CapabilitiesTypePropertyPage.name.description=
+propertydefinition.CapabilitiesTypePropertyPage.name.label=name
 propertydefinition.ImportElementPropertyTable.File.description=
 propertydefinition.ImportElementPropertyTable.File.label=File
 propertydefinition.ImportElementPropertyTable.Namespace_prefix.description=
@@ -287,6 +289,7 @@ propertydefinition.TriggerTable.schedule.label=schedule
 propertydefinition.TriggerTable.target_filter.description=
 propertydefinition.TriggerTable.target_filter.label=target_filter
 propertypage.ToscaPropertyPage.label=ToscaAttributePage
+propertytable.CapabilitiesTypePropertyPage.label=CapabilitiesTypePropertyPage
 propertytable.ImportElementPropertyTable.label=ImportElementPropertyTable
 propertytable.InstanceStateTypeTable.label=InstanceStateTypeTable
 propertytable.NodeOperationTypeTable.label=NodeOperationTypeTable
@@ -358,6 +361,8 @@ stereotype.CapabilitiesType.description=
 stereotype.CapabilitiesType.label=CapabilitiesType
 stereotype.CapabilitiesType1.description=
 stereotype.CapabilitiesType1.label=CapabilitiesType1
+stereotype.CapabilityStereotype.description=
+stereotype.CapabilityStereotype.label=CapabilityStereotype
 stereotype.ConstraintType1.description=
 stereotype.ConstraintType1.label=ConstraintType1
 stereotype.ConstraintsType.description=