[NUI] Fix CA2000 Warnings for View (#2556)

Co-authored-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewPublicMethods.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewPublicMethods.cs
index e7fa362..861fd39 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewPublicMethods.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewPublicMethods.cs
@@ -73,34 +73,49 @@ namespace Tizen.NUI.BaseComponents
         public Animation AnimateColor(string targetVisual, object destinationColor, int startTime, int endTime, AlphaFunction.BuiltinFunctions? alphaFunction = null, object initialColor = null)
         {
             Animation animation = null;
+            using (PropertyMap animator = new PropertyMap())
+            using (PropertyMap timePeriod = new PropertyMap())
+            using (PropertyValue pvDuration = new PropertyValue((endTime - startTime) / 1000.0f))
+            using (PropertyValue pvDelay = new PropertyValue(startTime / 1000.0f))
+            using (PropertyMap transition = new PropertyMap())
+            using (PropertyValue pvTarget = new PropertyValue(targetVisual))
+            using (PropertyValue pvProperty = new PropertyValue("mixColor"))
+            using (PropertyValue destValue = PropertyValue.CreateFromObject(destinationColor))
             {
-                PropertyMap _animator = new PropertyMap();
                 if (alphaFunction != null)
                 {
-                    _animator.Add("alphaFunction", new PropertyValue(AlphaFunction.BuiltinToPropertyKey(alphaFunction)));
+                    using (PropertyValue pvAlpha = new PropertyValue(AlphaFunction.BuiltinToPropertyKey(alphaFunction)))
+                    {
+                        animator.Add("alphaFunction", pvAlpha);
+                    }
                 }
 
-                PropertyMap _timePeriod = new PropertyMap();
-                _timePeriod.Add("duration", new PropertyValue((endTime - startTime) / 1000.0f));
-                _timePeriod.Add("delay", new PropertyValue(startTime / 1000.0f));
-                _animator.Add("timePeriod", new PropertyValue(_timePeriod));
-
-                PropertyMap _transition = new PropertyMap();
-                _transition.Add("animator", new PropertyValue(_animator));
-                _transition.Add("target", new PropertyValue(targetVisual));
-                _transition.Add("property", new PropertyValue("mixColor"));
+                timePeriod.Add("duration", pvDuration);
+                timePeriod.Add("delay", pvDelay);
+                using (PropertyValue pvTimePeriod = new PropertyValue(timePeriod))
+                {
+                    animator.Add("timePeriod", pvTimePeriod);
+                }
+                using (PropertyValue pvAnimator = new PropertyValue(animator))
+                {
+                    transition.Add("animator", pvAnimator);
+                }
+                transition.Add("target", pvTarget);
+                transition.Add("property", pvProperty);
 
                 if (initialColor != null)
                 {
-                    PropertyValue initValue = PropertyValue.CreateFromObject(initialColor);
-                    _transition.Add("initialValue", initValue);
+                    using (PropertyValue initValue = PropertyValue.CreateFromObject(initialColor))
+                    {
+                        transition.Add("initialValue", initValue);
+                    }
                 }
 
-                PropertyValue destValue = PropertyValue.CreateFromObject(destinationColor);
-                _transition.Add("targetValue", destValue);
-                TransitionData _transitionData = new TransitionData(_transition);
-
-                animation = new Animation(Interop.View.CreateTransition(SwigCPtr, TransitionData.getCPtr(_transitionData)), true);
+                transition.Add("targetValue", destValue);
+                using (TransitionData transitionData = new TransitionData(transition))
+                {
+                    animation = new Animation(Interop.View.CreateTransition(SwigCPtr, TransitionData.getCPtr(transitionData)), true);
+                }
                 if (NDalicPINVOKE.SWIGPendingException.Pending)
                     throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }

diff --git a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
index 1746de3..a5ea14f 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/VisualView.cs
@@ -43,9 +43,9 @@ namespace Tizen.NUI.BaseComponents
     public class VisualView : CustomView
     {
         //private LinkedList<VisualBase> _visualList = null;
-        private Dictionary<int, VisualBase> _visualDictionary = null;
-        private Dictionary<int, PropertyMap> _tranformDictionary = null;
-        private PropertyArray _animateArray = null;
+        private Dictionary<int, VisualBase> visualDictionary = null;
+        private Dictionary<int, PropertyMap> tranformDictionary = null;
+        private PropertyArray animateArray = null;
 
         /// <summary>
         /// Constructor.
@@ -93,7 +93,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                return _visualDictionary.Count;
+                return visualDictionary.Count;
             }
         }
 
@@ -104,9 +104,9 @@ namespace Tizen.NUI.BaseComponents
         public override void OnInitialize()
         {
             //Initialize empty
-            _visualDictionary = new Dictionary<int, VisualBase>();
-            _tranformDictionary = new Dictionary<int, PropertyMap>();
-            _animateArray = new PropertyArray();
+            visualDictionary = new Dictionary<int, VisualBase>();
+            tranformDictionary = new Dictionary<int, PropertyMap>();
+            animateArray = new PropertyArray();
         }
 
         /// <summary>
@@ -123,22 +123,25 @@ namespace Tizen.NUI.BaseComponents
 
             /* If the visual had added, then replace it using RegisterVusal. */
             //visual.Name = name;
-            foreach (var item in _visualDictionary)
+            foreach (var item in visualDictionary)
             {
                 if (item.Value.Name == visualName)
                 {
                     /* Find a existed visual, its key also exited. */
                     visualIndex = item.Key;
                     UnregisterVisual(visualIndex);
-                    _visualDictionary.Remove(visualIndex);
-                    _tranformDictionary.Remove(visualIndex);
+                    visualDictionary.Remove(visualIndex);
+                    tranformDictionary.Remove(visualIndex);
                     break;
                 }
             }
 
             if (visualIndex == -1) // The visual is a new one, create index for it. */
             {
-                visualIndex = RegisterProperty(visualName, new PropertyValue(visualName), PropertyAccessMode.ReadWrite);
+                using (var temp = new PropertyValue(visualName))
+                {
+                    visualIndex = RegisterProperty(visualName, temp, PropertyAccessMode.ReadWrite);
+                }
             }
 
             if (visualIndex > 0)
@@ -153,8 +156,8 @@ namespace Tizen.NUI.BaseComponents
 
                 RegisterVisual(visualIndex, visual);
 
-                _visualDictionary.Add(visualIndex, visual);
-                _tranformDictionary.Add(visualIndex, visualMap.OutputTransformMap);
+                visualDictionary.Add(visualIndex, visual);
+                tranformDictionary.Add(visualIndex, visualMap.OutputTransformMap);
 
                 visualMap.VisualIndex = visualIndex;
                 visualMap.Name = visualName;
@@ -171,14 +174,14 @@ namespace Tizen.NUI.BaseComponents
         /// <since_tizen> 3 </since_tizen>
         public void RemoveVisual(string visualName)
         {
-            foreach (var item in _visualDictionary)
+            foreach (var item in visualDictionary)
             {
                 if (item.Value.Name == visualName)
                 {
                     EnableVisual(item.Key, false);
                     UnregisterVisual(item.Key);
-                    _tranformDictionary.Remove(item.Key);
-                    _visualDictionary.Remove(item.Key);
+                    tranformDictionary.Remove(item.Key);
+                    visualDictionary.Remove(item.Key);
 
                     RelayoutRequest();
                     break;
@@ -192,13 +195,13 @@ namespace Tizen.NUI.BaseComponents
         /// <since_tizen> 3 </since_tizen>
         public void RemoveAll()
         {
-            foreach (var item in _visualDictionary)
+            foreach (var item in visualDictionary)
             {
                 EnableVisual(item.Key, false);
                 UnregisterVisual(item.Key);
             }
-            _visualDictionary.Clear();
-            _tranformDictionary.Clear();
+            visualDictionary.Clear();
+            tranformDictionary.Clear();
             RelayoutRequest();
         }
 
@@ -214,9 +217,9 @@ namespace Tizen.NUI.BaseComponents
         /// <since_tizen> 3 </since_tizen>
         public override void OnRelayout(Vector2 size, RelayoutContainer container)
         {
-            foreach (var item in _visualDictionary)
+            foreach (var item in visualDictionary)
             {
-                item.Value.SetTransformAndSize(_tranformDictionary[item.Key], size);
+                item.Value.SetTransformAndSize(tranformDictionary[item.Key], size);
                 EnableVisual(item.Key, true);
             }
         }
@@ -241,40 +244,64 @@ namespace Tizen.NUI.BaseComponents
                 throw new ArgumentNullException(nameof(target));
             }
 
-            string _alphaFunction = alphaFunction?.GetDescription();
+            string strAlpha = alphaFunction?.GetDescription();
 
-            foreach (var item in _visualDictionary.ToList())
+            foreach (var item in visualDictionary.ToList())
             {
                 if (item.Value.Name == target.Name)
                 {
-                    PropertyMap _animator = new PropertyMap();
-                    if (_alphaFunction != null) { _animator.Add("alphaFunction", new PropertyValue(_alphaFunction)); }
-
-                    PropertyMap _timePeriod = new PropertyMap();
-                    _timePeriod.Add("duration", new PropertyValue((endTime - startTime) / 1000.0f));
-                    _timePeriod.Add("delay", new PropertyValue(startTime / 1000.0f));
-                    _animator.Add("timePeriod", new PropertyValue(_timePeriod));
-
-                    StringBuilder sb = new StringBuilder(property);
-                    sb[0] = (char)(sb[0] | 0x20);
-                    string _str = sb.ToString();
-                    if (_str == "position") { _str = "offset"; }
-
-                    PropertyValue destVal = PropertyValue.CreateFromObject(destinationValue);
-
-                    PropertyMap _transition = new PropertyMap();
-                    _transition.Add("target", new PropertyValue(target.Name));
-                    _transition.Add("property", new PropertyValue(_str));
-                    if (initialValue != null)
+                    using (PropertyMap animator = new PropertyMap())
+                    using (PropertyMap timePeriod = new PropertyMap())
+                    using (PropertyValue pvDuration = new PropertyValue((endTime - startTime) / 1000.0f))
+                    using (PropertyValue pvDelay = new PropertyValue(startTime / 1000.0f))
+                    using (PropertyValue destVal = PropertyValue.CreateFromObject(destinationValue))
+                    using (PropertyMap transition = new PropertyMap())
+                    using (PropertyValue pvTarget = new PropertyValue(target.Name))
                     {
-                        PropertyValue initVal = PropertyValue.CreateFromObject(initialValue);
-                        _transition.Add("initialValue", new PropertyValue(initVal));
+                        if (strAlpha != null)
+                        {
+                            using (PropertyValue pvAlpha = new PropertyValue(strAlpha))
+                            {
+                                animator.Add("alphaFunction", pvAlpha);
+                            }
+                        }
+                        timePeriod.Add("duration", pvDuration);
+                        timePeriod.Add("delay", pvDelay);
+                        using (PropertyValue pvTimePeriod = new PropertyValue(timePeriod))
+                        {
+                            animator.Add("timePeriod", pvTimePeriod);
+                        }
+
+                        StringBuilder sb = new StringBuilder(property);
+                        sb[0] = (char)(sb[0] | 0x20);
+                        string _str = sb.ToString();
+                        if (_str == "position") { _str = "offset"; }
+
+                        transition.Add("target", pvTarget);
+                        using (PropertyValue pvStr = new PropertyValue(_str))
+                        {
+                            transition.Add("property", pvStr);
+                        }
+
+                        if (initialValue != null)
+                        {
+                            using (PropertyValue initVal = PropertyValue.CreateFromObject(initialValue))
+                            using (PropertyValue pvInitialValue = new PropertyValue(initVal))
+                            {
+                                transition.Add("initialValue", pvInitialValue);
+                            }
+                        }
+                        transition.Add("targetValue", destVal);
+                        using (PropertyValue pvAnimator = new PropertyValue(animator))
+                        {
+                            transition.Add("animator", pvAnimator);
+                        }
+
+                        using (TransitionData transitionData = new TransitionData(transition))
+                        {
+                            return this.CreateTransition(transitionData);
+                        }
                     }
-                    _transition.Add("targetValue", destVal);
-                    _transition.Add("animator", new PropertyValue(_animator));
-
-                    TransitionData _transitionData = new TransitionData(_transition);
-                    return this.CreateTransition(_transitionData);
                 }
             }
             return null;
@@ -299,39 +326,66 @@ namespace Tizen.NUI.BaseComponents
                 throw new ArgumentNullException(nameof(target));
             }
 
-            string _alphaFunction = alphaFunction?.GetDescription();
+            string strAlpha = alphaFunction?.GetDescription();
 
-            foreach (var item in _visualDictionary.ToList())
+            foreach (var item in visualDictionary.ToList())
             {
                 if (item.Value.Name == target.Name)
                 {
-                    PropertyMap _animator = new PropertyMap();
-                    if (_alphaFunction != null) { _animator.Add("alphaFunction", new PropertyValue(_alphaFunction)); }
-
-                    PropertyMap _timePeriod = new PropertyMap();
-                    _timePeriod.Add("duration", new PropertyValue((endTime - startTime) / 1000.0f));
-                    _timePeriod.Add("delay", new PropertyValue(startTime / 1000.0f));
-                    _animator.Add("timePeriod", new PropertyValue(_timePeriod));
-
-                    StringBuilder sb = new StringBuilder(property);
-                    sb[0] = (char)(sb[0] | 0x20);
-                    string _str = sb.ToString();
-                    if (_str == "position") { _str = "offset"; }
-
-                    PropertyValue destVal = PropertyValue.CreateFromObject(destinationValue);
-
-                    PropertyMap _transition = new PropertyMap();
-                    _transition.Add("target", new PropertyValue(target.Name));
-                    _transition.Add("property", new PropertyValue(_str));
-                    if (initialValue != null)
+                    using (PropertyMap animator = new PropertyMap())
+                    using (PropertyMap timePeriod = new PropertyMap())
+                    using (PropertyValue pvDuration = new PropertyValue((endTime - startTime) / 1000.0f))
+                    using (PropertyValue pvDelay = new PropertyValue(startTime / 1000.0f))
+                    using (PropertyValue destVal = PropertyValue.CreateFromObject(destinationValue))
+                    using (PropertyMap transition = new PropertyMap())
+                    using (PropertyValue pvTarget = new PropertyValue(target.Name))
                     {
-                        PropertyValue initVal = PropertyValue.CreateFromObject(initialValue);
-                        _transition.Add("initialValue", new PropertyValue(initVal));
+                        if (strAlpha != null)
+                        {
+                            using (PropertyValue pvStrAlpha = new PropertyValue(strAlpha))
+                            {
+                                animator.Add("alphaFunction", pvStrAlpha);
+                            }
+                        }
+
+                        timePeriod.Add("duration", pvDuration);
+                        timePeriod.Add("delay", pvDelay);
+                        using (PropertyValue pvTimePeriod = new PropertyValue(timePeriod))
+                        {
+                            animator.Add("timePeriod", pvTimePeriod);
+                        }
+
+                        StringBuilder sb = new StringBuilder(property);
+                        sb[0] = (char)(sb[0] | 0x20);
+                        string _str = sb.ToString();
+                        if (_str == "position") { _str = "offset"; }
+
+                        transition.Add("target", pvTarget);
+                        using (PropertyValue pvStr = new PropertyValue(_str))
+                        {
+                            transition.Add("property", pvStr);
+                        }
+
+                        if (initialValue != null)
+                        {
+                            using (PropertyValue initVal = PropertyValue.CreateFromObject(initialValue))
+                            using (PropertyValue pvInitialValue = new PropertyValue(initVal))
+                            {
+                                transition.Add("initialValue", pvInitialValue);
+                            }
+                        }
+                        transition.Add("targetValue", destVal);
+                        using (PropertyValue pvAnimator = new PropertyValue(animator))
+                        {
+                            transition.Add("animator", pvAnimator);
+                        }
+
+                        using (PropertyValue pvTransition = new PropertyValue(transition))
+                        {
+                            PropertyArray temp = animateArray.Add(pvTransition);
+                            temp.Dispose();
+                        }
                     }
-                    _transition.Add("targetValue", destVal);
-                    _transition.Add("animator", new PropertyValue(_animator));
-
-                    _animateArray.Add(new PropertyValue(_transition));
                 }
             }
         }
@@ -343,14 +397,15 @@ namespace Tizen.NUI.BaseComponents
         /// <since_tizen> 3 </since_tizen>
         public Animation AnimateVisualAddFinish()
         {
-            if (_animateArray == null || _animateArray.Empty())
+            if (animateArray == null || animateArray.Empty())
             {
                 Tizen.Log.Fatal("NUI", "animate visual property array is empty!");
                 return null;
             }
-            TransitionData _transitionData = new TransitionData(_animateArray);
-
-            return this.CreateTransition(_transitionData);
+            TransitionData transitionData = new TransitionData(animateArray);
+            Animation ret = this.CreateTransition(transitionData);
+            transitionData.Dispose();
+            return ret;
         }
 
         /// <summary>
@@ -365,12 +420,14 @@ namespace Tizen.NUI.BaseComponents
                 throw new ArgumentNullException(nameof(visualMap));
             }
 
-            foreach (var item in _visualDictionary.ToList())
+            foreach (var item in visualDictionary.ToList())
             {
                 if (item.Value.Name == visualMap.Target)
                 {
-                    TransitionData _transitionData = new TransitionData(visualMap.OutputVisualMap);
-                    return this.CreateTransition(_transitionData);
+                    using (TransitionData transitionData = new TransitionData(visualMap.OutputVisualMap))
+                    {
+                        return this.CreateTransition(transitionData);
+                    }
                 }
             }
             return null;
@@ -387,8 +444,8 @@ namespace Tizen.NUI.BaseComponents
 
             RegisterVisual(visualIndex, visual);
 
-            _visualDictionary[visualIndex] = visual;
-            _tranformDictionary[visualIndex] = visualMap.OutputTransformMap;
+            visualDictionary[visualIndex] = visual;
+            tranformDictionary[visualIndex] = visualMap.OutputTransformMap;
 
             RelayoutRequest();
             NUILog.Debug("UpdateVisual() name=" + visualName);