[NUI] Fix CA2000 issues for Visuals (#2473)

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

diff --git a/src/Tizen.NUI/src/public/Visuals/ArcVisual.cs b/src/Tizen.NUI/src/public/Visuals/ArcVisual.cs
index 7506ae2..b7e3528 100755 (executable)
--- a/src/Tizen.NUI/src/public/Visuals/ArcVisual.cs
+++ b/src/Tizen.NUI/src/public/Visuals/ArcVisual.cs
@@ -141,12 +141,25 @@ namespace Tizen.NUI
             _outputVisualMap = null;
 
             base.ComposingPropertyMap();
+            PropertyValue temp = new PropertyValue((int)Visual.Type.Arc);
+            _outputVisualMap.Add(Visual.Property.Type, temp);
+            temp.Dispose();
 
-            _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Arc));
-            _outputVisualMap.Add(ArcVisualProperty.Thickness, new PropertyValue(Thickness < 0.0f ? 0.0f : Thickness));
-            _outputVisualMap.Add(ArcVisualProperty.StartAngle, new PropertyValue(StartAngle));
-            _outputVisualMap.Add(ArcVisualProperty.SweepAngle, new PropertyValue(SweepAngle));
-            _outputVisualMap.Add(ArcVisualProperty.Cap, new PropertyValue((int)Cap));
+            temp = new PropertyValue(Thickness < 0.0f ? 0.0f : Thickness);
+            _outputVisualMap.Add(ArcVisualProperty.Thickness, temp);
+            temp.Dispose();
+
+            temp = new PropertyValue(StartAngle);
+            _outputVisualMap.Add(ArcVisualProperty.StartAngle, temp);
+            temp.Dispose();
+
+            temp = new PropertyValue(SweepAngle);
+            _outputVisualMap.Add(ArcVisualProperty.SweepAngle, temp);
+            temp.Dispose();
+
+            temp = new PropertyValue((int)Cap);
+            _outputVisualMap.Add(ArcVisualProperty.Cap, temp);
+            temp.Dispose();
         }
 
         #endregion Methods

diff --git a/src/Tizen.NUI/src/public/Visuals/BorderVisual.cs b/src/Tizen.NUI/src/public/Visuals/BorderVisual.cs
index 5500f24..25eef6b 100755 (executable)
--- a/src/Tizen.NUI/src/public/Visuals/BorderVisual.cs
+++ b/src/Tizen.NUI/src/public/Visuals/BorderVisual.cs
@@ -23,9 +23,9 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class BorderVisual : VisualMap
     {
-        private Color _color = null;
-        private float? _size = null;
-        private bool? _antiAliasing = null;
+        private Color color = null;
+        private float? size = null;
+        private bool? antiAliasing = null;
 
         /// <summary>
         /// Constructor.
@@ -44,11 +44,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _color;
+                return color;
             }
             set
             {
-                _color = value;
+                color = value;
                 UpdateVisual();
             }
         }
@@ -62,11 +62,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _size ?? (-1.0f);
+                return size ?? (-1.0f);
             }
             set
             {
-                _size = value;
+                size = value;
                 UpdateVisual();
             }
         }
@@ -81,11 +81,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _antiAliasing ?? (false);
+                return antiAliasing ?? (false);
             }
             set
             {
-                _antiAliasing = value;
+                antiAliasing = value;
                 UpdateVisual();
             }
         }
@@ -96,13 +96,27 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_color != null && _size != null)
+            if (color != null && size != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Border));
-                _outputVisualMap.Add(BorderVisualProperty.Size, new PropertyValue((float)_size));
-                _outputVisualMap.Add(BorderVisualProperty.Color, new PropertyValue(_color));
-                if (_antiAliasing != null) { _outputVisualMap.Add(BorderVisualProperty.AntiAliasing, new PropertyValue((bool)_antiAliasing)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Border);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue((float)size);
+                _outputVisualMap.Add(BorderVisualProperty.Size, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(color);
+                _outputVisualMap.Add(BorderVisualProperty.Color, temp);
+                temp.Dispose();
+
+                if (antiAliasing != null)
+                {
+                    temp = new PropertyValue((bool)antiAliasing);
+                    _outputVisualMap.Add(BorderVisualProperty.AntiAliasing, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }

diff --git a/src/Tizen.NUI/src/public/Visuals/ColorVisual.cs b/src/Tizen.NUI/src/public/Visuals/ColorVisual.cs
index bacde98..d2b5883 100755 (executable)
--- a/src/Tizen.NUI/src/public/Visuals/ColorVisual.cs
+++ b/src/Tizen.NUI/src/public/Visuals/ColorVisual.cs
@@ -23,8 +23,8 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class ColorVisual : VisualMap
     {
-        private Color _mixColorForColorVisual = null;
-        private bool? _renderIfTransparent = false;
+        private Color mixColorForColorVisual = null;
+        private bool? renderIfTransparent = false;
 
         /// <summary>
         /// Constructor.
@@ -43,11 +43,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _mixColorForColorVisual;
+                return mixColorForColorVisual;
             }
             set
             {
-                _mixColorForColorVisual = value;
+                mixColorForColorVisual = value;
                 UpdateVisual();
             }
         }
@@ -61,11 +61,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _renderIfTransparent ?? (false);
+                return renderIfTransparent ?? (false);
             }
             set
             {
-                _renderIfTransparent = value;
+                renderIfTransparent = value;
                 UpdateVisual();
             }
         }
@@ -76,7 +76,7 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            Color color = _mixColorForColorVisual ?? _mixColor;
+            Color color = mixColorForColorVisual ?? _mixColor;
 
             if (color != null)
             {
@@ -84,8 +84,13 @@ namespace Tizen.NUI
 
                 base.ComposingPropertyMap();
 
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Color));
-                _outputVisualMap.Add(ColorVisualProperty.MixColor, new PropertyValue(color));
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Color);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(color);
+                _outputVisualMap.Add(ColorVisualProperty.MixColor, temp);
+                temp.Dispose();
             }
             else
             {

diff --git a/src/Tizen.NUI/src/public/Visuals/ImageVisual.cs b/src/Tizen.NUI/src/public/Visuals/ImageVisual.cs
index 8b5043a..be1e741 100755 (executable)
--- a/src/Tizen.NUI/src/public/Visuals/ImageVisual.cs
+++ b/src/Tizen.NUI/src/public/Visuals/ImageVisual.cs
@@ -23,25 +23,25 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class ImageVisual : VisualMap
     {
-        private string _url = null;
-        private string _alphaMaskUrl = null;
-        private string _auxiliaryImageUrl = null;
-        private FittingModeType? _fittingMode = null;
-        private SamplingModeType? _samplingMode = null;
-        private int? _desiredWidth = null;
-        private int? _desiredHeight = null;
-        private bool? _synchronousLoading = false;
-        private bool? _borderOnly = null;
-        private Vector4 _pixelArea = null;
-        private WrapModeType? _wrapModeU = null;
-        private WrapModeType? _wrapModeV = null;
-        private float? _auxiliaryImageAlpha = null;
-        private float? _maskContentScale = null;
-        private bool? _cropToMask = null;
-        private ReleasePolicyType? _releasePolicy = null;
-        private LoadPolicyType? _loadPolicy = null;
-        private bool? _orientationCorrection = true;
-        private bool? _atlasing = false;
+        private string url = null;
+        private string alphaMaskUrl = null;
+        private string auxiliaryImageUrl = null;
+        private FittingModeType? fittingMode = null;
+        private SamplingModeType? samplingMode = null;
+        private int? desiredWidth = null;
+        private int? desiredHeight = null;
+        private bool? synchronousLoading = false;
+        private bool? borderOnly = null;
+        private Vector4 pixelArea = null;
+        private WrapModeType? wrapModeU = null;
+        private WrapModeType? wrapModeV = null;
+        private float? auxiliaryImageAlpha = null;
+        private float? maskContentScale = null;
+        private bool? cropToMask = null;
+        private ReleasePolicyType? releasePolicy = null;
+        private LoadPolicyType? loadPolicy = null;
+        private bool? orientationCorrection = true;
+        private bool? atlasing = false;
 
         /// <summary>
         /// Constructor.
@@ -60,11 +60,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _url;
+                return url;
             }
             set
             {
-                _url = (value == null ? "" : value);
+                url = (value == null ? "" : value);
                 UpdateVisual();
             }
         }
@@ -79,11 +79,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _alphaMaskUrl;
+                return alphaMaskUrl;
             }
             set
             {
-                _alphaMaskUrl = value;
+                alphaMaskUrl = value;
                 UpdateVisual();
             }
         }
@@ -97,11 +97,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _auxiliaryImageUrl;
+                return auxiliaryImageUrl;
             }
             set
             {
-                _auxiliaryImageUrl = value;
+                auxiliaryImageUrl = value;
                 UpdateVisual();
             }
         }
@@ -117,11 +117,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _fittingMode ?? (FittingModeType.ShrinkToFit);
+                return fittingMode ?? (FittingModeType.ShrinkToFit);
             }
             set
             {
-                _fittingMode = value;
+                fittingMode = value;
                 UpdateVisual();
             }
         }
@@ -137,11 +137,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _samplingMode ?? (SamplingModeType.Box);
+                return samplingMode ?? (SamplingModeType.Box);
             }
             set
             {
-                _samplingMode = value;
+                samplingMode = value;
                 UpdateVisual();
             }
         }
@@ -157,11 +157,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _desiredWidth ?? (-1);
+                return desiredWidth ?? (-1);
             }
             set
             {
-                _desiredWidth = value;
+                desiredWidth = value;
                 UpdateVisual();
             }
         }
@@ -177,11 +177,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _desiredHeight ?? (-1);
+                return desiredHeight ?? (-1);
             }
             set
             {
-                _desiredHeight = value;
+                desiredHeight = value;
                 UpdateVisual();
             }
         }
@@ -197,11 +197,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _synchronousLoading ?? (false);
+                return synchronousLoading ?? (false);
             }
             set
             {
-                _synchronousLoading = value;
+                synchronousLoading = value;
                 UpdateVisual();
             }
         }
@@ -217,11 +217,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _borderOnly ?? (false);
+                return borderOnly ?? (false);
             }
             set
             {
-                _borderOnly = value;
+                borderOnly = value;
                 UpdateVisual();
             }
         }
@@ -239,11 +239,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _pixelArea ?? (new Vector4(0.0f, 0.0f, 1.0f, 1.0f));
+                return pixelArea ?? (new Vector4(0.0f, 0.0f, 1.0f, 1.0f));
             }
             set
             {
-                _pixelArea = value;
+                pixelArea = value;
                 UpdateVisual();
             }
         }
@@ -260,11 +260,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _wrapModeU ?? (WrapModeType.Default);
+                return wrapModeU ?? (WrapModeType.Default);
             }
             set
             {
-                _wrapModeU = value;
+                wrapModeU = value;
                 UpdateVisual();
             }
         }
@@ -282,11 +282,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _wrapModeV ?? (WrapModeType.Default);
+                return wrapModeV ?? (WrapModeType.Default);
             }
             set
             {
-                _wrapModeV = value;
+                wrapModeV = value;
                 UpdateVisual();
             }
         }
@@ -299,11 +299,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _maskContentScale ?? 1.0f;
+                return maskContentScale ?? 1.0f;
             }
             set
             {
-                _maskContentScale = value;
+                maskContentScale = value;
                 UpdateVisual();
             }
         }
@@ -316,11 +316,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _cropToMask ?? false;
+                return cropToMask ?? false;
             }
             set
             {
-                _cropToMask = value;
+                cropToMask = value;
                 UpdateVisual();
             }
         }
@@ -333,11 +333,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _auxiliaryImageAlpha ?? 1.0f;
+                return auxiliaryImageAlpha ?? 1.0f;
             }
             set
             {
-                _auxiliaryImageAlpha = value;
+                auxiliaryImageAlpha = value;
                 UpdateVisual();
             }
         }
@@ -351,11 +351,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _releasePolicy ?? (ReleasePolicyType.Destroyed);
+                return releasePolicy ?? (ReleasePolicyType.Destroyed);
             }
             set
             {
-                _releasePolicy = value;
+                releasePolicy = value;
                 UpdateVisual();
             }
         }
@@ -370,11 +370,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _loadPolicy ?? (LoadPolicyType.Attached);
+                return loadPolicy ?? (LoadPolicyType.Attached);
             }
             set
             {
-                _loadPolicy = value;
+                loadPolicy = value;
                 UpdateVisual();
             }
         }
@@ -390,11 +390,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _orientationCorrection ?? (true);
+                return orientationCorrection ?? (true);
             }
             set
             {
-                _orientationCorrection = value;
+                orientationCorrection = value;
                 UpdateVisual();
             }
         }
@@ -408,11 +408,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _atlasing ?? (false);
+                return atlasing ?? (false);
             }
             set
             {
-                _atlasing = value;
+                atlasing = value;
                 UpdateVisual();
             }
         }
@@ -423,29 +423,142 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_url != null)
+            if (url != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));
-                _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url));
-                if (_alphaMaskUrl != null) { _outputVisualMap.Add(ImageVisualProperty.AlphaMaskURL, new PropertyValue(_alphaMaskUrl)); }
-                if (_auxiliaryImageUrl != null) { _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageURL, new PropertyValue(_auxiliaryImageUrl)); }
-                if (_fittingMode != null) { _outputVisualMap.Add(ImageVisualProperty.FittingMode, new PropertyValue((int)_fittingMode)); }
-                if (_samplingMode != null) { _outputVisualMap.Add(ImageVisualProperty.SamplingMode, new PropertyValue((int)_samplingMode)); }
-                if (_desiredWidth != null) { _outputVisualMap.Add(ImageVisualProperty.DesiredWidth, new PropertyValue((int)_desiredWidth)); }
-                if (_desiredHeight != null) { _outputVisualMap.Add(ImageVisualProperty.DesiredHeight, new PropertyValue((int)_desiredHeight)); }
-                if (_synchronousLoading != null) { _outputVisualMap.Add(ImageVisualProperty.SynchronousLoading, new PropertyValue((bool)_synchronousLoading)); }
-                if (_borderOnly != null) { _outputVisualMap.Add(ImageVisualProperty.BorderOnly, new PropertyValue((bool)_borderOnly)); }
-                if (_pixelArea != null) { _outputVisualMap.Add(ImageVisualProperty.PixelArea, new PropertyValue(_pixelArea)); }
-                if (_wrapModeU != null) { _outputVisualMap.Add(ImageVisualProperty.WrapModeU, new PropertyValue((int)_wrapModeU)); }
-                if (_wrapModeV != null) { _outputVisualMap.Add(ImageVisualProperty.WrapModeV, new PropertyValue((int)_wrapModeV)); }
-                if (_maskContentScale != null) { _outputVisualMap.Add(ImageVisualProperty.MaskContentScale, new PropertyValue((float)_maskContentScale)); }
-                if (_cropToMask != null) { _outputVisualMap.Add(ImageVisualProperty.CropToMask, new PropertyValue((bool)_cropToMask)); }
-                if (_auxiliaryImageAlpha != null) { _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageAlpha, new PropertyValue((float)_auxiliaryImageAlpha)); }
-                if (_releasePolicy != null) { _outputVisualMap.Add(ImageVisualProperty.ReleasePolicy, new PropertyValue((int)_releasePolicy)); }
-                if (_loadPolicy != null) { _outputVisualMap.Add(ImageVisualProperty.LoadPolicy, new PropertyValue((int)_loadPolicy)); }
-                if (_orientationCorrection != null) { _outputVisualMap.Add(ImageVisualProperty.OrientationCorrection, new PropertyValue((bool)_orientationCorrection)); }
-                if (_atlasing != null) { _outputVisualMap.Add(ImageVisualProperty.Atlasing, new PropertyValue((bool)_atlasing)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.Image);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(url);
+                _outputVisualMap.Add(ImageVisualProperty.URL, temp);
+                temp.Dispose();
+
+                if (alphaMaskUrl != null)
+                {
+                    temp = new PropertyValue(alphaMaskUrl);
+                    _outputVisualMap.Add(ImageVisualProperty.AlphaMaskURL, temp);
+                    temp.Dispose();
+                }
+
+                if (auxiliaryImageUrl != null)
+                {
+                    temp = new PropertyValue(auxiliaryImageUrl);
+                    _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageURL, temp);
+                    temp.Dispose();
+                }
+
+                if (fittingMode != null)
+                {
+                    temp = new PropertyValue((int)fittingMode);
+                    _outputVisualMap.Add(ImageVisualProperty.FittingMode, temp);
+                    temp.Dispose();
+                }
+
+                if (samplingMode != null)
+                {
+                    temp = new PropertyValue((int)samplingMode);
+                    _outputVisualMap.Add(ImageVisualProperty.SamplingMode, temp);
+                    temp.Dispose();
+                }
+
+                if (desiredWidth != null)
+                {
+                    temp = new PropertyValue((int)desiredWidth);
+                    _outputVisualMap.Add(ImageVisualProperty.DesiredWidth, temp);
+                    temp.Dispose();
+                }
+
+                if (desiredHeight != null)
+                {
+                    temp = new PropertyValue((int)desiredHeight);
+                    _outputVisualMap.Add(ImageVisualProperty.DesiredHeight, temp);
+                    temp.Dispose();
+                }
+
+                if (synchronousLoading != null)
+                {
+                    temp = new PropertyValue((bool)synchronousLoading);
+                    _outputVisualMap.Add(ImageVisualProperty.SynchronousLoading, temp);
+                    temp.Dispose();
+                }
+
+                if (borderOnly != null)
+                {
+                    temp = new PropertyValue((bool)borderOnly);
+                    _outputVisualMap.Add(ImageVisualProperty.BorderOnly, temp);
+                    temp.Dispose();
+                }
+
+                if (pixelArea != null)
+                {
+                    temp = new PropertyValue(pixelArea);
+                    _outputVisualMap.Add(ImageVisualProperty.PixelArea, temp);
+                    temp.Dispose();
+                }
+
+                if (wrapModeU != null)
+                {
+                    temp = new PropertyValue((int)wrapModeU);
+                    _outputVisualMap.Add(ImageVisualProperty.WrapModeU, temp);
+                    temp.Dispose();
+                }
+
+                if (wrapModeV != null)
+                {
+                    temp = new PropertyValue((int)wrapModeV);
+                    _outputVisualMap.Add(ImageVisualProperty.WrapModeV, temp);
+                    temp.Dispose();
+                }
+
+                if (maskContentScale != null)
+                {
+                    temp = new PropertyValue((float)maskContentScale);
+                    _outputVisualMap.Add(ImageVisualProperty.MaskContentScale, temp);
+                    temp.Dispose();
+                }
+
+                if (cropToMask != null)
+                {
+                    temp = new PropertyValue((bool)cropToMask);
+                    _outputVisualMap.Add(ImageVisualProperty.CropToMask, temp);
+                    temp.Dispose();
+                }
+
+                if (auxiliaryImageAlpha != null)
+                {
+                    temp = new PropertyValue((float)auxiliaryImageAlpha);
+                    _outputVisualMap.Add(ImageVisualProperty.AuxiliaryImageAlpha, temp);
+                    temp.Dispose();
+                }
+
+                if (releasePolicy != null)
+                {
+                    temp = new PropertyValue((int)releasePolicy);
+                    _outputVisualMap.Add(ImageVisualProperty.ReleasePolicy, temp);
+                    temp.Dispose();
+                }
+
+                if (loadPolicy != null)
+                {
+                    temp = new PropertyValue((int)loadPolicy);
+                    _outputVisualMap.Add(ImageVisualProperty.LoadPolicy, temp);
+                    temp.Dispose();
+                }
+
+                if (orientationCorrection != null)
+                {
+                    temp = new PropertyValue((bool)orientationCorrection);
+                    _outputVisualMap.Add(ImageVisualProperty.OrientationCorrection, temp);
+                    temp.Dispose();
+                }
+
+                if (atlasing != null)
+                {
+                    temp = new PropertyValue((bool)atlasing);
+                    _outputVisualMap.Add(ImageVisualProperty.Atlasing, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }

diff --git a/src/Tizen.NUI/src/public/Visuals/NPatchVisual.cs b/src/Tizen.NUI/src/public/Visuals/NPatchVisual.cs
index f8df131..b06f9cf 100755 (executable)
--- a/src/Tizen.NUI/src/public/Visuals/NPatchVisual.cs
+++ b/src/Tizen.NUI/src/public/Visuals/NPatchVisual.cs
@@ -23,9 +23,9 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class NPatchVisual : VisualMap
     {
-        private string _url = null;
-        private bool? _borderOnly = null;
-        private Rectangle _border = null;
+        private string url = null;
+        private bool? borderOnly = null;
+        private Rectangle border = null;
 
         /// <summary>
         /// Constructor.
@@ -44,11 +44,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _url;
+                return url;
             }
             set
             {
-                _url = value;
+                url = value;
                 UpdateVisual();
             }
         }
@@ -64,11 +64,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _borderOnly ?? false;
+                return borderOnly ?? false;
             }
             set
             {
-                _borderOnly = value;
+                borderOnly = value;
                 UpdateVisual();
             }
         }
@@ -83,11 +83,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _border;
+                return border;
             }
             set
             {
-                _border = value;
+                border = value;
                 UpdateVisual();
             }
         }
@@ -98,13 +98,30 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_url != null)
+            if (url != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.NPatch));
-                _outputVisualMap.Add(NpatchImageVisualProperty.URL, new PropertyValue(_url));
-                if (_borderOnly != null) { _outputVisualMap.Add(NpatchImageVisualProperty.BorderOnly, new PropertyValue((bool)_borderOnly)); }
-                if (_border != null) { _outputVisualMap.Add(NpatchImageVisualProperty.Border, new PropertyValue(_border)); }
+                PropertyValue temp = new PropertyValue((int)Visual.Type.NPatch);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+
+                temp = new PropertyValue(url);
+                _outputVisualMap.Add(NpatchImageVisualProperty.URL, temp);
+                temp.Dispose();
+
+                if (borderOnly != null)
+                {
+                    temp = new PropertyValue((bool)borderOnly);
+                    _outputVisualMap.Add(NpatchImageVisualProperty.BorderOnly, temp);
+                    temp.Dispose();
+                }
+
+                if (border != null)
+                {
+                    temp = new PropertyValue(border);
+                    _outputVisualMap.Add(NpatchImageVisualProperty.Border, temp);
+                    temp.Dispose();
+                }
                 base.ComposingPropertyMap();
             }
         }

diff --git a/src/Tizen.NUI/src/public/Visuals/SVGVisual.cs b/src/Tizen.NUI/src/public/Visuals/SVGVisual.cs
index 4c071e0..c951cad 100755 (executable)
--- a/src/Tizen.NUI/src/public/Visuals/SVGVisual.cs
+++ b/src/Tizen.NUI/src/public/Visuals/SVGVisual.cs
@@ -23,7 +23,7 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public class SVGVisual : VisualMap
     {
-        private string _url = null;
+        private string url = null;
 
         /// <summary>
         /// Constructor.
@@ -41,11 +41,11 @@ namespace Tizen.NUI
         {
             get
             {
-                return _url;
+                return url;
             }
             set
             {
-                _url = value;
+                url = value;
                 UpdateVisual();
             }
         }
@@ -56,11 +56,15 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void ComposingPropertyMap()
         {
-            if (_url != null)
+            if (url != null)
             {
                 _outputVisualMap = new PropertyMap();
-                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.SVG));
-                _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url));
+                PropertyValue temp = new PropertyValue((int)Visual.Type.SVG);
+                _outputVisualMap.Add(Visual.Property.Type, temp);
+                temp.Dispose();
+                temp = new PropertyValue(url);
+                _outputVisualMap.Add(ImageVisualProperty.URL, temp);
+                temp.Dispose();
                 base.ComposingPropertyMap();
             }
         }