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

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / public / Degree.cs

diff --git a/src/Tizen.NUI/src/public/Degree.cs b/src/Tizen.NUI/src/public/Degree.cs
index c9806a4..4f49439 100755 (executable)
--- a/src/Tizen.NUI/src/public/Degree.cs
+++ b/src/Tizen.NUI/src/public/Degree.cs
@@ -17,32 +17,21 @@
 
 namespace Tizen.NUI
 {
-
     /// <summary>
     /// An angle in degrees.<br />
     /// This reduces ambiguity when using methods which accept angles in degrees or radians.<br />
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    public class Degree : global::System.IDisposable
+    public class Degree : Disposable
     {
-
         /// <summary>
         /// swigCMemOwn.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
         protected bool swigCMemOwn;
 
-        /// <summary>
-        /// A Flat to check if it is already disposed.
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        protected bool disposed = false;
-
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-        //A Flag to check who called Dispose(). (By User or DisposeQueue)
-        private bool isDisposeQueued = false;
-
         /// <summary>
         /// The constructor.
         /// </summary>
@@ -79,19 +68,6 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// Dispose.
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        ~Degree()
-        {
-            if (!isDisposeQueued)
-            {
-                isDisposeQueued = true;
-                DisposeQueue.Instance.Add(this);
-            }
-        }
-
-        /// <summary>
         /// The value of degree.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
@@ -110,29 +86,6 @@ namespace Tizen.NUI
             }
         }
 
-        /// <summary>
-        /// Dispose.
-        /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        public void Dispose()
-        {
-            //Throw excpetion if Dispose() is called in separate thread.
-            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);
-                System.GC.SuppressFinalize(this);
-            }
-        }
-
         internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Degree obj)
         {
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
@@ -142,20 +95,13 @@ namespace Tizen.NUI
         /// Dispose.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
-        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.
@@ -169,9 +115,7 @@ namespace Tizen.NUI
                 }
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
             }
-            disposed = true;
+            base.Dispose(type);
         }
-
     }
-
 }
\ No newline at end of file