From: Jiyun Yang <ji.yang@samsung.com>
Date: Thu, 7 Jan 2021 12:40:19 +0000 (+0900)
Subject: Revert "[NUI] Fix CA2000 Warnings"
X-Git-Tag: accepted/tizen/unified/20210219.040944~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de01c93eeefb509b0fb147b15901743c5b15fa5f;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

Revert "[NUI] Fix CA2000 Warnings"

This reverts commit 92f2d926ec881a0ccacd447401526dcd19cf01b0.
---

diff --git a/src/Tizen.NUI/src/public/LongPressGestureDetector.cs b/src/Tizen.NUI/src/public/LongPressGestureDetector.cs
index 09bae0a..632b1fb 100755
--- a/src/Tizen.NUI/src/public/LongPressGestureDetector.cs
+++ b/src/Tizen.NUI/src/public/LongPressGestureDetector.cs
@@ -85,7 +85,6 @@ namespace Tizen.NUI
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void DetectedCallbackType(IntPtr actor, IntPtr longPressGesture);
         private DetectedCallbackType _detectedCallback;
-        private LongPressGestureDetectedSignal detectedSignal;
 
         /// <summary>
         /// This signal is emitted when the specified long press is detected on the attached view.
@@ -99,8 +98,7 @@ namespace Tizen.NUI
                 if (_detectedEventHandler == null)
                 {
                     _detectedCallback = OnLongPressGestureDetected;
-                    detectedSignal = DetectedSignal();
-                    detectedSignal.Connect(_detectedCallback);
+                    DetectedSignal().Connect(_detectedCallback);
                 }
 
                 _detectedEventHandler += value;
@@ -110,11 +108,9 @@ namespace Tizen.NUI
             {
                 _detectedEventHandler -= value;
 
-                if (_detectedEventHandler == null && detectedSignal?.Empty() == false)
+                if (_detectedEventHandler == null && DetectedSignal().Empty() == false)
                 {
-                    detectedSignal.Disconnect(_detectedCallback);
-                    detectedSignal.Dispose();
-                    detectedSignal = null;
+                    DetectedSignal().Disconnect(_detectedCallback);
                 }
             }
         }
@@ -208,11 +204,9 @@ namespace Tizen.NUI
         [EditorBrowsable(EditorBrowsableState.Never)]
         protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
         {
-            if (_detectedEventHandler == null && detectedSignal?.Empty() == false)
+            if (_detectedEventHandler == null && DetectedSignal().Empty() == false)
             {
-                detectedSignal.Disconnect(_detectedCallback);
-                detectedSignal.Dispose();
-                detectedSignal = null;
+                DetectedSignal().Disconnect(_detectedCallback);
             }
             Interop.LongPressGestureDetector.DeleteLongPressGestureDetector(swigCPtr);
         }
diff --git a/src/Tizen.NUI/src/public/PanGestureDetector.cs b/src/Tizen.NUI/src/public/PanGestureDetector.cs
index 3fa4db3..05bbf89 100755
--- a/src/Tizen.NUI/src/public/PanGestureDetector.cs
+++ b/src/Tizen.NUI/src/public/PanGestureDetector.cs
@@ -58,7 +58,6 @@ namespace Tizen.NUI
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void DetectedCallbackType(IntPtr actor, IntPtr panGesture);
         private DetectedCallbackType _detectedCallback;
-        private PanGestureDetectedSignal detectedSignal;
 
         /// <summary>
         /// This signal is emitted when the specified pan is detected on the attached view.
@@ -72,8 +71,7 @@ namespace Tizen.NUI
                 if (_detectedEventHandler == null)
                 {
                     _detectedCallback = OnPanGestureDetected;
-                    detectedSignal = DetectedSignal();
-                    detectedSignal.Connect(_detectedCallback);
+                    DetectedSignal().Connect(_detectedCallback);
                 }
 
                 _detectedEventHandler += value;
@@ -83,11 +81,9 @@ namespace Tizen.NUI
             {
                 _detectedEventHandler -= value;
 
-                if (_detectedEventHandler == null && detectedSignal?.Empty() == false)
+                if (_detectedEventHandler == null && DetectedSignal().Empty() == false)
                 {
-                    detectedSignal.Disconnect(_detectedCallback);
-                    detectedSignal.Dispose();
-                    detectedSignal = null;
+                    DetectedSignal().Disconnect(_detectedCallback);
                 }
             }
         }
@@ -229,9 +225,7 @@ namespace Tizen.NUI
             get
             {
                 Vector2 temp = new Vector2(0.0f, 0.0f);
-                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.ScreenDisplacement);
-                pValue.Get(temp);
-                pValue.Dispose();
+                Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.ScreenDisplacement).Get(temp);
                 return temp;
             }
         }
@@ -246,9 +240,7 @@ namespace Tizen.NUI
             get
             {
                 Vector2 temp = new Vector2(0.0f, 0.0f);
-                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.ScreenVelocity);
-                pValue.Get(temp);
-                pValue.Dispose();
+                Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.ScreenVelocity).Get(temp);
                 return temp;
             }
         }
@@ -263,9 +255,7 @@ namespace Tizen.NUI
             get
             {
                 Vector2 temp = new Vector2(0.0f, 0.0f);
-                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.LocalPosition);
-                pValue.Get(temp);
-                pValue.Dispose();
+                Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.LocalPosition).Get(temp);
                 return temp;
             }
         }
@@ -280,9 +270,7 @@ namespace Tizen.NUI
             get
             {
                 Vector2 temp = new Vector2(0.0f, 0.0f);
-                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.LocalDisplacement);
-                pValue.Get(temp);
-                pValue.Dispose();
+                Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.LocalDisplacement).Get(temp);
                 return temp;
             }
         }
@@ -297,9 +285,7 @@ namespace Tizen.NUI
             get
             {
                 Vector2 temp = new Vector2(0.0f, 0.0f);
-                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.LocalVelocity);
-                pValue.Get(temp);
-                pValue.Dispose();
+                Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.LocalVelocity).Get(temp);
                 return temp;
             }
         }
@@ -314,9 +300,7 @@ namespace Tizen.NUI
             get
             {
                 bool temp = false;
-                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.PANNING);
-                pValue.Get(out temp);
-                pValue.Dispose();
+                Tizen.NUI.Object.GetProperty(SwigCPtr, PanGestureDetector.Property.PANNING).Get(out temp);
                 return temp;
             }
         }
@@ -535,8 +519,7 @@ namespace Tizen.NUI
         {
             if (_detectedCallback != null)
             {
-                detectedSignal?.Disconnect(_detectedCallback);
-                detectedSignal?.Dispose();
+                DetectedSignal().Disconnect(_detectedCallback);
             }
 
             Interop.PanGestureDetector.DeletePanGestureDetector(swigCPtr);
diff --git a/src/Tizen.NUI/src/public/PinchGestureDetector.cs b/src/Tizen.NUI/src/public/PinchGestureDetector.cs
index a0932cd..f8fdb00 100755
--- a/src/Tizen.NUI/src/public/PinchGestureDetector.cs
+++ b/src/Tizen.NUI/src/public/PinchGestureDetector.cs
@@ -58,7 +58,6 @@ namespace Tizen.NUI
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void DetectedCallbackType(IntPtr actor, IntPtr pinchGesture);
         private DetectedCallbackType _detectedCallback;
-        private PinchGestureDetectedSignal detectedSignal;
 
         /// <summary>
         /// This signal is emitted when the specified pinch is detected on the attached view.
@@ -72,8 +71,7 @@ namespace Tizen.NUI
                 if (_detectedEventHandler == null)
                 {
                     _detectedCallback = OnPinchGestureDetected;
-                    detectedSignal = DetectedSignal();
-                    detectedSignal.Connect(_detectedCallback);
+                    DetectedSignal().Connect(_detectedCallback);
                 }
 
                 _detectedEventHandler += value;
@@ -83,11 +81,9 @@ namespace Tizen.NUI
             {
                 _detectedEventHandler -= value;
 
-                if (_detectedEventHandler == null && detectedSignal?.Empty() == false)
+                if (_detectedEventHandler == null && DetectedSignal().Empty() == false)
                 {
-                    detectedSignal.Disconnect(_detectedCallback);
-                    detectedSignal.Dispose();
-                    detectedSignal = null;
+                    DetectedSignal().Disconnect(_detectedCallback);
                 }
             }
         }
@@ -132,8 +128,7 @@ namespace Tizen.NUI
         {
             if (_detectedCallback != null)
             {
-                detectedSignal?.Disconnect(_detectedCallback);
-                detectedSignal?.Dispose();
+                DetectedSignal().Disconnect(_detectedCallback);
             }
 
             Interop.PinchGesture.DeletePinchGestureDetector(swigCPtr);
diff --git a/src/Tizen.NUI/src/public/PropertyNotification.cs b/src/Tizen.NUI/src/public/PropertyNotification.cs
index 4a5ffff..48eea3e 100755
--- a/src/Tizen.NUI/src/public/PropertyNotification.cs
+++ b/src/Tizen.NUI/src/public/PropertyNotification.cs
@@ -31,7 +31,6 @@ namespace Tizen.NUI
 
         private DaliEventHandler<object, NotifyEventArgs> _propertyNotificationNotifyEventHandler;
         private NotifyEventCallbackDelegate _propertyNotificationNotifyEventCallbackDelegate;
-        private PropertyNotifySignal notifySignal;
 
         /// <summary>
         /// Create a instance of PropertyNotification.
@@ -73,8 +72,7 @@ namespace Tizen.NUI
                     _propertyNotificationNotifyEventHandler += value;
 
                     _propertyNotificationNotifyEventCallbackDelegate = new NotifyEventCallbackDelegate(OnPropertyNotificationNotify);
-                    notifySignal = this.NotifySignal();
-                    notifySignal.Connect(_propertyNotificationNotifyEventCallbackDelegate);
+                    this.NotifySignal().Connect(_propertyNotificationNotifyEventCallbackDelegate);
                 }
             }
 
@@ -82,9 +80,7 @@ namespace Tizen.NUI
             {
                 if (_propertyNotificationNotifyEventHandler != null)
                 {
-                    notifySignal?.Disconnect(_propertyNotificationNotifyEventCallbackDelegate);
-                    notifySignal?.Dispose();
-                    notifySignal = null;
+                    this.NotifySignal().Disconnect(_propertyNotificationNotifyEventCallbackDelegate);
                 }
 
                 _propertyNotificationNotifyEventHandler -= value;
diff --git a/src/Tizen.NUI/src/public/RotationGestureDetector.cs b/src/Tizen.NUI/src/public/RotationGestureDetector.cs
index 291f101..43a06da 100755
--- a/src/Tizen.NUI/src/public/RotationGestureDetector.cs
+++ b/src/Tizen.NUI/src/public/RotationGestureDetector.cs
@@ -58,7 +58,6 @@ namespace Tizen.NUI
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void DetectedCallbackType(IntPtr actor, IntPtr rotationGesture);
         private DetectedCallbackType _detectedCallback;
-        private RotationGestureDetectedSignal detectedSignal;
 
         /// <summary>
         /// This signal is emitted when the specified rotation is detected on the attached view.
@@ -72,8 +71,7 @@ namespace Tizen.NUI
                 if (_detectedEventHandler == null)
                 {
                     _detectedCallback = OnRotationGestureDetected;
-                    detectedSignal = DetectedSignal();
-                    detectedSignal.Connect(_detectedCallback);
+                    DetectedSignal().Connect(_detectedCallback);
                 }
 
                 _detectedEventHandler += value;
@@ -83,11 +81,9 @@ namespace Tizen.NUI
             {
                 _detectedEventHandler -= value;
 
-                if (_detectedEventHandler == null && detectedSignal?.Empty() == false)
+                if (_detectedEventHandler == null && DetectedSignal().Empty() == false)
                 {
-                    detectedSignal.Disconnect(_detectedCallback);
-                    detectedSignal.Dispose();
-                    detectedSignal = null;
+                    DetectedSignal().Disconnect(_detectedCallback);
                 }
             }
         }
@@ -132,8 +128,7 @@ namespace Tizen.NUI
         {
             if (_detectedCallback != null)
             {
-                detectedSignal?.Disconnect(_detectedCallback);
-                detectedSignal?.Dispose();
+                DetectedSignal().Disconnect(_detectedCallback);
             }
 
             Interop.RotationGesture.DeleteRotationGestureDetector(swigCPtr);
diff --git a/src/Tizen.NUI/src/public/Shader.cs b/src/Tizen.NUI/src/public/Shader.cs
index e970b57..424f0f5 100755
--- a/src/Tizen.NUI/src/public/Shader.cs
+++ b/src/Tizen.NUI/src/public/Shader.cs
@@ -59,16 +59,12 @@ namespace Tizen.NUI
             get
             {
                 Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
-                var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Shader.Property.PROGRAM);
-                pValue.Get(temp);
-                pValue.Dispose();
+                Tizen.NUI.Object.GetProperty(SwigCPtr, Shader.Property.PROGRAM).Get(temp);
                 return temp;
             }
             set
             {
-                var temp = new Tizen.NUI.PropertyValue(value);
-                Tizen.NUI.Object.SetProperty(SwigCPtr, Shader.Property.PROGRAM, temp);
-                temp.Dispose();
+                Tizen.NUI.Object.SetProperty(SwigCPtr, Shader.Property.PROGRAM, new Tizen.NUI.PropertyValue(value));
             }
         }
 
diff --git a/src/Tizen.NUI/src/public/StyleManager.cs b/src/Tizen.NUI/src/public/StyleManager.cs
index 75ed880..b681815 100755
--- a/src/Tizen.NUI/src/public/StyleManager.cs
+++ b/src/Tizen.NUI/src/public/StyleManager.cs
@@ -35,7 +35,6 @@ namespace Tizen.NUI
         private static readonly StyleManager instance = StyleManager.Get();
         private EventHandler<StyleChangedEventArgs> _styleManagerStyleChangedEventHandler;
         private StyleChangedCallbackDelegate _styleManagerStyleChangedCallbackDelegate;
-        private StyleChangedSignal styleChangedSignal;
 
         /// <summary>
         /// Creates a StyleManager handle.<br />
@@ -64,19 +63,16 @@ namespace Tizen.NUI
                 if (_styleManagerStyleChangedEventHandler == null)
                 {
                     _styleManagerStyleChangedCallbackDelegate = (OnStyleChanged);
-                    styleChangedSignal = StyleChangedSignal();
-                    styleChangedSignal.Connect(_styleManagerStyleChangedCallbackDelegate);
+                    StyleChangedSignal().Connect(_styleManagerStyleChangedCallbackDelegate);
                 }
                 _styleManagerStyleChangedEventHandler += value;
             }
             remove
             {
                 _styleManagerStyleChangedEventHandler -= value;
-                if (_styleManagerStyleChangedEventHandler == null && styleChangedSignal?.Empty() == false)
+                if (_styleManagerStyleChangedEventHandler == null && StyleChangedSignal().Empty() == false)
                 {
-                    styleChangedSignal.Disconnect(_styleManagerStyleChangedCallbackDelegate);
-                    styleChangedSignal.Dispose();
-                    styleChangedSignal = null;
+                    StyleChangedSignal().Disconnect(_styleManagerStyleChangedCallbackDelegate);
                 }
             }
         }
diff --git a/src/Tizen.NUI/src/public/TTSPlayer.cs b/src/Tizen.NUI/src/public/TTSPlayer.cs
index 4baa611..30b874b 100755
--- a/src/Tizen.NUI/src/public/TTSPlayer.cs
+++ b/src/Tizen.NUI/src/public/TTSPlayer.cs
@@ -29,7 +29,6 @@ namespace Tizen.NUI
     {
         private static readonly TTSPlayer instance = TTSPlayer.Get();
         private StateChangedEventCallbackType _stateChangedEventCallback;
-        private StateChangedSignalType stateChangedSignal;
 
         internal TTSPlayer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(Interop.TtsPlayer.Upcast(cPtr), cMemoryOwn)
         {
@@ -60,8 +59,7 @@ namespace Tizen.NUI
                 if (_stateChangedEventHandler == null)
                 {
                     _stateChangedEventCallback = OnStateChanged;
-                    stateChangedSignal = StateChangedSignal();
-                    stateChangedSignal.Connect(_stateChangedEventCallback);
+                    StateChangedSignal().Connect(_stateChangedEventCallback);
                 }
 
                 _stateChangedEventHandler += value;
@@ -70,11 +68,9 @@ namespace Tizen.NUI
             {
                 _stateChangedEventHandler -= value;
 
-                if (_stateChangedEventHandler == null && stateChangedSignal?.Empty() == false && _stateChangedEventCallback != null)
+                if (_stateChangedEventHandler == null && StateChangedSignal().Empty() == false && _stateChangedEventCallback != null)
                 {
-                    stateChangedSignal.Disconnect(_stateChangedEventCallback);
-                    stateChangedSignal.Dispose();
-                    stateChangedSignal = null;
+                    StateChangedSignal().Disconnect(_stateChangedEventCallback);
                 }
             }
         }
diff --git a/src/Tizen.NUI/src/public/TapGestureDetector.cs b/src/Tizen.NUI/src/public/TapGestureDetector.cs
index 25ef8a7..9971fbd 100755
--- a/src/Tizen.NUI/src/public/TapGestureDetector.cs
+++ b/src/Tizen.NUI/src/public/TapGestureDetector.cs
@@ -60,7 +60,6 @@ namespace Tizen.NUI
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void DetectedCallbackType(IntPtr actor, IntPtr TapGesture);
         private DetectedCallbackType _detectedCallback;
-        private TapGestureDetectedSignal detectedSignal;
 
         /// <summary>
         /// This signal is emitted when the specified tap is detected on the attached view.
@@ -74,8 +73,7 @@ namespace Tizen.NUI
                 if (_detectedEventHandler == null)
                 {
                     _detectedCallback = OnTapGestureDetected;
-                    detectedSignal = DetectedSignal();
-                    detectedSignal.Connect(_detectedCallback);
+                    DetectedSignal().Connect(_detectedCallback);
                 }
 
                 _detectedEventHandler += value;
@@ -85,11 +83,9 @@ namespace Tizen.NUI
             {
                 _detectedEventHandler -= value;
 
-                if (_detectedEventHandler == null && detectedSignal?.Empty() == false)
+                if (_detectedEventHandler == null && DetectedSignal().Empty() == false)
                 {
-                    detectedSignal.Disconnect(_detectedCallback);
-                    detectedSignal.Dispose();
-                    detectedSignal = null;
+                    DetectedSignal().Disconnect(_detectedCallback);
                 }
             }
         }
@@ -196,8 +192,7 @@ namespace Tizen.NUI
         {
             if (_detectedCallback != null)
             {
-                detectedSignal?.Disconnect(_detectedCallback);
-                detectedSignal?.Dispose();
+                DetectedSignal().Disconnect(_detectedCallback);
             }
 
             Interop.TapGestureDetector.DeleteTapGestureDetector(swigCPtr);
diff --git a/src/Tizen.NUI/src/public/Timer.cs b/src/Tizen.NUI/src/public/Timer.cs
index 75d00e2..df48769 100755
--- a/src/Tizen.NUI/src/public/Timer.cs
+++ b/src/Tizen.NUI/src/public/Timer.cs
@@ -38,7 +38,7 @@ namespace Tizen.NUI
         private bool played = false;
         private EventHandlerWithReturnType<object, TickEventArgs, bool> _timerTickEventHandler;
         private TickCallbackDelegate _timerTickCallbackDelegate;
-        private TimerSignalType tickSignal;
+
         private System.IntPtr _timerTickCallbackOfNative;
 
         /// <summary>
@@ -89,19 +89,16 @@ namespace Tizen.NUI
             {
                 if (_timerTickEventHandler == null && disposed == false)
                 {
-                    tickSignal = TickSignal();
-                    tickSignal.Connect(_timerTickCallbackOfNative);
+                    TickSignal().Connect(_timerTickCallbackOfNative);
                 }
                 _timerTickEventHandler += value;
             }
             remove
             {
                 _timerTickEventHandler -= value;
-                if (_timerTickEventHandler == null && tickSignal?.Empty() == false)
+                if (_timerTickEventHandler == null && TickSignal().Empty() == false)
                 {
-                    tickSignal.Disconnect(_timerTickCallbackOfNative);
-                    tickSignal.Dispose();
-                    tickSignal = null;
+                    TickSignal().Disconnect(_timerTickCallbackOfNative);
                 }
             }
         }
@@ -273,8 +270,7 @@ namespace Tizen.NUI
 
             if (this != null && _timerTickCallbackDelegate != null)
             {
-                tickSignal?.Disconnect(_timerTickCallbackOfNative);
-                tickSignal?.Dispose();
+                TickSignal().Disconnect(_timerTickCallbackOfNative);
             }
 
             if (disposed)
diff --git a/src/Tizen.NUI/src/public/Utility/TextPageUtil.cs b/src/Tizen.NUI/src/public/Utility/TextPageUtil.cs
index f410d55..7aa78b2 100755
--- a/src/Tizen.NUI/src/public/Utility/TextPageUtil.cs
+++ b/src/Tizen.NUI/src/public/Utility/TextPageUtil.cs
@@ -131,9 +131,7 @@ namespace Tizen.NUI.Utility
             uint count = cutOffIndexArray.Count();
             for (uint i = 0; i < count; i++)
             {
-                PropertyValue temp = cutOffIndexArray.GetElementAt(i);
-                temp.Get(out cutOffIndex); // Gets the last index of text shown on the actual screen.
-                temp.Dispose();
+                cutOffIndexArray.GetElementAt(i).Get(out cutOffIndex); // Gets the last index of text shown on the actual screen.
 
                 // If markup is enabled, It should parse markup
                 if (label.EnableMarkup)