Fix CA2000 warning issues of GLWindow / ViewInternal.
authorguowei.wang <guowei.wang@samsung.com>
Tue, 10 Nov 2020 03:22:10 +0000 (11:22 +0800)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Thu, 19 Nov 2020 09:36:46 +0000 (18:36 +0900)
src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
src/Tizen.NUI/src/public/GLWindow.cs [changed mode: 0644->0755]

index 08f2c0e..00962f4 100755 (executable)
@@ -69,9 +69,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.WORLD_POSITION_X).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue wordPositionX = GetProperty(View.Property.WORLD_POSITION_X);
+                wordPositionX?.Get(out returnValue);
+                wordPositionX?.Dispose();
+                return returnValue;
             }
         }
 
@@ -79,9 +81,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.WORLD_POSITION_Y).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue wordPositionY = GetProperty(View.Property.WORLD_POSITION_Y);
+                wordPositionY?.Get(out returnValue);
+                wordPositionY?.Dispose();
+                return returnValue;
             }
         }
 
@@ -89,9 +93,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.WORLD_POSITION_Z).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue wordPositionZ = GetProperty(View.Property.WORLD_POSITION_Z);
+                wordPositionZ?.Get(out returnValue);
+                wordPositionZ?.Dispose();
+                return returnValue;
             }
         }
 
@@ -161,13 +167,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.PARENT_ORIGIN_X).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue parentOriginX = GetProperty(View.Property.PARENT_ORIGIN_X);
+                parentOriginX?.Get(out returnValue);
+                parentOriginX?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.PARENT_ORIGIN_X, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.PARENT_ORIGIN_X, setValue);
+                setValue.Dispose();
                 NotifyPropertyChanged();
             }
         }
@@ -176,13 +186,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.PARENT_ORIGIN_Y).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue parentOriginY = GetProperty(View.Property.PARENT_ORIGIN_Y);
+                parentOriginY?.Get(out returnValue);
+                parentOriginY?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.PARENT_ORIGIN_Y, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.PARENT_ORIGIN_Y, setValue);
+                setValue.Dispose();
                 NotifyPropertyChanged();
             }
         }
@@ -191,13 +205,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.PARENT_ORIGIN_Z).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue parentOriginZ = GetProperty(View.Property.PARENT_ORIGIN_Z);
+                parentOriginZ?.Get(out returnValue);
+                parentOriginZ?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.PARENT_ORIGIN_Z, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.PARENT_ORIGIN_Z, setValue);
+                setValue.Dispose();
                 NotifyPropertyChanged();
             }
         }
@@ -206,13 +224,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.ANCHOR_POINT_X).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue anchorPointX = GetProperty(View.Property.ANCHOR_POINT_X);
+                anchorPointX?.Get(out returnValue);
+                anchorPointX?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.ANCHOR_POINT_X, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.ANCHOR_POINT_X, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -220,13 +242,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.ANCHOR_POINT_Y).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue anchorPointY = GetProperty(View.Property.ANCHOR_POINT_Y);
+                anchorPointY?.Get(out returnValue);
+                anchorPointY?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.ANCHOR_POINT_Y, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.ANCHOR_POINT_Y, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -234,13 +260,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                float temp = 0.0f;
-                GetProperty(View.Property.ANCHOR_POINT_Z).Get(out temp);
-                return temp;
+                float returnValue = 0.0f;
+                PropertyValue anchorPointZ = GetProperty(View.Property.ANCHOR_POINT_Z);
+                anchorPointZ?.Get(out returnValue);
+                anchorPointZ?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.ANCHOR_POINT_Z, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.ANCHOR_POINT_Z, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -248,9 +278,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                Matrix temp = new Matrix();
-                GetProperty(View.Property.WORLD_MATRIX).Get(temp);
-                return temp;
+                Matrix returnValue = new Matrix();
+                PropertyValue wordMatrix = GetProperty(View.Property.WORLD_MATRIX);
+                wordMatrix?.Get(returnValue);
+                wordMatrix?.Dispose();
+                return returnValue;
             }
         }
 
@@ -263,13 +295,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                int temp = 0;
-                GetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID).Get(out temp);
-                return temp;
+                int returnValue = 0;
+                PropertyValue leftFocusableViewId = GetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID);
+                leftFocusableViewId?.Get(out returnValue);
+                leftFocusableViewId?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -277,13 +313,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                int temp = 0;
-                GetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID).Get(out temp);
-                return temp;
+                int returnValue = 0;
+                PropertyValue rightFocusableViewId = GetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID);
+                rightFocusableViewId?.Get(out returnValue);
+                rightFocusableViewId?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -291,13 +331,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                int temp = 0;
-                GetProperty(View.Property.UP_FOCUSABLE_VIEW_ID).Get(out temp);
-                return temp;
+                int returnValue = 0;
+                PropertyValue upFocusableViewId = GetProperty(View.Property.UP_FOCUSABLE_VIEW_ID);
+                upFocusableViewId?.Get(out returnValue);
+                upFocusableViewId?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.UP_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.UP_FOCUSABLE_VIEW_ID, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -305,13 +349,17 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-                int temp = 0;
-                GetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID).Get(out temp);
-                return temp;
+                int returnValue = 0;
+                PropertyValue downFocusableViewId = GetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID);
+                downFocusableViewId?.Get(out returnValue);
+                downFocusableViewId?.Dispose();
+                return returnValue;
             }
             set
             {
-                SetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID, new Tizen.NUI.PropertyValue(value));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID, setValue);
+                setValue.Dispose();
             }
         }
 
@@ -571,6 +619,7 @@ namespace Tizen.NUI.BaseComponents
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             Size2D size = new Size2D((int)ret.Width, (int)ret.Height);
+            ret.Dispose();
             return size;
         }
 
@@ -1041,15 +1090,19 @@ namespace Tizen.NUI.BaseComponents
             }
 
             Tizen.NUI.PropertyMap backgroundMap = new Tizen.NUI.PropertyMap();
-            Tizen.NUI.Object.GetProperty(swigCPtr, View.Property.BACKGROUND).Get(backgroundMap);
+            PropertyValue background = Tizen.NUI.Object.GetProperty(swigCPtr, View.Property.BACKGROUND);
+            background?.Get(backgroundMap);
 
             if (!backgroundMap.Empty())
             {
                 backgroundMap[Visual.Property.CornerRadius] = new PropertyValue(value);
-                Tizen.NUI.Object.SetProperty(swigCPtr, View.Property.BACKGROUND, new Tizen.NUI.PropertyValue(backgroundMap));
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(backgroundMap);
+                Tizen.NUI.Object.SetProperty(swigCPtr, View.Property.BACKGROUND, setValue);
+                setValue?.Dispose();
             }
-
             UpdateShadowCornerRadius(value);
+            backgroundMap?.Dispose();
+            background?.Dispose();
         }
 
         internal void UpdateStyle()
@@ -1146,25 +1199,33 @@ namespace Tizen.NUI.BaseComponents
 
             if (_onRelayoutEventCallback != null)
             {
-                this.OnRelayoutSignal().Disconnect(_onRelayoutEventCallback);
+                ViewSignal signal = this.OnRelayoutSignal();
+                signal?.Disconnect(_onRelayoutEventCallback);
+                signal?.Dispose();
                 _onRelayoutEventCallback = null;
             }
 
             if (_offWindowEventCallback != null)
             {
-                this.OffWindowSignal().Disconnect(_offWindowEventCallback);
+                ViewSignal signal = this.OffWindowSignal();
+                signal?.Disconnect(_offWindowEventCallback);
+                signal?.Dispose();
                 _offWindowEventCallback = null;
             }
 
             if (_onWindowEventCallback != null)
             {
-                this.OnWindowSignal().Disconnect(_onWindowEventCallback);
+                ViewSignal signal = this.OnWindowSignal();
+                signal?.Disconnect(_onWindowEventCallback);
+                signal?.Dispose();
                 _onWindowEventCallback = null;
             }
 
             if (_wheelEventCallback != null)
             {
-                this.WheelEventSignal().Disconnect(_wheelEventCallback);
+                WheelSignal signal = this.WheelEventSignal();
+                signal?.Disconnect(_wheelEventCallback);
+                signal?.Dispose();
             }
 
             if (WindowWheelEventHandler != null)
@@ -1174,49 +1235,67 @@ namespace Tizen.NUI.BaseComponents
 
             if (_hoverEventCallback != null)
             {
-                this.HoveredSignal().Disconnect(_hoverEventCallback);
+                HoverSignal signal = this.HoveredSignal();
+                signal?.Disconnect(_hoverEventCallback);
+                signal?.Dispose();
             }
 
             if (_interceptTouchDataCallback != null)
             {
-                this.InterceptTouchSignal().Disconnect(_interceptTouchDataCallback);
+                TouchDataSignal signal = this.InterceptTouchSignal();
+                signal?.Disconnect(_interceptTouchDataCallback);
+                signal?.Dispose();
             }
 
             if (_touchDataCallback != null)
             {
-                this.TouchSignal().Disconnect(_touchDataCallback);
+                TouchDataSignal signal = this.TouchSignal();
+                signal?.Disconnect(_touchDataCallback);
+                signal?.Dispose();
             }
 
             if (_ResourcesLoadedCallback != null)
             {
-                this.ResourcesLoadedSignal().Disconnect(_ResourcesLoadedCallback);
+                ViewSignal signal = this.ResourcesLoadedSignal();
+                signal?.Disconnect(_ResourcesLoadedCallback);
+                signal?.Dispose();
                 _ResourcesLoadedCallback = null;
             }
 
             if (_keyCallback != null)
             {
-                this.KeyEventSignal().Disconnect(_keyCallback);
+                ControlKeySignal signal = this.KeyEventSignal();
+                signal?.Disconnect(_keyCallback);
+                signal?.Dispose();
             }
 
             if (_keyInputFocusLostCallback != null)
             {
-                this.KeyInputFocusLostSignal().Disconnect(_keyInputFocusLostCallback);
+                KeyInputFocusSignal signal = this.KeyInputFocusLostSignal();
+                signal?.Disconnect(_keyInputFocusLostCallback);
+                signal?.Dispose();
             }
 
             if (_keyInputFocusGainedCallback != null)
             {
-                this.KeyInputFocusGainedSignal().Disconnect(_keyInputFocusGainedCallback);
+                KeyInputFocusSignal signal = this.KeyInputFocusGainedSignal();
+                signal?.Disconnect(_keyInputFocusGainedCallback);
+                signal?.Dispose();
             }
 
             if (_backgroundResourceLoadedCallback != null)
             {
-                this.ResourcesLoadedSignal().Disconnect(_backgroundResourceLoadedCallback);
+                ViewSignal signal = this.ResourcesLoadedSignal();
+                signal?.Disconnect(_backgroundResourceLoadedCallback);
+                signal?.Dispose();
                 _backgroundResourceLoadedCallback = null;
             }
 
             if (_onWindowSendEventCallback != null)
             {
-                this.OnWindowSignal().Disconnect(_onWindowSendEventCallback);
+                ViewSignal signal = this.OnWindowSignal();
+                signal?.Disconnect(_onWindowSendEventCallback);
+                signal?.Dispose();
             }
 
             // BaseHandle CPtr is used in Registry and there is danger of deletion if we keep using it here.
@@ -1323,12 +1402,17 @@ namespace Tizen.NUI.BaseComponents
             // TODO Update corner radius property only whe DALi supports visual property update.
             PropertyMap map = new PropertyMap();
 
-            if (Tizen.NUI.Object.GetProperty(swigCPtr, View.Property.SHADOW).Get(map) && !map.Empty())
+            PropertyValue shadowVal = Tizen.NUI.Object.GetProperty(swigCPtr, View.Property.SHADOW);
+            if (shadowVal.Get(map) && !map.Empty())
             {
                 map[Visual.Property.CornerRadius] = new PropertyValue(value);
 
-                Tizen.NUI.Object.SetProperty(swigCPtr, View.Property.SHADOW, new PropertyValue(map));
+                PropertyValue setValue = new PropertyValue(map);
+                Tizen.NUI.Object.SetProperty(swigCPtr, View.Property.SHADOW, setValue);
+                setValue?.Dispose();
             }
+            map?.Dispose();
+            shadowVal?.Dispose();
         }
 
         private bool EmptyOnTouch(object target, TouchEventArgs args)
old mode 100644 (file)
new mode 100755 (executable)
index c44bc62..68788c4
@@ -111,17 +111,22 @@ namespace Tizen.NUI
         {
             get
             {
-                var val = new Rectangle(Interop.GLWindow.GlWindow_GetPositionSize(swigCPtr), true);
+                global::System.IntPtr intPtr = Interop.GLWindow.GlWindow_GetPositionSize(swigCPtr);
+                var val = new Rectangle(intPtr, true);
                 Size2D ret = new Size2D(val.Width, val.Height);
+                val.Dispose();
 
                 return ret;
             }
             set
             {
-                var val = new Rectangle(Interop.GLWindow.GlWindow_GetPositionSize(swigCPtr), true);
-                Rectangle ret = new Rectangle(val.X, val.Y, value.Width, value.Height );
+                global::System.IntPtr intPtr = Interop.GLWindow.GlWindow_GetPositionSize(swigCPtr);
+                Rectangle val = new Rectangle(intPtr, true);
+                Rectangle ret = new Rectangle(val.X, val.Y, value.Width, value.Height);
+                val.Dispose();
 
                 Interop.GLWindow.GlWindow_SetPositionSize(swigCPtr, Rectangle.getCPtr(ret));
+                ret.Dispose();
             }
         }
 
@@ -218,8 +223,10 @@ namespace Tizen.NUI
         {
             get
             {
-                Rectangle val = new Rectangle(Interop.GLWindow.GlWindow_GetPositionSize(swigCPtr), true);
+                global::System.IntPtr intPtr = Interop.GLWindow.GlWindow_GetPositionSize(swigCPtr);
+                Rectangle val = new Rectangle(intPtr, true);
                 Rectangle ret = new Rectangle(val.X, val.Y, val.Width, val.Height );
+                val.Dispose();
 
                 return ret;
             }
@@ -395,10 +402,13 @@ namespace Tizen.NUI
             PropertyArray orientationArray = new PropertyArray();
             for (int i = 0; i < orientations.Count; i++)
             {
-                orientationArray.PushBack(new PropertyValue((int)orientations[i]));
+                PropertyValue val = new PropertyValue((int)orientations[i]);
+                orientationArray.PushBack(val);
+                val.Dispose();
             }
 
             Interop.GLWindow.GlWindow_SetAvailableOrientations(swigCPtr, PropertyArray.getCPtr(orientationArray), orientations.Count);
+            orientationArray.Dispose();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }