change Dispose pattern

- add DisposeQueue pattern for the classes which inherit from IDisposable.
- remove DispoaseQueue Add(finalize) codes of the classes which inherit from BaseHandle class.

Change-Id: I0891c96a94e5e38ca1bf9d4402f3fdc171016b5e
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/src/Tizen.NUI/src/internal/AccessibilityManager.cs b/src/Tizen.NUI/src/internal/AccessibilityManager.cs
index 52109cf..9b95020 100755 (executable)
--- a/src/Tizen.NUI/src/internal/AccessibilityManager.cs
+++ b/src/Tizen.NUI/src/internal/AccessibilityManager.cs
@@ -24,10 +24,6 @@ internal class AccessibilityManager : BaseHandle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~AccessibilityManager() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Alignment.cs b/src/Tizen.NUI/src/internal/Alignment.cs
index c2e4116..c825d3a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Alignment.cs
+++ b/src/Tizen.NUI/src/internal/Alignment.cs
@@ -39,10 +39,6 @@ internal class Alignment : View {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Alignment() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs
index 76a7880..89de23b 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Application.cs
+++ b/src/Tizen.NUI/src/internal/Application.cs
@@ -321,11 +321,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Application()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/internal/AsyncImageLoader.cs b/src/Tizen.NUI/src/internal/AsyncImageLoader.cs
index 1cae9ac..e09ab13 100755 (executable)
--- a/src/Tizen.NUI/src/internal/AsyncImageLoader.cs
+++ b/src/Tizen.NUI/src/internal/AsyncImageLoader.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~AsyncImageLoader() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/BaseObject.cs b/src/Tizen.NUI/src/internal/BaseObject.cs
index 6e00495..e877b48 100755 (executable)
--- a/src/Tizen.NUI/src/internal/BaseObject.cs
+++ b/src/Tizen.NUI/src/internal/BaseObject.cs
@@ -22,6 +22,12 @@ namespace Tizen.NUI {
   }
 
   public override void Dispose() {
+
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/BufferImage.cs b/src/Tizen.NUI/src/internal/BufferImage.cs
index 3d25d36..401a843 100755 (executable)
--- a/src/Tizen.NUI/src/internal/BufferImage.cs
+++ b/src/Tizen.NUI/src/internal/BufferImage.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~BufferImage() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs
index 554dd57..c96ece9 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Builder.cs
+++ b/src/Tizen.NUI/src/internal/Builder.cs
@@ -41,10 +41,6 @@ public class Builder : BaseHandle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Builder() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ConnectionTracker.cs b/src/Tizen.NUI/src/internal/ConnectionTracker.cs
index 4473e9f..3001e10 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ConnectionTracker.cs
+++ b/src/Tizen.NUI/src/internal/ConnectionTracker.cs
@@ -21,10 +21,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ConnectionTracker() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
index 7f651d7..9405f10 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
+++ b/src/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
@@ -21,10 +21,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ConnectionTrackerInterface() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/CustomActor.cs b/src/Tizen.NUI/src/internal/CustomActor.cs
index 268eab2..0509b25 100755 (executable)
--- a/src/Tizen.NUI/src/internal/CustomActor.cs
+++ b/src/Tizen.NUI/src/internal/CustomActor.cs
@@ -21,10 +21,6 @@ public class CustomActor : Actor {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~CustomActor() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/CustomActorImpl.cs b/src/Tizen.NUI/src/internal/CustomActorImpl.cs
index 2b2cfc1..dd1a895 100755 (executable)
--- a/src/Tizen.NUI/src/internal/CustomActorImpl.cs
+++ b/src/Tizen.NUI/src/internal/CustomActorImpl.cs
@@ -22,6 +22,12 @@ public class CustomActorImpl : RefObject {
   }
 
   public override void Dispose() {
+
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/DefaultRuler.cs b/src/Tizen.NUI/src/internal/DefaultRuler.cs
index c3654ac..2ead28e 100755 (executable)
--- a/src/Tizen.NUI/src/internal/DefaultRuler.cs
+++ b/src/Tizen.NUI/src/internal/DefaultRuler.cs
@@ -21,11 +21,13 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~DefaultRuler() {
-    Dispose();
-  }
-
   public override void Dispose() {
+    
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/DragAndDropDetector.cs b/src/Tizen.NUI/src/internal/DragAndDropDetector.cs
index 5012f6e..cbccf4d 100755 (executable)
--- a/src/Tizen.NUI/src/internal/DragAndDropDetector.cs
+++ b/src/Tizen.NUI/src/internal/DragAndDropDetector.cs
@@ -21,10 +21,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~DragAndDropDetector() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/EncodedBufferImage.cs b/src/Tizen.NUI/src/internal/EncodedBufferImage.cs
index 4b7e084..4d80189 100755 (executable)
--- a/src/Tizen.NUI/src/internal/EncodedBufferImage.cs
+++ b/src/Tizen.NUI/src/internal/EncodedBufferImage.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~EncodedBufferImage() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/EventThreadCallback.cs b/src/Tizen.NUI/src/internal/EventThreadCallback.cs
index 2362fec..6ee750e 100755 (executable)
--- a/src/Tizen.NUI/src/internal/EventThreadCallback.cs
+++ b/src/Tizen.NUI/src/internal/EventThreadCallback.cs
@@ -37,11 +37,17 @@ namespace Tizen.NUI
 
         ~EventThreadCallback()
         {
-            Dispose();
+            DisposeQueue.Instance.Add(this);
         }
 
         public virtual void Dispose()
         {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
             lock (this)
             {
                 if (swigCPtr.Handle != global::System.IntPtr.Zero)

diff --git a/src/Tizen.NUI/src/internal/FixedRuler.cs b/src/Tizen.NUI/src/internal/FixedRuler.cs
index e437e95..e34869f 100755 (executable)
--- a/src/Tizen.NUI/src/internal/FixedRuler.cs
+++ b/src/Tizen.NUI/src/internal/FixedRuler.cs
@@ -21,11 +21,12 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~FixedRuler() {
-    Dispose();
-  }
-
   public override void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/FrameBuffer.cs b/src/Tizen.NUI/src/internal/FrameBuffer.cs
index f463971..4bc12c5 100755 (executable)
--- a/src/Tizen.NUI/src/internal/FrameBuffer.cs
+++ b/src/Tizen.NUI/src/internal/FrameBuffer.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~FrameBuffer() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/FrameBufferImage.cs b/src/Tizen.NUI/src/internal/FrameBufferImage.cs
index 98fa153..4eaf6c6 100755 (executable)
--- a/src/Tizen.NUI/src/internal/FrameBufferImage.cs
+++ b/src/Tizen.NUI/src/internal/FrameBufferImage.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~FrameBufferImage() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/GaussianBlurView.cs b/src/Tizen.NUI/src/internal/GaussianBlurView.cs
index 6b4a7e3..e1133a9 100755 (executable)
--- a/src/Tizen.NUI/src/internal/GaussianBlurView.cs
+++ b/src/Tizen.NUI/src/internal/GaussianBlurView.cs
@@ -43,10 +43,6 @@ using System.Runtime.InteropServices;
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~GaussianBlurView() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Geometry.cs b/src/Tizen.NUI/src/internal/Geometry.cs
index 09a187f..907442a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Geometry.cs
+++ b/src/Tizen.NUI/src/internal/Geometry.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Geometry() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/GestureDetector.cs b/src/Tizen.NUI/src/internal/GestureDetector.cs
index 2998717..8ff1337 100755 (executable)
--- a/src/Tizen.NUI/src/internal/GestureDetector.cs
+++ b/src/Tizen.NUI/src/internal/GestureDetector.cs
@@ -21,10 +21,6 @@ public class GestureDetector : Handle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~GestureDetector() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Handle.cs b/src/Tizen.NUI/src/internal/Handle.cs
index 7808376..31e2d0e 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Handle.cs
+++ b/src/Tizen.NUI/src/internal/Handle.cs
@@ -37,9 +37,6 @@ public class Handle : BaseHandle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Handle() {
-    DisposeQueue.Instance.Add(this);
-  }
 
   public override void Dispose() {
     if (!Stage.IsInstalled()) {

diff --git a/src/Tizen.NUI/src/internal/Image.cs b/src/Tizen.NUI/src/internal/Image.cs
index a9c9121..097aab2 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Image.cs
+++ b/src/Tizen.NUI/src/internal/Image.cs
@@ -25,10 +25,6 @@ using System.Runtime.InteropServices;
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Image() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Item.cs b/src/Tizen.NUI/src/internal/Item.cs
index 416d033..50de570 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Item.cs
+++ b/src/Tizen.NUI/src/internal/Item.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~Item() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/ItemContainer.cs b/src/Tizen.NUI/src/internal/ItemContainer.cs
index 0cbbc0d..7b25785 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ItemContainer.cs
+++ b/src/Tizen.NUI/src/internal/ItemContainer.cs
@@ -26,10 +26,15 @@ namespace Tizen.NUI {
   }
 
   ~ItemContainer() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/ItemLayout.cs b/src/Tizen.NUI/src/internal/ItemLayout.cs
index a37067f..6951911 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ItemLayout.cs
+++ b/src/Tizen.NUI/src/internal/ItemLayout.cs
@@ -23,10 +23,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ItemLayout() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs
index aa49fa3..1286e46 100755 (executable)
--- a/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs
+++ b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs
@@ -23,11 +23,13 @@ public class KeyInputFocusManager : BaseHandle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~KeyInputFocusManager() {
-    Dispose();
-  }
-
   public override void Dispose() {
+
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/LinearConstrainer.cs b/src/Tizen.NUI/src/internal/LinearConstrainer.cs
index 019b617..6146d6f 100755 (executable)
--- a/src/Tizen.NUI/src/internal/LinearConstrainer.cs
+++ b/src/Tizen.NUI/src/internal/LinearConstrainer.cs
@@ -38,10 +38,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~LinearConstrainer() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs b/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs
index b019312..ab9afe4 100755 (executable)
--- a/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs
+++ b/src/Tizen.NUI/src/internal/LongPressGestureDetector.cs
@@ -40,10 +40,6 @@ public class LongPressGestureDetector : GestureDetector {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~LongPressGestureDetector() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Model3dView.cs b/src/Tizen.NUI/src/internal/Model3dView.cs
index 7331a12..0ab1f10 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Model3dView.cs
+++ b/src/Tizen.NUI/src/internal/Model3dView.cs
@@ -39,10 +39,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Model3dView() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/NativeImage.cs b/src/Tizen.NUI/src/internal/NativeImage.cs
index 9c0d2fe..1b932da 100755 (executable)
--- a/src/Tizen.NUI/src/internal/NativeImage.cs
+++ b/src/Tizen.NUI/src/internal/NativeImage.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~NativeImage() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/NativeImageInterface.cs b/src/Tizen.NUI/src/internal/NativeImageInterface.cs
index 9d5c582..0f149be 100755 (executable)
--- a/src/Tizen.NUI/src/internal/NativeImageInterface.cs
+++ b/src/Tizen.NUI/src/internal/NativeImageInterface.cs
@@ -22,6 +22,11 @@ namespace Tizen.NUI {
   }
 
   public override void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/NinePatchImage.cs b/src/Tizen.NUI/src/internal/NinePatchImage.cs
index bf29fca..4593d2c 100755 (executable)
--- a/src/Tizen.NUI/src/internal/NinePatchImage.cs
+++ b/src/Tizen.NUI/src/internal/NinePatchImage.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~NinePatchImage() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ObjectRegistry.cs b/src/Tizen.NUI/src/internal/ObjectRegistry.cs
index 05cb113..7e524bb 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ObjectRegistry.cs
+++ b/src/Tizen.NUI/src/internal/ObjectRegistry.cs
@@ -25,10 +25,6 @@ using System.Runtime.InteropServices;
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ObjectRegistry() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs b/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs
index 59ecd39..dc2d34e 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs
+++ b/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PageTurnLandscapeView() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs b/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs
index d1ce422..066f5b8 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs
+++ b/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PageTurnPortraitView() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PageTurnView.cs b/src/Tizen.NUI/src/internal/PageTurnView.cs
index d9f6ca2..bd77d61 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PageTurnView.cs
+++ b/src/Tizen.NUI/src/internal/PageTurnView.cs
@@ -25,10 +25,6 @@ using Tizen.NUI.BaseComponents;
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PageTurnView() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PanGestureDetector.cs b/src/Tizen.NUI/src/internal/PanGestureDetector.cs
index 458c954..962c42c 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PanGestureDetector.cs
+++ b/src/Tizen.NUI/src/internal/PanGestureDetector.cs
@@ -41,10 +41,6 @@ public class PanGestureDetector : GestureDetector {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PanGestureDetector() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PathConstrainer.cs b/src/Tizen.NUI/src/internal/PathConstrainer.cs
index 62255bd..aadcd23 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PathConstrainer.cs
+++ b/src/Tizen.NUI/src/internal/PathConstrainer.cs
@@ -38,10 +38,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PathConstrainer() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PinchGestureDetector.cs b/src/Tizen.NUI/src/internal/PinchGestureDetector.cs
index 2b2c619..d4f63fb 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PinchGestureDetector.cs
+++ b/src/Tizen.NUI/src/internal/PinchGestureDetector.cs
@@ -41,10 +41,6 @@ public class PinchGestureDetector : GestureDetector {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PinchGestureDetector() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PixelData.cs b/src/Tizen.NUI/src/internal/PixelData.cs
index 3082819..e740347 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PixelData.cs
+++ b/src/Tizen.NUI/src/internal/PixelData.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PixelData() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PropertyBuffer.cs b/src/Tizen.NUI/src/internal/PropertyBuffer.cs
index db22d2a..5fa4727 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PropertyBuffer.cs
+++ b/src/Tizen.NUI/src/internal/PropertyBuffer.cs
@@ -37,11 +37,7 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PropertyBuffer() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public override void Dispose() {
+ public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);
       return;

diff --git a/src/Tizen.NUI/src/internal/PropertyCondition.cs b/src/Tizen.NUI/src/internal/PropertyCondition.cs
index 8550627..82a5374 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PropertyCondition.cs
+++ b/src/Tizen.NUI/src/internal/PropertyCondition.cs
@@ -21,10 +21,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PropertyCondition() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PropertyNotification.cs b/src/Tizen.NUI/src/internal/PropertyNotification.cs
index 434e20c..3876482 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PropertyNotification.cs
+++ b/src/Tizen.NUI/src/internal/PropertyNotification.cs
@@ -25,10 +25,6 @@ using System.Runtime.InteropServices;
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~PropertyNotification() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/PropertyRegistration.cs b/src/Tizen.NUI/src/internal/PropertyRegistration.cs
index 43f824d..7aa3d5e 100755 (executable)
--- a/src/Tizen.NUI/src/internal/PropertyRegistration.cs
+++ b/src/Tizen.NUI/src/internal/PropertyRegistration.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~PropertyRegistration() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/RefObject.cs b/src/Tizen.NUI/src/internal/RefObject.cs
index 1f3e97a..26f2cc8 100755 (executable)
--- a/src/Tizen.NUI/src/internal/RefObject.cs
+++ b/src/Tizen.NUI/src/internal/RefObject.cs
@@ -23,7 +23,17 @@ public class RefObject : global::System.IDisposable {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
+  ~RefObject() {
+    DisposeQueue.Instance.Add(this);
+  }
+
   public virtual void Dispose() {
+
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/RenderTask.cs b/src/Tizen.NUI/src/internal/RenderTask.cs
index 04fa39a..029a9e1 100755 (executable)
--- a/src/Tizen.NUI/src/internal/RenderTask.cs
+++ b/src/Tizen.NUI/src/internal/RenderTask.cs
@@ -21,10 +21,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~RenderTask() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/RenderTaskList.cs b/src/Tizen.NUI/src/internal/RenderTaskList.cs
index 9534e27..4fa79eb 100755 (executable)
--- a/src/Tizen.NUI/src/internal/RenderTaskList.cs
+++ b/src/Tizen.NUI/src/internal/RenderTaskList.cs
@@ -21,10 +21,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~RenderTaskList() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Renderer.cs b/src/Tizen.NUI/src/internal/Renderer.cs
index 21f8482..bf77932 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Renderer.cs
+++ b/src/Tizen.NUI/src/internal/Renderer.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Renderer() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ResourceImage.cs b/src/Tizen.NUI/src/internal/ResourceImage.cs
index cbd881f..bd2cd22 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ResourceImage.cs
+++ b/src/Tizen.NUI/src/internal/ResourceImage.cs
@@ -41,10 +41,6 @@ internal class ResourceImage : Image {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ResourceImage() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Ruler.cs b/src/Tizen.NUI/src/internal/Ruler.cs
index c1a5300..2538d36 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Ruler.cs
+++ b/src/Tizen.NUI/src/internal/Ruler.cs
@@ -22,6 +22,11 @@ namespace Tizen.NUI {
   }
 
   public override void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/RulerDomain.cs b/src/Tizen.NUI/src/internal/RulerDomain.cs
index 67e1d1a..ba2bbcc 100755 (executable)
--- a/src/Tizen.NUI/src/internal/RulerDomain.cs
+++ b/src/Tizen.NUI/src/internal/RulerDomain.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~RulerDomain() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/Sampler.cs b/src/Tizen.NUI/src/internal/Sampler.cs
index 59eec57..9d3fa20 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Sampler.cs
+++ b/src/Tizen.NUI/src/internal/Sampler.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Sampler() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ScrollView.cs b/src/Tizen.NUI/src/internal/ScrollView.cs
index e3f6380..fe510c9 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ScrollView.cs
+++ b/src/Tizen.NUI/src/internal/ScrollView.cs
@@ -41,10 +41,6 @@ using Tizen.NUI.BaseComponents;
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ScrollView() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ScrollViewEffect.cs b/src/Tizen.NUI/src/internal/ScrollViewEffect.cs
index 1b7473c..038e56c 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ScrollViewEffect.cs
+++ b/src/Tizen.NUI/src/internal/ScrollViewEffect.cs
@@ -21,10 +21,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ScrollViewEffect() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs b/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs
index ccf3e90..da1d76b 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs
+++ b/src/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ScrollViewPagePathEffect() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Scrollable.cs b/src/Tizen.NUI/src/internal/Scrollable.cs
index 487350c..0ce6416 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Scrollable.cs
+++ b/src/Tizen.NUI/src/internal/Scrollable.cs
@@ -25,10 +25,6 @@ using Tizen.NUI.BaseComponents;
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Scrollable() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Shader.cs b/src/Tizen.NUI/src/internal/Shader.cs
index 556a497..4babca0 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Shader.cs
+++ b/src/Tizen.NUI/src/internal/Shader.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Shader() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/SignalConnectorType.cs b/src/Tizen.NUI/src/internal/SignalConnectorType.cs
index 8833f2b..3c3707f 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SignalConnectorType.cs
+++ b/src/Tizen.NUI/src/internal/SignalConnectorType.cs
@@ -24,10 +24,16 @@ namespace Tizen.NUI {
   }
 
   ~SignalConnectorType() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/StringValuePair.cs b/src/Tizen.NUI/src/internal/StringValuePair.cs
index 93fbcc3..39991e6 100755 (executable)
--- a/src/Tizen.NUI/src/internal/StringValuePair.cs
+++ b/src/Tizen.NUI/src/internal/StringValuePair.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~StringValuePair() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/TapGestureDetector.cs b/src/Tizen.NUI/src/internal/TapGestureDetector.cs
index d3d9d6f..1cb10f2 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TapGestureDetector.cs
+++ b/src/Tizen.NUI/src/internal/TapGestureDetector.cs
@@ -40,10 +40,6 @@ public class TapGestureDetector : GestureDetector {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~TapGestureDetector() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/Texture.cs b/src/Tizen.NUI/src/internal/Texture.cs
index 6d6efaf..62f9d31 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Texture.cs
+++ b/src/Tizen.NUI/src/internal/Texture.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Texture() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/TextureSet.cs b/src/Tizen.NUI/src/internal/TextureSet.cs
index a80a16a..7e69e1a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TextureSet.cs
+++ b/src/Tizen.NUI/src/internal/TextureSet.cs
@@ -37,10 +37,6 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~TextureSet() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/ToggleButton.cs b/src/Tizen.NUI/src/internal/ToggleButton.cs
index 506e74f..52df7c6 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ToggleButton.cs
+++ b/src/Tizen.NUI/src/internal/ToggleButton.cs
@@ -39,10 +39,6 @@ public class ToggleButton : Tizen.NUI.UIComponents.Button {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ToggleButton() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/TransitionData.cs b/src/Tizen.NUI/src/internal/TransitionData.cs
index 74ea147..5730ee3 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TransitionData.cs
+++ b/src/Tizen.NUI/src/internal/TransitionData.cs
@@ -37,10 +37,6 @@ public class TransitionData : BaseHandle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~TransitionData() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/TypeAction.cs b/src/Tizen.NUI/src/internal/TypeAction.cs
index fb57080..e754db5 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TypeAction.cs
+++ b/src/Tizen.NUI/src/internal/TypeAction.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~TypeAction() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/TypeInfo.cs b/src/Tizen.NUI/src/internal/TypeInfo.cs
index 8a4903e..ba0abab 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TypeInfo.cs
+++ b/src/Tizen.NUI/src/internal/TypeInfo.cs
@@ -21,10 +21,6 @@ public class TypeInfo : BaseHandle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~TypeInfo() {
-    DisposeQueue.Instance.Add(this);
-  }
-
   public override void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);

diff --git a/src/Tizen.NUI/src/internal/TypeRegistration.cs b/src/Tizen.NUI/src/internal/TypeRegistration.cs
index c844876..359d9e5 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TypeRegistration.cs
+++ b/src/Tizen.NUI/src/internal/TypeRegistration.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~TypeRegistration() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/TypeRegistry.cs b/src/Tizen.NUI/src/internal/TypeRegistry.cs
index c8b71d1..ac6170c 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TypeRegistry.cs
+++ b/src/Tizen.NUI/src/internal/TypeRegistry.cs
@@ -21,11 +21,12 @@ public class TypeRegistry : BaseHandle {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~TypeRegistry() {
-    Dispose();
-  }
-
   public override void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/VectorBase.cs b/src/Tizen.NUI/src/internal/VectorBase.cs
index 50578f0..40ea62c 100755 (executable)
--- a/src/Tizen.NUI/src/internal/VectorBase.cs
+++ b/src/Tizen.NUI/src/internal/VectorBase.cs
@@ -23,7 +23,16 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
+  ~VectorBase() {
+    DisposeQueue.Instance.Add(this);
+  }
+
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/ViewImpl.cs b/src/Tizen.NUI/src/internal/ViewImpl.cs
index f7a64c8..6d73b61 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ViewImpl.cs
+++ b/src/Tizen.NUI/src/internal/ViewImpl.cs
@@ -33,6 +33,12 @@ namespace Tizen.NUI
 
         public override void Dispose()
         {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
             lock (this)
             {
                 if (swigCPtr.Handle != global::System.IntPtr.Zero)

diff --git a/src/Tizen.NUI/src/internal/ViewWrapper.cs b/src/Tizen.NUI/src/internal/ViewWrapper.cs
index 51c87bf..ddb8738 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ViewWrapper.cs
+++ b/src/Tizen.NUI/src/internal/ViewWrapper.cs
@@ -34,11 +34,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~ViewWrapper()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
index 800b503..c240f38 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
+++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs
@@ -108,11 +108,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~ViewWrapperImpl()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs b/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs
index 9931518..af65ce0 100755 (executable)
--- a/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs
+++ b/src/Tizen.NUI/src/internal/WindowFocusSignalType.cs
@@ -29,11 +29,17 @@ namespace Tizen.NUI
 
         ~WindowFocusSignalType()
         {
-            Dispose();
+            DisposeQueue.Instance.Add(this);
         }
 
         public virtual void Dispose()
         {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
             lock (this)
             {
                 if (swigCPtr.Handle != global::System.IntPtr.Zero)

diff --git a/src/Tizen.NUI/src/internal/doublep.cs b/src/Tizen.NUI/src/internal/doublep.cs
index 43abc54..b4c2b6f 100755 (executable)
--- a/src/Tizen.NUI/src/internal/doublep.cs
+++ b/src/Tizen.NUI/src/internal/doublep.cs
@@ -23,11 +23,17 @@ namespace Tizen.NUI {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
+
   ~doublep() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/floatp.cs b/src/Tizen.NUI/src/internal/floatp.cs
index fa16cba..e184d1d 100755 (executable)
--- a/src/Tizen.NUI/src/internal/floatp.cs
+++ b/src/Tizen.NUI/src/internal/floatp.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~floatp() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/intp.cs b/src/Tizen.NUI/src/internal/intp.cs
index bf3418e..85142b0 100755 (executable)
--- a/src/Tizen.NUI/src/internal/intp.cs
+++ b/src/Tizen.NUI/src/internal/intp.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~intp() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/uintp.cs b/src/Tizen.NUI/src/internal/uintp.cs
index e177b41..a8f2db4 100755 (executable)
--- a/src/Tizen.NUI/src/internal/uintp.cs
+++ b/src/Tizen.NUI/src/internal/uintp.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~uintp() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/internal/ushortp.cs b/src/Tizen.NUI/src/internal/ushortp.cs
index e5ec742..43a9121 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ushortp.cs
+++ b/src/Tizen.NUI/src/internal/ushortp.cs
@@ -24,10 +24,15 @@ namespace Tizen.NUI {
   }
 
   ~ushortp() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {

diff --git a/src/Tizen.NUI/src/public/Actor.cs b/src/Tizen.NUI/src/public/Actor.cs
index 1648899..fd47c17 100755 (executable)
--- a/src/Tizen.NUI/src/public/Actor.cs
+++ b/src/Tizen.NUI/src/public/Actor.cs
@@ -41,11 +41,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Actor()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make Actor instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/AlphaFunction.cs b/src/Tizen.NUI/src/public/AlphaFunction.cs
index 6289aa7..aa482cd 100755 (executable)
--- a/src/Tizen.NUI/src/public/AlphaFunction.cs
+++ b/src/Tizen.NUI/src/public/AlphaFunction.cs
@@ -39,12 +39,10 @@ namespace Tizen.NUI
         {
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
-
         ~AlphaFunction()
         {
             DisposeQueue.Instance.Add(this);
         }
-
         /// <summary>
         /// To make AlphaFunction instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs
index 16a23ac..9e1bfe9 100755 (executable)
--- a/src/Tizen.NUI/src/public/Animation.cs
+++ b/src/Tizen.NUI/src/public/Animation.cs
@@ -43,11 +43,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Animation()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make Animation instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 910f367..8c38bac 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -45,11 +45,6 @@ namespace Tizen.NUI.BaseComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~ImageView()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
index 45933f6..51cf8e6 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
@@ -47,11 +47,6 @@ namespace Tizen.NUI.BaseComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~TextEditor()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// Dispose.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs
index 349db12..aff20d2 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs
@@ -47,11 +47,6 @@ namespace Tizen.NUI.BaseComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~TextField()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// Dispose
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index d9e2431..6b5e557 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -45,11 +45,6 @@ namespace Tizen.NUI.BaseComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~TextLabel()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// Dispose
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 4017d25..56543bb 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -45,7 +45,7 @@ namespace Tizen.NUI.BaseComponents
 
         ~View()
         {
-            DisposeQueue.Instance.Add(this);
+            //DisposeQueue.Instance.Add(this);
 
             // Unregister this instance of view from the view registry.
             ViewRegistry.UnregisterView(this);

diff --git a/src/Tizen.NUI/src/public/CameraActor.cs b/src/Tizen.NUI/src/public/CameraActor.cs
index 13e1332..9f6aa41 100755 (executable)
--- a/src/Tizen.NUI/src/public/CameraActor.cs
+++ b/src/Tizen.NUI/src/public/CameraActor.cs
@@ -48,11 +48,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~CameraActor()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make CameraActor instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/Degree.cs b/src/Tizen.NUI/src/public/Degree.cs
index ba254e5..1de738b 100755 (executable)
--- a/src/Tizen.NUI/src/public/Degree.cs
+++ b/src/Tizen.NUI/src/public/Degree.cs
@@ -30,12 +30,10 @@ namespace Tizen.NUI
         {
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
-
         ~Degree()
         {
             DisposeQueue.Instance.Add(this);
         }
-
         public virtual void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/FlexContainer.cs b/src/Tizen.NUI/src/public/FlexContainer.cs
index 129923d..e582d63 100755 (executable)
--- a/src/Tizen.NUI/src/public/FlexContainer.cs
+++ b/src/Tizen.NUI/src/public/FlexContainer.cs
@@ -48,11 +48,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~FlexContainer()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/FocusManager.cs b/src/Tizen.NUI/src/public/FocusManager.cs
index 18d9e62..c5a22a6 100755 (executable)
--- a/src/Tizen.NUI/src/public/FocusManager.cs
+++ b/src/Tizen.NUI/src/public/FocusManager.cs
@@ -44,11 +44,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~FocusManager()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make FocusManager instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/KeyFrames.cs b/src/Tizen.NUI/src/public/KeyFrames.cs
index f233153..e3630bf 100755 (executable)
--- a/src/Tizen.NUI/src/public/KeyFrames.cs
+++ b/src/Tizen.NUI/src/public/KeyFrames.cs
@@ -45,11 +45,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~KeyFrames()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs
index 203bb94..7c9b8ac 100755 (executable)
--- a/src/Tizen.NUI/src/public/Layer.cs
+++ b/src/Tizen.NUI/src/public/Layer.cs
@@ -44,11 +44,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Layer()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/LongPressGesture.cs b/src/Tizen.NUI/src/public/LongPressGesture.cs
index 9729581..ff05444 100755 (executable)
--- a/src/Tizen.NUI/src/public/LongPressGesture.cs
+++ b/src/Tizen.NUI/src/public/LongPressGesture.cs
@@ -29,11 +29,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~LongPressGesture()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/PanGesture.cs b/src/Tizen.NUI/src/public/PanGesture.cs
index 1da2516..14fc529 100755 (executable)
--- a/src/Tizen.NUI/src/public/PanGesture.cs
+++ b/src/Tizen.NUI/src/public/PanGesture.cs
@@ -34,11 +34,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~PanGesture()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/Path.cs b/src/Tizen.NUI/src/public/Path.cs
index 63237f9..7486acd 100755 (executable)
--- a/src/Tizen.NUI/src/public/Path.cs
+++ b/src/Tizen.NUI/src/public/Path.cs
@@ -45,11 +45,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Path()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/PinchGesture.cs b/src/Tizen.NUI/src/public/PinchGesture.cs
index caf5556..12a8d19 100755 (executable)
--- a/src/Tizen.NUI/src/public/PinchGesture.cs
+++ b/src/Tizen.NUI/src/public/PinchGesture.cs
@@ -29,11 +29,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~PinchGesture()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/Stage.cs b/src/Tizen.NUI/src/public/Stage.cs
index 83caf58..1639337 100755 (executable)
--- a/src/Tizen.NUI/src/public/Stage.cs
+++ b/src/Tizen.NUI/src/public/Stage.cs
@@ -38,11 +38,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Stage()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// Dispose.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/StyleManager.cs b/src/Tizen.NUI/src/public/StyleManager.cs
index 43df7e5..3e291d0 100755 (executable)
--- a/src/Tizen.NUI/src/public/StyleManager.cs
+++ b/src/Tizen.NUI/src/public/StyleManager.cs
@@ -36,11 +36,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~StyleManager()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// Dispose
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs
index b9790bd..27237ef 100755 (executable)
--- a/src/Tizen.NUI/src/public/TableView.cs
+++ b/src/Tizen.NUI/src/public/TableView.cs
@@ -49,11 +49,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~TableView()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/TapGesture.cs b/src/Tizen.NUI/src/public/TapGesture.cs
index a164c36..f2e01e4 100755 (executable)
--- a/src/Tizen.NUI/src/public/TapGesture.cs
+++ b/src/Tizen.NUI/src/public/TapGesture.cs
@@ -28,11 +28,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~TapGesture()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// Dispose
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/Timer.cs b/src/Tizen.NUI/src/public/Timer.cs
index 549ea52..edfafba 100755 (executable)
--- a/src/Tizen.NUI/src/public/Timer.cs
+++ b/src/Tizen.NUI/src/public/Timer.cs
@@ -54,11 +54,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Timer()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/Touch.cs b/src/Tizen.NUI/src/public/Touch.cs
index bfa1e1d..2e07747 100755 (executable)
--- a/src/Tizen.NUI/src/public/Touch.cs
+++ b/src/Tizen.NUI/src/public/Touch.cs
@@ -29,11 +29,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Touch()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/UIComponents/Button.cs b/src/Tizen.NUI/src/public/UIComponents/Button.cs
index 8f835d9..f90ae13 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/Button.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/Button.cs
@@ -50,11 +50,6 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Button()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make Button instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs
index 3b057a5..52da08c 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs
@@ -41,11 +41,6 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~CheckBoxButton()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
 
         /// <summary>
         /// To make CheckBoxButton instance be disposed.

diff --git a/src/Tizen.NUI/src/public/UIComponents/Popup.cs b/src/Tizen.NUI/src/public/UIComponents/Popup.cs
index 12ac544..5fd799c 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/Popup.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/Popup.cs
@@ -48,11 +48,6 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Popup()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs b/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
index 7353d2a..366ad26 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
@@ -48,11 +48,6 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~ProgressBar()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make ProgressBar instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
index 8263ea3..b4d1de8 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
@@ -46,12 +46,7 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~PushButton()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
-        /// <summary>
+       /// <summary>
         /// To make PushButton instance be disposed.
         /// </summary>
         public override void Dispose()

diff --git a/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs b/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs
index e1f6c70..a6f9f26 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs
@@ -54,11 +54,6 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~RadioButton()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make RadioButton instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
index b5bc4fc..2254c43 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
@@ -49,11 +49,6 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~ScrollBar()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make ScrollBar instance be disposed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/UIComponents/Slider.cs b/src/Tizen.NUI/src/public/UIComponents/Slider.cs
index dad5552..6d8ec30 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/Slider.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/Slider.cs
@@ -48,11 +48,6 @@ namespace Tizen.NUI.UIComponents
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Slider()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// Dispose
         /// </summary>

diff --git a/src/Tizen.NUI/src/public/VideoView.cs b/src/Tizen.NUI/src/public/VideoView.cs
index 8644af0..ba3a405 100755 (executable)
--- a/src/Tizen.NUI/src/public/VideoView.cs
+++ b/src/Tizen.NUI/src/public/VideoView.cs
@@ -48,11 +48,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~VideoView()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/VisualBase.cs b/src/Tizen.NUI/src/public/VisualBase.cs
index eca68e0..137e4d2 100755 (executable)
--- a/src/Tizen.NUI/src/public/VisualBase.cs
+++ b/src/Tizen.NUI/src/public/VisualBase.cs
@@ -30,11 +30,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~VisualBase()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/VisualFactory.cs b/src/Tizen.NUI/src/public/VisualFactory.cs
index 1ca74fb..23d04f5 100755 (executable)
--- a/src/Tizen.NUI/src/public/VisualFactory.cs
+++ b/src/Tizen.NUI/src/public/VisualFactory.cs
@@ -28,11 +28,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~VisualFactory()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         public override void Dispose()
         {
             if (!Stage.IsInstalled())

diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index 587fb9e..bd0e837 100755 (executable)
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -49,11 +49,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        ~Window()
-        {
-            DisposeQueue.Instance.Add(this);
-        }
-
         /// <summary>
         /// To make Window instance be disposed.
         /// </summary>