[NUI] Reduce code duplication - refactor dispose codes (#1010)

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / internal / VisualEventSignal.cs

diff --git a/src/Tizen.NUI/src/internal/VisualEventSignal.cs b/src/Tizen.NUI/src/internal/VisualEventSignal.cs
index 24149a1..ee1cd3a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/VisualEventSignal.cs
+++ b/src/Tizen.NUI/src/internal/VisualEventSignal.cs
@@ -20,55 +20,20 @@ using System.Runtime.InteropServices;
 
 namespace Tizen.NUI
 {
-    internal class VisualEventSignal : IDisposable
+    internal class VisualEventSignal : Disposable
     {
         public VisualEventSignal() : this(Interop.VisualEventSignal.New(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        ~VisualEventSignal()
-        {
-            if (!isDisposeQueued)
-            {
-                isDisposeQueued = true;
-                DisposeQueue.Instance.Add(this);
-            }
-        }
-
-        public void Dispose()
-        {
-            if (!Window.IsInstalled())
-            {
-                throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread.");
-            }
-
-            if (isDisposeQueued)
-            {
-                Dispose(DisposeTypes.Implicit);
-            }
-            else
-            {
-                Dispose(DisposeTypes.Explicit);
-                GC.SuppressFinalize(this);
-            }
-        }
-
-        protected virtual void Dispose(DisposeTypes type)
+        protected override void Dispose(DisposeTypes type)
         {
             if (disposed)
             {
                 return;
             }
 
-            if (type == DisposeTypes.Explicit)
-            {
-                //Called by User
-                //Release your own managed resources here.
-                //You should release all of your own disposable objects here.
-
-            }
-
             //Release your own unmanaged resources here.
             //You should not access any managed member here except static instance.
             //because the execution order of Finalizes is non-deterministic.
@@ -82,7 +47,7 @@ namespace Tizen.NUI
                 }
                 swigCPtr = new HandleRef(null, IntPtr.Zero);
             }
-            disposed = true;
+            base.Dispose(type);
         }
 
         public bool Empty()
@@ -140,9 +105,5 @@ namespace Tizen.NUI
 
         private HandleRef swigCPtr;
         protected bool swigCMemOwn;
-
-        private bool isDisposeQueued = false;
-        protected bool disposed = false;
-
     }
 }