policy icon update

Author: Amina-Moussaoui

ToscaDesigner/src/main/conf/module.xml

@@ -772,12 +772,12 @@
             <Stereotype name="TPolicyType" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="false" label="%stereotype.TPolicyType.label" uid="b76dbc7d-8b6f-46f8-89d4-f0ea8eea40d2" is-abstract="false">
                 <Icon path="res/icon/gui/tpolicytype24.ICON.png"/>
                 <Image path="res/icon/gui/tpolicytype48.IMAGE.png"/>
-                <PropertyTable id="TPolicyTypePropertyTable" label="%propertytable.TPolicyTypePropertyTable.label" uid="8b63b4bf-4185-48af-a337-faa6a3a19337">
-                    <PropertyDefinition id="description" label="%propertydefinition.TPolicyTypePropertyTable.description.label" default-value="" is-editable="true" uid="eb0df9aa-0b7c-4235-a8a1-f7498491e32d">
+                <PropertyTable id="TPolicyTypePropertyTable" label="%propertytable.TPolicyTypePropertyTable.label" uid="98fa2d7e-8453-4cbc-9224-3dc54fc12503">
+                    <PropertyDefinition id="description" label="%propertydefinition.TPolicyTypePropertyTable.description.label" default-value="" is-editable="true" uid="bd925b2d-cb4e-4667-86d4-feaeda676f4b">
                         <TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
                         <Description>%propertydefinition.TPolicyTypePropertyTable.description.description</Description>
                     </PropertyDefinition>
-                    <PropertyDefinition id="policyLanguage" label="%propertydefinition.TPolicyTypePropertyTable.policyLanguage.label" default-value="" is-editable="true" uid="d2f2bc40-5d08-4ac9-a826-094f3fe2974a">
+                    <PropertyDefinition id="policyLanguage" label="%propertydefinition.TPolicyTypePropertyTable.policyLanguage.label" default-value="" is-editable="true" uid="a844e99e-6efe-4626-b992-ff0f50c5d6ff">
                         <TypeRef id="mref#'Text' {01a40888-0000-002a-0000-000000000000} Infrastructure.PropertyType"/>
                         <Description>%propertydefinition.TPolicyTypePropertyTable.policyLanguage.description</Description>
                     </PropertyDefinition>
@@ -1174,7 +1174,7 @@
                     <HParameter name="name" value="Property"/>
                 </Handler>
             </Tool>
-            <Tool id="Policy" label="%tool.Policy.label" tooltip="%tool.Policy.tooltip" image="res/icon/gui/tpolicy48.ICON.png">
+            <Tool id="Policy" label="%tool.Policy.label" tooltip="%tool.Policy.tooltip" image="res/icon/gui/tpolicy24.ICON.png">
                 <Scope-source metaclass="Infrastructure.ModelElement" stereotype=""/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="ToscaDesigner#TPolicy"/>

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

@@ -40,13 +40,14 @@
  */
 @objid ("6410d22d-7798-4501-8617-a7b9c2035a03")
 public class ServiceTemplateDiagram implements IMdaProxy {
-    @objid ("e71b2d81-023d-4ae3-a9d7-fef4a8335508")
+    @objid ("fa9f5271-439a-45f0-ba82-01fb47160215")
     public static final String STEREOTYPE_NAME = "ServiceTemplateDiagram";
 
     /**
      * The underlying {@link StaticDiagram} represented by this proxy, never null.
+     * 
      */
-    @objid ("25c439c9-e394-4594-b65c-43a559cb0f50")
+    @objid ("47ec585a-eb26-4a50-8ba5-6d889c3072fe")
     protected final StaticDiagram elt;
 
     /**
@@ -56,17 +57,16 @@ public class ServiceTemplateDiagram implements IMdaProxy {
      * @param elt a model object
      * @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
      */
-    @objid ("47ec9d12-03ae-4e79-a59b-7a6906f588d8")
+    @objid ("f2695664-14aa-4238-88bf-eba884f53fc2")
     public static boolean canInstantiate(final MObject elt) {
         return ((elt instanceof StaticDiagram) && (ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
     }
 
     /**
      * Create a new {@link StaticDiagram} stereotyped << ServiceTemplateDiagram >> then instantiate a {@link ServiceTemplateDiagram} proxy.
-     * 
      * @return a {@link ServiceTemplateDiagram} proxy on the created {@link StaticDiagram}.
      */
-    @objid ("ddeccfcf-4aca-410a-bc44-58bfd8466ad9")
+    @objid ("b6c8308b-b33a-4577-9c4d-42954030fea5")
     public static ServiceTemplateDiagram create(final IModelingSession session) {
         ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
         e.getExtension().add(ServiceTemplateDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static ServiceTemplateDiagram create(final IModelingSession session) {
      * @param obj a StaticDiagram
      * @return a {@link ServiceTemplateDiagram} proxy or <i>null</i>.
      */
-    @objid ("a740f3ff-bc4f-4205-bb7f-7e0225efd9d9")
+    @objid ("f0952800-0365-4a1c-8b2b-8f050e763375")
     public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
         return ServiceTemplateDiagram.canInstantiate(obj) ? new ServiceTemplateDiagram(obj) : null;
     }
@@ -89,19 +89,19 @@ public static ServiceTemplateDiagram instantiate(final StaticDiagram obj) {
      * Tries to instantiate a {@link ServiceTemplateDiagram} proxy from a {@link StaticDiagram} stereotyped << ServiceTemplateDiagram >> checking its metaclass and its stereotype. 
      * <p>
      * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
+     * @throws IllegalArgumentException if the instantiation cannot be carried out.
      * @param obj a {@link StaticDiagram}
      * @return a {@link ServiceTemplateDiagram} proxy.
-     * @throws IllegalArgumentException if the instantiation cannot be carried out.
      */
-    @objid ("0e497c63-cff8-4f3c-946d-eb1e93f9b615")
+    @objid ("6e1e563b-bfb1-47d8-82d4-af7f86fee163")
     public static ServiceTemplateDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
         if (ServiceTemplateDiagram.canInstantiate(obj))
-        	return new ServiceTemplateDiagram(obj);
+            return new ServiceTemplateDiagram(obj);
         else
-        	throw new IllegalArgumentException("ServiceTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
+            throw new IllegalArgumentException("ServiceTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
     }
 
-    @objid ("ad02dd4c-12ff-4b66-af7a-3921dbe4ecff")
+    @objid ("3387cbbe-17fe-4058-a59c-22a50cf4ae03")
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -118,38 +118,37 @@ public boolean equals(final Object obj) {
     }
 
     /**
-     * Get the underlying {@link StaticDiagram}. 
+     * Get the underlying {@link StaticDiagram}.
      * @return the StaticDiagram represented by this proxy, never null.
      */
-    @objid ("60e89067-656a-48bd-9c8a-088753658208")
+    @objid ("8ebb6d51-790c-4091-859f-64b821150554")
     public StaticDiagram getElement() {
         return this.elt;
     }
 
-    @objid ("e4cec8c9-fe0a-41e8-b6cd-ecc25933144d")
+    @objid ("0e0d4491-b21e-4fdf-b5f0-81ccc4b313cb")
     @Override
     public int hashCode() {
         return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
-        
     }
 
-    @objid ("6191acb8-9cec-4d4b-aa39-034825588178")
+    @objid ("9b2e382d-d098-432f-a5b9-f7b63ed183c4")
     protected  ServiceTemplateDiagram(final StaticDiagram elt) {
         this.elt = elt;
     }
 
     @objid ("f4f8acbe-52e0-4947-9cbf-c86b468b39dc")
     public static final class MdaTypes {
-        @objid ("cc52d1ff-f177-40b1-88ab-e8da06729826")
+        @objid ("f610135e-d7f4-4364-8629-fb985c4967c4")
         public static Stereotype STEREOTYPE_ELT;
 
-        @objid ("166ab64a-ca1e-44b3-8135-3974d3959fa5")
+        @objid ("87805e20-edb5-4265-8876-146efcffc8a4")
         private static Stereotype MDAASSOCDEP;
 
-        @objid ("8c514fea-e779-4aa5-a602-300f33782c46")
+        @objid ("8ac05263-c5f6-4dc6-96db-fc3b9fb12a01")
         private static TagType MDAASSOCDEP_ROLE;
 
-        @objid ("c9a2785d-2420-4a20-b464-6c526c4d9bb2")
+        @objid ("2a392925-204f-4a68-93d3-7129f0077f46")
         public static void init(final IModelingSession session) throws MdaProxyException {
             List <MRef> missingRefs = new ArrayList<>();
             MRef mRef;
@@ -166,7 +165,6 @@ public static void init(final IModelingSession session) throws MdaProxyException
             if (MDAASSOCDEP_ROLE==null) missingRefs.add(mRef);
 
             if (! missingRefs.isEmpty()) throw new MdaProxyException(MdaProxyException.MdaProxyExceptionReason.MISSING_MDA_ELEMENT, missingRefs);
-            
         }
 
     }

ToscaDesigner/src/main/conf/toscadesigner.ramc

@@ -40,13 +40,14 @@
  */
 @objid ("286165ac-7512-43ba-9422-87db8260929c")
 public class TopologyTemplateDiagram implements IMdaProxy {
-    @objid ("039d0d04-19ce-44be-86b4-2c7ae5faa972")
+    @objid ("dc522f61-966c-4010-8152-940455666fff")
     public static final String STEREOTYPE_NAME = "TopologyTemplateDiagram";
 
     /**
      * The underlying {@link StaticDiagram} represented by this proxy, never null.
+     * 
      */
-    @objid ("f4d13518-50cc-41c4-a54a-fea3fbbbccbd")
+    @objid ("5b1e034b-877d-4df4-bd43-1f4e91b3cf06")
     protected final StaticDiagram elt;
 
     /**
@@ -56,17 +57,16 @@ public class TopologyTemplateDiagram implements IMdaProxy {
      * @param elt a model object
      * @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
      */
-    @objid ("a805e90c-432f-4a19-b416-21e916b0532a")
+    @objid ("dfddcc83-c57b-4171-b432-4d1dce4b1fc5")
     public static boolean canInstantiate(final MObject elt) {
         return ((elt instanceof StaticDiagram) && (TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT!=null) && ((StaticDiagram) elt).isStereotyped(TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT));
     }
 
     /**
      * Create a new {@link StaticDiagram} stereotyped << TopologyTemplateDiagram >> then instantiate a {@link TopologyTemplateDiagram} proxy.
-     * 
      * @return a {@link TopologyTemplateDiagram} proxy on the created {@link StaticDiagram}.
      */
-    @objid ("7a4ce0fa-8038-461c-afd3-8b3e2ec655cc")
+    @objid ("19ed6e24-0f84-4270-92a1-7d5f4f627093")
     public static TopologyTemplateDiagram create(final IModelingSession session) {
         ModelElement e = (ModelElement)session.getModel().createElement("Standard.StaticDiagram");
         e.getExtension().add(TopologyTemplateDiagram.MdaTypes.STEREOTYPE_ELT);
@@ -80,7 +80,7 @@ public static TopologyTemplateDiagram create(final IModelingSession session) {
      * @param obj a StaticDiagram
      * @return a {@link TopologyTemplateDiagram} proxy or <i>null</i>.
      */
-    @objid ("55ae8092-3d26-42f0-b649-19bcc8c8be88")
+    @objid ("54d545bf-d1c1-4ba6-8eec-3b44b2f92065")
     public static TopologyTemplateDiagram instantiate(final StaticDiagram obj) {
         return TopologyTemplateDiagram.canInstantiate(obj) ? new TopologyTemplateDiagram(obj) : null;
     }
@@ -89,19 +89,19 @@ public static TopologyTemplateDiagram instantiate(final StaticDiagram obj) {
      * Tries to instantiate a {@link TopologyTemplateDiagram} proxy from a {@link StaticDiagram} stereotyped << TopologyTemplateDiagram >> checking its metaclass and its stereotype. 
      * <p>
      * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
+     * @throws IllegalArgumentException if the instantiation cannot be carried out.
      * @param obj a {@link StaticDiagram}
      * @return a {@link TopologyTemplateDiagram} proxy.
-     * @throws IllegalArgumentException if the instantiation cannot be carried out.
      */
-    @objid ("e96dcaab-cf05-41b7-8ee1-0f8803ec74a5")
+    @objid ("1a2302ab-05b3-409c-a1c3-f1ac671eaaa8")
     public static TopologyTemplateDiagram safeInstantiate(final StaticDiagram obj) throws IllegalArgumentException {
         if (TopologyTemplateDiagram.canInstantiate(obj))
-        	return new TopologyTemplateDiagram(obj);
+            return new TopologyTemplateDiagram(obj);
         else
-        	throw new IllegalArgumentException("TopologyTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
+            throw new IllegalArgumentException("TopologyTemplateDiagram: Cannot instantiate "+obj+": wrong element type or stereotype");
     }
 
-    @objid ("e17308ef-f948-4a99-994e-e19dc36a7c6a")
+    @objid ("c94ebb69-08e5-48bc-b504-1f08c8bb50f5")
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -118,38 +118,37 @@ public boolean equals(final Object obj) {
     }
 
     /**
-     * Get the underlying {@link StaticDiagram}. 
+     * Get the underlying {@link StaticDiagram}.
      * @return the StaticDiagram represented by this proxy, never null.
      */
-    @objid ("82af053f-686b-45ea-be6a-fe0abd1c5494")
+    @objid ("2860af0d-6879-471f-8a35-77c96667afaf")
     public StaticDiagram getElement() {
         return this.elt;
     }
 
-    @objid ("a4a85951-f0a6-4b5c-ac0f-b0acc03183eb")
+    @objid ("e46c7f5e-705f-4160-a544-d0ce1dc817ed")
     @Override
     public int hashCode() {
         return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
-        
     }
 
-    @objid ("2a25805a-5906-4b87-a56b-0b04e6efc362")
+    @objid ("c84dac47-d0dc-4d15-bc41-623625b77704")
     protected  TopologyTemplateDiagram(final StaticDiagram elt) {
         this.elt = elt;
     }
 
     @objid ("b174b93b-03dc-4c73-8ed4-38e19e154add")
     public static final class MdaTypes {
-        @objid ("8105da89-6789-4982-b97f-2281a824e5bb")
+        @objid ("2817ae59-c3ce-42b5-b423-79f906aeff1c")
         public static Stereotype STEREOTYPE_ELT;
 
-        @objid ("f290e464-50ad-402d-abe7-2d6ec7f70b58")
+        @objid ("60639266-f507-4d08-8025-0f7b163a2fb3")
         private static Stereotype MDAASSOCDEP;
 
-        @objid ("36aed022-1e67-4867-a61a-15b2a296478a")
+        @objid ("147d90c4-6f55-4961-9c32-27e6c2d1ce3a")
         private static TagType MDAASSOCDEP_ROLE;
 
-        @objid ("6ad1b901-7a69-4125-8af7-3b699aace708")
+        @objid ("b762cb9c-9876-4176-896d-f50229793520")
         public static void init(final IModelingSession session) throws MdaProxyException {
             List <MRef> missingRefs = new ArrayList<>();
             MRef mRef;
@@ -166,7 +165,6 @@ public static void init(final IModelingSession session) throws MdaProxyException
             if (MDAASSOCDEP_ROLE==null) missingRefs.add(mRef);
 
             if (! missingRefs.isEmpty()) throw new MdaProxyException(MdaProxyException.MdaProxyExceptionReason.MISSING_MDA_ELEMENT, missingRefs);
-            
         }
 
     }