[NUI] Fix CA2000 warning issues of Camera / ItemView / Animatable / Animation / Anima...

diff --git a/src/Tizen.NUI/src/internal/Camera.cs b/src/Tizen.NUI/src/internal/Camera.cs
index 8b7b9bb..727822c 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Camera.cs
+++ b/src/Tizen.NUI/src/internal/Camera.cs
@@ -216,174 +216,226 @@ namespace Tizen.NUI
         {
             get
             {
-                string temp;
-                GetProperty(Camera.Property.TYPE).Get(out temp);
-                return temp;
+                string returnValue = "";
+                PropertyValue type = GetProperty(Camera.Property.TYPE);
+                type?.Get(out returnValue);
+                type?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.TYPE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.TYPE, setValue);
+                setValue.Dispose();
             }
         }
         public string ProjectionMode
         {
             get
             {
-                string temp;
-                GetProperty(Camera.Property.PROJECTION_MODE).Get(out temp);
-                return temp;
+                string returnValue = "";
+                PropertyValue projectionMode = GetProperty(Camera.Property.PROJECTION_MODE);
+                projectionMode?.Get(out returnValue);
+                projectionMode?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.PROJECTION_MODE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.PROJECTION_MODE, setValue);
+                setValue.Dispose();
             }
         }
         public float FieldOfView
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.FIELD_OF_VIEW).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue fieldView = GetProperty(Camera.Property.FIELD_OF_VIEW);
+                fieldView?.Get(out returnValue);
+                fieldView?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.FIELD_OF_VIEW, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.FIELD_OF_VIEW, setValue);
+                setValue.Dispose();
             }
         }
         public float AspectRatio
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.ASPECT_RATIO).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue aspectRatio = GetProperty(Camera.Property.ASPECT_RATIO);
+                aspectRatio?.Get(out returnValue);
+                aspectRatio?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.ASPECT_RATIO, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.ASPECT_RATIO, setValue);
+                setValue.Dispose();
             }
         }
         public float NearPlaneDistance
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.NEAR_PLANE_DISTANCE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue nearPlaneDistance = GetProperty(Camera.Property.NEAR_PLANE_DISTANCE);
+                nearPlaneDistance?.Get(out returnValue);
+                nearPlaneDistance?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.NEAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.NEAR_PLANE_DISTANCE, setValue);
+                setValue.Dispose();
             }
         }
         public float FarPlaneDistance
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.FAR_PLANE_DISTANCE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue farPlaneDistance = GetProperty(Camera.Property.FAR_PLANE_DISTANCE);
+                farPlaneDistance?.Get(out returnValue);
+                farPlaneDistance?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.FAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.FAR_PLANE_DISTANCE, setValue);
+                setValue.Dispose();
             }
         }
         public float LeftPlaneDistance
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.LEFT_PLANE_DISTANCE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue leftPlaneDistance = GetProperty(Camera.Property.LEFT_PLANE_DISTANCE);
+                leftPlaneDistance?.Get(out returnValue);
+                leftPlaneDistance?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.LEFT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.LEFT_PLANE_DISTANCE, setValue);
+                setValue.Dispose();
             }
         }
         public float RightPlaneDistance
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.RIGHT_PLANE_DISTANCE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue rightPlaneDistance = GetProperty(Camera.Property.RIGHT_PLANE_DISTANCE);
+                rightPlaneDistance?.Get(out returnValue);
+                rightPlaneDistance?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.RIGHT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.RIGHT_PLANE_DISTANCE, setValue);
+                setValue.Dispose();
             }
         }
         public float TopPlaneDistance
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.TOP_PLANE_DISTANCE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue topPlaneDistance = GetProperty(Camera.Property.TOP_PLANE_DISTANCE);
+                topPlaneDistance?.Get(out returnValue);
+                topPlaneDistance?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.TOP_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.TOP_PLANE_DISTANCE, setValue);
+                setValue.Dispose();
             }
         }
         public float BottomPlaneDistance
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(Camera.Property.BOTTOM_PLANE_DISTANCE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue bottomPlaneDistance = GetProperty(Camera.Property.BOTTOM_PLANE_DISTANCE);
+                bottomPlaneDistance?.Get(out returnValue);
+                bottomPlaneDistance?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.BOTTOM_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.BOTTOM_PLANE_DISTANCE, setValue);
+                setValue.Dispose();
             }
         }
         public Vector3 TargetPosition
         {
             get
             {
-                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
-                GetProperty(Camera.Property.TARGET_POSITION).Get(temp);
-                return temp;
+                Vector3 returnValue = new Vector3(0.0f, 0.0f, 0.0f);
+                PropertyValue targetPosition = GetProperty(Camera.Property.TARGET_POSITION);
+                targetPosition?.Get(returnValue);
+                targetPosition?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.TARGET_POSITION, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.TARGET_POSITION, setValue);
+                setValue.Dispose();
             }
         }
         internal Matrix ProjectionMatrix
         {
             get
             {
-                Matrix temp = new Matrix();
-                GetProperty(Camera.Property.PROJECTION_MATRIX).Get(temp);
-                return temp;
+                Matrix returnValue = new Matrix();
+                PropertyValue projectionMatrix = GetProperty(Camera.Property.PROJECTION_MATRIX);
+                projectionMatrix?.Get(returnValue);
+                projectionMatrix?.Dispose();
+                return returnValue;
             }
         }
         internal Matrix ViewMatrix
         {
             get
             {
-                Matrix temp = new Matrix();
-                GetProperty(Camera.Property.VIEW_MATRIX).Get(temp);
-                return temp;
+                Matrix returnValue = new Matrix();
+                PropertyValue viewMatrix = GetProperty(Camera.Property.VIEW_MATRIX);
+                viewMatrix.Get(returnValue);
+                viewMatrix.Dispose();
+                return returnValue;
             }
         }
         public bool InvertYAxis
         {
             get
             {
-                bool temp = false;
-                GetProperty(Camera.Property.INVERT_Y_AXIS).Get(out temp);
-                return temp;
+                bool returnValue = false;
+                PropertyValue invertYAxis = GetProperty(Camera.Property.INVERT_Y_AXIS);
+                invertYAxis?.Get(out returnValue);
+                invertYAxis?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(Camera.Property.INVERT_Y_AXIS, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Camera.Property.INVERT_Y_AXIS, setValue);
+                setValue.Dispose();
             }
         }
     }

diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs
index 53f27ac..45785d2 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ItemView.cs
+++ b/src/Tizen.NUI/src/internal/ItemView.cs
@@ -46,12 +46,16 @@ namespace Tizen.NUI
             get
             {
                 Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
-                GetProperty(ItemView.Property.LAYOUT).Get(temp);
+                PropertyValue layout = GetProperty(ItemView.Property.LAYOUT);
+                layout?.Get(temp);
+                layout?.Dispose();
                 return temp;
             }
             set
             {
-                SetProperty(ItemView.Property.LAYOUT, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.LAYOUT, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -482,13 +486,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.MINIMUM_SWIPE_SPEED).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue minimumSwipeSpeed = GetProperty(ItemView.Property.MINIMUM_SWIPE_SPEED);
+                minimumSwipeSpeed?.Get(out returnValue);
+                minimumSwipeSpeed?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.MINIMUM_SWIPE_SPEED, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.MINIMUM_SWIPE_SPEED, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -498,13 +506,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.MINIMUM_SWIPE_DISTANCE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue minimumSwipDistance = GetProperty(ItemView.Property.MINIMUM_SWIPE_DISTANCE);
+                minimumSwipDistance?.Get(out returnValue);
+                minimumSwipDistance?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.MINIMUM_SWIPE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.MINIMUM_SWIPE_DISTANCE, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -514,13 +526,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue wheelScrollDistanceStep = GetProperty(ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP);
+                wheelScrollDistanceStep?.Get(out returnValue);
+                wheelScrollDistanceStep?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -530,13 +546,17 @@ namespace Tizen.NUI
         {
             get
             {
-                bool temp = false;
-                GetProperty(ItemView.Property.SNAP_TO_ITEM_ENABLED).Get(out temp);
-                return temp;
+                bool returnValue = false;
+                PropertyValue snapToItemEnabled = GetProperty(ItemView.Property.SNAP_TO_ITEM_ENABLED);
+                snapToItemEnabled?.Get(out returnValue);
+                snapToItemEnabled?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.SNAP_TO_ITEM_ENABLED, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.SNAP_TO_ITEM_ENABLED, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -546,13 +566,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.REFRESH_INTERVAL).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue refreshIntervalu = GetProperty(ItemView.Property.REFRESH_INTERVAL);
+                refreshIntervalu?.Get(out returnValue);
+                refreshIntervalu?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.REFRESH_INTERVAL, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.REFRESH_INTERVAL, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -562,13 +586,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.LAYOUT_POSITION).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue layoutPosition = GetProperty(ItemView.Property.LAYOUT_POSITION);
+                layoutPosition?.Get(out returnValue);
+                layoutPosition?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.LAYOUT_POSITION, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.LAYOUT_POSITION, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -578,13 +606,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.SCROLL_SPEED).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue scrollSpeed = GetProperty(ItemView.Property.SCROLL_SPEED);
+                scrollSpeed?.Get(out returnValue);
+                scrollSpeed?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.SCROLL_SPEED, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.SCROLL_SPEED, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -594,13 +626,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.OVERSHOOT).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue overShoot = GetProperty(ItemView.Property.OVERSHOOT);
+                overShoot?.Get(out returnValue);
+                overShoot?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.OVERSHOOT, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.OVERSHOOT, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -610,13 +646,17 @@ namespace Tizen.NUI
         {
             get
             {
-                Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(ItemView.Property.SCROLL_DIRECTION).Get(temp);
-                return temp;
+                Vector2 returnValue = new Vector2(0.0f, 0.0f);
+                PropertyValue scrollDirection = GetProperty(ItemView.Property.SCROLL_DIRECTION);
+                scrollDirection?.Get(returnValue);
+                scrollDirection?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.SCROLL_DIRECTION, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.SCROLL_DIRECTION, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -626,13 +666,17 @@ namespace Tizen.NUI
         {
             get
             {
-                int temp = 0;
-                GetProperty(ItemView.Property.LAYOUT_ORIENTATION).Get(out temp);
-                return temp;
+                int returnValue = 0;
+                PropertyValue layoutOrientation = GetProperty(ItemView.Property.LAYOUT_ORIENTATION);
+                layoutOrientation?.Get(out returnValue);
+                layoutOrientation?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.LAYOUT_ORIENTATION, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.LAYOUT_ORIENTATION, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -642,13 +686,17 @@ namespace Tizen.NUI
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(ItemView.Property.SCROLL_CONTENT_SIZE).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue scrollContentSize = GetProperty(ItemView.Property.SCROLL_CONTENT_SIZE);
+                scrollContentSize?.Get(out returnValue);
+                scrollContentSize?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(ItemView.Property.SCROLL_CONTENT_SIZE, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(ItemView.Property.SCROLL_CONTENT_SIZE, setValue);
+                setValue.Dispose();
             }
         }
     }

diff --git a/src/Tizen.NUI/src/public/Animatable.cs b/src/Tizen.NUI/src/public/Animatable.cs
index 338af1c..7eaf9ab 100755 (executable)
--- a/src/Tizen.NUI/src/public/Animatable.cs
+++ b/src/Tizen.NUI/src/public/Animatable.cs
@@ -186,7 +186,9 @@ namespace Tizen.NUI
         /// <since_tizen> 4 </since_tizen>
         public PropertyNotification AddPropertyNotification(string property, PropertyCondition condition)
         {
-            PropertyNotification ret = new PropertyNotification(Interop.Handle.Handle_AddPropertyNotification__SWIG_0(swigCPtr, PropertyHelper.GetPropertyFromString(this, property).propertyIndex, PropertyCondition.getCPtr(condition)), true);
+            Property properties = PropertyHelper.GetPropertyFromString(this, property);
+            PropertyNotification ret = new PropertyNotification(Interop.Handle.Handle_AddPropertyNotification__SWIG_0(swigCPtr, properties.propertyIndex, PropertyCondition.getCPtr(condition)), true);
+            properties.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }

diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs
index d5c1c6f..099dd6f 100755 (executable)
--- a/src/Tizen.NUI/src/public/Animation.cs
+++ b/src/Tizen.NUI/src/public/Animation.cs
@@ -95,7 +95,9 @@ namespace Tizen.NUI
             {
                 if (_animationFinishedEventHandler == null && disposed == false)
                 {
-                    FinishedSignal().Connect(_finishedCallbackOfNative);
+                    AnimationSignal finishedSignal = FinishedSignal();
+                    finishedSignal.Connect(_finishedCallbackOfNative);
+                    finishedSignal.Dispose();
                 }
                 _animationFinishedEventHandler += value;
             }
@@ -103,10 +105,12 @@ namespace Tizen.NUI
             {
                 _animationFinishedEventHandler -= value;
 
-                if (_animationFinishedEventHandler == null && FinishedSignal().Empty() == false)
+                AnimationSignal finishedSignal = FinishedSignal();
+                if (_animationFinishedEventHandler == null && finishedSignal.Empty() == false)
                 {
-                    FinishedSignal().Disconnect(_finishedCallbackOfNative);
+                    finishedSignal.Disconnect(_finishedCallbackOfNative);
                 }
+                finishedSignal.Dispose();
             }
         }
 
@@ -124,7 +128,9 @@ namespace Tizen.NUI
                 if (_animationProgressReachedEventHandler == null)
                 {
                     _animationProgressReachedEventCallback = OnProgressReached;
-                    ProgressReachedSignal().Connect(_animationProgressReachedEventCallback);
+                    AnimationSignal progressReachedSignal = ProgressReachedSignal();
+                    progressReachedSignal?.Connect(_animationProgressReachedEventCallback);
+                    progressReachedSignal?.Dispose();
                 }
 
                 _animationProgressReachedEventHandler += value;
@@ -133,10 +139,12 @@ namespace Tizen.NUI
             {
                 _animationProgressReachedEventHandler -= value;
 
-                if (_animationProgressReachedEventHandler == null && ProgressReachedSignal().Empty() == false)
+                AnimationSignal progressReachedSignal = ProgressReachedSignal();
+                if (_animationProgressReachedEventHandler == null && progressReachedSignal?.Empty() == false)
                 {
-                    ProgressReachedSignal().Disconnect(_animationProgressReachedEventCallback);
+                    progressReachedSignal?.Disconnect(_animationProgressReachedEventCallback);
                 }
+                progressReachedSignal.Dispose();
             }
         }
 
@@ -565,6 +573,9 @@ namespace Tizen.NUI
             {
                 AnimateBy(_prop, val);
             }
+
+            val.Dispose();
+            _prop.Dispose();
         }
 
         /// <summary>
@@ -597,12 +608,17 @@ namespace Tizen.NUI
             {
                 Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
                 AnimateBy(_prop, val, alphaFunction, time);
+                time.Dispose();
             }
             else
             {
                 Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
                 AnimateBy(_prop, val, time);
+                time.Dispose();
             }
+
+            val.Dispose();
+            _prop.Dispose();
         }
 
         /// <summary>
@@ -637,6 +653,9 @@ namespace Tizen.NUI
             {
                 AnimateTo(_prop, val);
             }
+
+            val.Dispose();
+            _prop.Dispose();
         }
 
         /// <summary>
@@ -705,12 +724,17 @@ namespace Tizen.NUI
             {
                 Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
                 AnimateTo(_prop, val, alphaFunction, time);
+                time.Dispose();
             }
             else
             {
                 Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
                 AnimateTo(_prop, val, time);
+                time.Dispose();
             }
+
+            val.Dispose();
+            _prop.Dispose();
         }
 
         /// <summary>
@@ -739,6 +763,8 @@ namespace Tizen.NUI
             {
                 AnimateBetween(_prop, keyFrames, interpolation);
             }
+
+            _prop.Dispose();
         }
 
         /// <summary>
@@ -765,6 +791,9 @@ namespace Tizen.NUI
             {
                 AnimateBetween(_prop, keyFrames, time, interpolation);
             }
+
+            time.Dispose();
+            _prop.Dispose();
         }
 
         /// <summary>
@@ -812,6 +841,7 @@ namespace Tizen.NUI
             {
                 Animate(view, path, forward, alphaFunction, time);
             }
+            time.Dispose();
         }
 
         /// <summary>
@@ -1341,14 +1371,17 @@ namespace Tizen.NUI
 
             if (_animationFinishedEventHandler != null)
             {
-                FinishedSignal().Disconnect(_finishedCallbackOfNative);
+                AnimationSignal finishedSignal = FinishedSignal();
+                finishedSignal?.Disconnect(_finishedCallbackOfNative);
+                finishedSignal?.Dispose();
                 _animationFinishedEventHandler = null;
             }
 
             if (_animationProgressReachedEventCallback != null)
             {
-
-                ProgressReachedSignal().Disconnect(_animationProgressReachedEventCallback);
+                AnimationSignal progressReachedSignal = ProgressReachedSignal();
+                progressReachedSignal?.Disconnect(_animationProgressReachedEventCallback);
+                progressReachedSignal?.Dispose();
                 _animationProgressReachedEventCallback = null;
             }
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/AnimatedImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/AnimatedImageView.cs
index a6a0e4a..a9c0354 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/AnimatedImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/AnimatedImageView.cs
@@ -187,28 +187,52 @@ namespace Tizen.NUI.BaseComponents
             mDirtyFlag = false;
 
             PropertyMap tMap = new PropertyMap();
-            tMap.Insert(Visual.Property.Type, new PropertyValue((int)Visual.Type.AnimatedImage));
+            PropertyValue animatiedImage = new PropertyValue((int)Visual.Type.AnimatedImage);
+            tMap.Insert(Visual.Property.Type, animatiedImage);
             if (mResourceURLs?.Count != 0)
             {
-                PropertyArray tArr = new PropertyArray();
+                PropertyArray mArray = new PropertyArray();
+                PropertyArray returnedArr = new PropertyArray();
+                PropertyValue index = new PropertyValue();
                 foreach (var iter in mResourceURLs)
                 {
-                    tArr.Add(new PropertyValue(iter));
+                    index = new PropertyValue(iter);
+                    returnedArr = mArray.Add(index);
                 }
-                tMap.Insert(ImageVisualProperty.URL, new PropertyValue(tArr));
-                tMap.Insert(ImageVisualProperty.BatchSize, new PropertyValue(mBatchSize));
-                tMap.Insert(ImageVisualProperty.CacheSize, new PropertyValue(mCacheSize));
-                tMap.Insert(ImageVisualProperty.FrameDelay, new PropertyValue(mFrameDelay));
-                tMap.Insert(ImageVisualProperty.LoopCount, new PropertyValue(mLoopCount));
+                index.Dispose();
+                returnedArr.Dispose();
+                PropertyValue array = new PropertyValue(mArray);
+                tMap.Insert(ImageVisualProperty.URL, array);
+                PropertyValue batchSize = new PropertyValue(mBatchSize);
+                tMap.Insert(ImageVisualProperty.BatchSize, batchSize);
+                PropertyValue cacheSize = new PropertyValue(mCacheSize);
+                tMap.Insert(ImageVisualProperty.CacheSize, cacheSize);
+                PropertyValue frameDelay = new PropertyValue(mFrameDelay);
+                tMap.Insert(ImageVisualProperty.FrameDelay, frameDelay);
+                PropertyValue loopCount = new PropertyValue(mLoopCount);
+                tMap.Insert(ImageVisualProperty.LoopCount, loopCount);
 
+                loopCount.Dispose();
+                frameDelay.Dispose();
+                cacheSize.Dispose();
+                batchSize.Dispose();
+                mArray.Dispose();
+                array.Dispose();
             }
             else
             {
-                tMap.Insert(ImageVisualProperty.URL, new PropertyValue(mUrl));
+                PropertyValue url = new PropertyValue(mUrl);
+                tMap.Insert(ImageVisualProperty.URL, url);
+                url.Dispose();
             }
 
             mMap = tMap;
-            SetProperty(ImageView.Property.IMAGE, new PropertyValue(mMap));
+            PropertyValue map = new PropertyValue(mMap);
+            SetProperty(ImageView.Property.IMAGE, map);
+            map.Dispose();
+
+            tMap.Dispose();
+            animatiedImage.Dispose();
         }
 
         /// <summary>