From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 21 Apr 2017 14:09:07 +0000 (-0700)
Subject: Merge "Handle becomes Animatable" into devel/master
X-Git-Tag: dali_1.2.37~8
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=b39bc6a329f67a7ec5b4a872544ca05b7ac1fa5f;hp=97416ad7c6d7d11f05105e829946050c08a3bf8c

Merge "Handle becomes Animatable" into devel/master
---

diff --git a/plugins/dali-sharp/sharp/internal/Actor.cs b/plugins/dali-sharp/sharp/internal/Actor.cs
index df8d95a..9b6a89b 100644
--- a/plugins/dali-sharp/sharp/internal/Actor.cs
+++ b/plugins/dali-sharp/sharp/internal/Actor.cs
@@ -29,7 +29,7 @@ namespace Dali {
     using System;
     using System.Runtime.InteropServices;
 
-public class Actor : Handle {
+public class Actor : Animatable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Actor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Actor_SWIGUpcast(cPtr), cMemoryOwn) {
diff --git a/plugins/dali-sharp/sharp/internal/Handle.cs b/plugins/dali-sharp/sharp/internal/Animatable.cs
similarity index 77%
rename from plugins/dali-sharp/sharp/internal/Handle.cs
rename to plugins/dali-sharp/sharp/internal/Animatable.cs
index 1067d54..e193d4a 100644
--- a/plugins/dali-sharp/sharp/internal/Handle.cs
+++ b/plugins/dali-sharp/sharp/internal/Animatable.cs
@@ -13,31 +13,21 @@
 * limitations under the License.
 *
 */
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.10
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
 
 namespace Dali {
 
-public class Handle : BaseHandle {
+public class Animatable : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal Handle(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Handle_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal Animatable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Handle_SWIGUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Handle obj) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Animatable obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~Handle() {
+  ~Animatable() {
     DisposeQueue.Instance.Add(this);
   }
 
@@ -61,27 +51,15 @@ public class Handle : BaseHandle {
   }
 
 
-  public Handle () : this (NDalicPINVOKE.Handle_New(), true) {
+  public Animatable () : this (NDalicPINVOKE.Handle_New(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
   }
-  public Handle(Handle handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Handle.getCPtr(handle)), true) {
+  public Animatable(Animatable handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Animatable.getCPtr(handle)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Handle Assign(Handle rhs) {
-    Handle ret = new Handle(NDalicPINVOKE.Handle_Assign(swigCPtr, Handle.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Handle DownCast(BaseHandle handle) {
-    Handle ret = new Handle(NDalicPINVOKE.Handle_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Supports(Handle.Capability capability) {
+  public bool Supports(Animatable.Capability capability) {
     bool ret = NDalicPINVOKE.Handle_Supports(swigCPtr, (int)capability);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -129,9 +107,9 @@ public class Handle : BaseHandle {
     return ret;
   }
 
-  public void SetProperty(int index, Property.Value propertyValue) {
-    NDalicPINVOKE.Handle_SetProperty(swigCPtr, index, Property.Value.getCPtr(propertyValue));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  public void SetProperty(int index, Property.Value propertyValue)
+  {
+    Dali.Object.SetProperty( swigCPtr, index, propertyValue );
   }
 
   public int RegisterProperty(string name, Property.Value propertyValue) {
@@ -146,9 +124,9 @@ public class Handle : BaseHandle {
     return ret;
   }
 
-  public Property.Value GetProperty(int index) {
-    Property.Value ret = new Property.Value(NDalicPINVOKE.Handle_GetProperty(swigCPtr, index), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  public Property.Value GetProperty(int index)
+  {
+    Property.Value ret = Dali.Object.GetProperty( swigCPtr, index );
     return ret;
   }
 
diff --git a/plugins/dali-sharp/sharp/internal/Builder.cs b/plugins/dali-sharp/sharp/internal/Builder.cs
index 1da5ab3..867bdc1 100644
--- a/plugins/dali-sharp/sharp/internal/Builder.cs
+++ b/plugins/dali-sharp/sharp/internal/Builder.cs
@@ -220,14 +220,14 @@ public class Builder : BaseHandle {
     return ret;
   }
 
-  public bool ApplyStyle(string styleName, Handle handle) {
-    bool ret = NDalicPINVOKE.Builder_ApplyStyle(swigCPtr, styleName, Handle.getCPtr(handle));
+  public bool ApplyStyle(string styleName, Animatable handle) {
+    bool ret = NDalicPINVOKE.Builder_ApplyStyle(swigCPtr, styleName, Animatable.getCPtr(handle));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public bool ApplyFromJson(Handle handle, string json) {
-    bool ret = NDalicPINVOKE.Builder_ApplyFromJson(swigCPtr, Handle.getCPtr(handle), json);
+  public bool ApplyFromJson(Animatable handle, string json) {
+    bool ret = NDalicPINVOKE.Builder_ApplyFromJson(swigCPtr, Animatable.getCPtr(handle), json);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
diff --git a/plugins/dali-sharp/sharp/internal/DisposeQueue.cs b/plugins/dali-sharp/sharp/internal/DisposeQueue.cs
index fe3b7e2..59120b2 100644
--- a/plugins/dali-sharp/sharp/internal/DisposeQueue.cs
+++ b/plugins/dali-sharp/sharp/internal/DisposeQueue.cs
@@ -16,7 +16,7 @@ namespace Dali
     {
         private static readonly DisposeQueue _disposableQueue = new DisposeQueue();
         private List<IDisposable> _disposables = new List<IDisposable>();
-        private Object _listLock = new object();
+        private System.Object _listLock = new object();
         private EventThreadCallback _eventThreadCallback;
         private EventThreadCallback.CallbackDelegate _disposeQueueProcessDisposablesDelegate;
 
diff --git a/plugins/dali-sharp/sharp/internal/GestureDetector.cs b/plugins/dali-sharp/sharp/internal/GestureDetector.cs
index 4609902..8574a69 100644
--- a/plugins/dali-sharp/sharp/internal/GestureDetector.cs
+++ b/plugins/dali-sharp/sharp/internal/GestureDetector.cs
@@ -10,7 +10,7 @@
 
 namespace Dali {
 
-public class GestureDetector : Handle {
+public class GestureDetector : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal GestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GestureDetector_SWIGUpcast(cPtr), cMemoryOwn) {
diff --git a/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs b/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs
index 6cf0062..a153e75 100644
--- a/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs
+++ b/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs
@@ -26,7 +26,7 @@
 
 namespace Dali {
 
-public class LinearConstrainer : Handle {
+public class LinearConstrainer : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal LinearConstrainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.LinearConstrainer_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -130,8 +130,8 @@ public class LinearConstrainer : Handle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Remove(Handle target) {
-    NDalicPINVOKE.LinearConstrainer_Remove(swigCPtr, Handle.getCPtr(target));
+  public void Remove(Animatable target) {
+    NDalicPINVOKE.LinearConstrainer_Remove(swigCPtr, Animatable.getCPtr(target));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -140,12 +140,12 @@ public class LinearConstrainer : Handle {
     get
     {
       Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( LinearConstrainer.Property.VALUE).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, LinearConstrainer.Property.VALUE).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( LinearConstrainer.Property.VALUE, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, LinearConstrainer.Property.VALUE, new Dali.Property.Value( value ) );
     }
   }
   public Dali.Property.Array Progress
@@ -153,12 +153,12 @@ public class LinearConstrainer : Handle {
     get
     {
       Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( LinearConstrainer.Property.PROGRESS).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, LinearConstrainer.Property.PROGRESS).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( LinearConstrainer.Property.PROGRESS, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, LinearConstrainer.Property.PROGRESS, new Dali.Property.Value( value ) );
     }
   }
 
diff --git a/plugins/dali-sharp/sharp/internal/NDalic.cs b/plugins/dali-sharp/sharp/internal/NDalic.cs
index d5501b7..601c874 100644
--- a/plugins/dali-sharp/sharp/internal/NDalic.cs
+++ b/plugins/dali-sharp/sharp/internal/NDalic.cs
@@ -438,12 +438,6 @@ public class NDalic {
     } 
   }
 
-  public static Handle New() {
-    Handle ret = new Handle(NDalicPINVOKE.New(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
   public static bool RegisterType(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) {
 System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(f); 
     {
diff --git a/plugins/dali-sharp/sharp/internal/Object.cs b/plugins/dali-sharp/sharp/internal/Object.cs
new file mode 100644
index 0000000..1cefaa4
--- /dev/null
+++ b/plugins/dali-sharp/sharp/internal/Object.cs
@@ -0,0 +1,40 @@
+/** Copyright (c) 2017 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+/**
+ * Static Helper class for Property
+ * Internal
+ */
+
+namespace Dali
+{
+
+public static class Object
+{
+  public static Property.Value GetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index) {
+    Property.Value ret = new Property.Value(NDalicPINVOKE.Handle_GetProperty(handle, index), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static void SetProperty( global::System.Runtime.InteropServices.HandleRef handle, int index, Property.Value propertyValue)
+  {
+    NDalicPINVOKE.Handle_SetProperty(handle, index, Property.Value.getCPtr(propertyValue));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+}
+
+}
diff --git a/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs b/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
index 8ebc3fc..6545cb5 100644
--- a/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
+++ b/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
@@ -370,7 +370,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     get
     {
       Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_POSITION).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.SCREEN_POSITION).Get(  temp );
       return temp;
     }
 }  public Vector2 ScreenDisplacement
@@ -378,7 +378,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     get
     {
       Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get(  temp );
       return temp;
     }
 }  public Vector2 ScreenVelocity
@@ -386,7 +386,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     get
     {
       Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_VELOCITY).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.SCREEN_VELOCITY).Get(  temp );
       return temp;
     }
 }  public Vector2 LocalPosition
@@ -394,7 +394,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     get
     {
       Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_POSITION).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.LOCAL_POSITION).Get(  temp );
       return temp;
     }
 }  public Vector2 LocalDisplacement
@@ -402,7 +402,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     get
     {
       Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get(  temp );
       return temp;
     }
 }  public Vector2 LocalVelocity
@@ -410,7 +410,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     get
     {
       Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_VELOCITY).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.LOCAL_VELOCITY).Get(  temp );
       return temp;
     }
 }  public bool Panning
@@ -418,7 +418,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     get
     {
       bool temp = false;
-      GetProperty( PanGestureDetector.Property.PANNING).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.PANNING).Get( ref temp );
       return temp;
     }
 }
diff --git a/plugins/dali-sharp/sharp/internal/Path.cs b/plugins/dali-sharp/sharp/internal/Path.cs
index caf6d5a..ddf30e8 100644
--- a/plugins/dali-sharp/sharp/internal/Path.cs
+++ b/plugins/dali-sharp/sharp/internal/Path.cs
@@ -26,7 +26,7 @@
 
 namespace Dali {
 
-public class Path : Handle {
+public class Path : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Path(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Path_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -163,12 +163,12 @@ public class Path : Handle {
     get
     {
       Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( Path.Property.POINTS).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, Path.Property.POINTS).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( Path.Property.POINTS, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Path.Property.POINTS, new Dali.Property.Value( value ) );
     }
   }
   public Dali.Property.Array ControlPoints
@@ -176,12 +176,12 @@ public class Path : Handle {
     get
     {
       Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( Path.Property.CONTROL_POINTS).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, Path.Property.CONTROL_POINTS).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( Path.Property.CONTROL_POINTS, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Path.Property.CONTROL_POINTS, new Dali.Property.Value( value ) );
     }
   }
 
diff --git a/plugins/dali-sharp/sharp/internal/PathConstrainer.cs b/plugins/dali-sharp/sharp/internal/PathConstrainer.cs
index 85a9488..9d6f136 100644
--- a/plugins/dali-sharp/sharp/internal/PathConstrainer.cs
+++ b/plugins/dali-sharp/sharp/internal/PathConstrainer.cs
@@ -26,7 +26,7 @@
 
 namespace Dali {
 
-public class PathConstrainer : Handle {
+public class PathConstrainer : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PathConstrainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PathConstrainer_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -131,8 +131,8 @@ public class PathConstrainer : Handle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Remove(Handle target) {
-    NDalicPINVOKE.PathConstrainer_Remove(swigCPtr, Handle.getCPtr(target));
+  public void Remove(Animatable target) {
+    NDalicPINVOKE.PathConstrainer_Remove(swigCPtr, Animatable.getCPtr(target));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -141,12 +141,12 @@ public class PathConstrainer : Handle {
     get
     {
       Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( PathConstrainer.Property.FORWARD).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PathConstrainer.Property.FORWARD).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( PathConstrainer.Property.FORWARD, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, PathConstrainer.Property.FORWARD, new Dali.Property.Value( value ) );
     }
   }
   public Dali.Property.Array Points
@@ -154,12 +154,12 @@ public class PathConstrainer : Handle {
     get
     {
       Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( PathConstrainer.Property.POINTS).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PathConstrainer.Property.POINTS).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( PathConstrainer.Property.POINTS, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, PathConstrainer.Property.POINTS, new Dali.Property.Value( value ) );
     }
   }
   public Dali.Property.Array ControlPoints
@@ -167,12 +167,12 @@ public class PathConstrainer : Handle {
     get
     {
       Dali.Property.Array temp = new Dali.Property.Array();
-      GetProperty( PathConstrainer.Property.CONTROL_POINTS).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, PathConstrainer.Property.CONTROL_POINTS).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( PathConstrainer.Property.CONTROL_POINTS, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, PathConstrainer.Property.CONTROL_POINTS, new Dali.Property.Value( value ) );
     }
   }
 
diff --git a/plugins/dali-sharp/sharp/internal/Property.cs b/plugins/dali-sharp/sharp/internal/Property.cs
index 32ccdb5..551b2ae 100644
--- a/plugins/dali-sharp/sharp/internal/Property.cs
+++ b/plugins/dali-sharp/sharp/internal/Property.cs
@@ -70,32 +70,32 @@ public class Property : global::System.IDisposable {
     } 
   }
 
-  public Property(Handle arg0, int propertyIndex) : this(NDalicPINVOKE.new_Property__SWIG_0(Handle.getCPtr(arg0), propertyIndex), true) {
+  public Property(Animatable arg0, int propertyIndex) : this(NDalicPINVOKE.new_Property__SWIG_0(Animatable.getCPtr(arg0), propertyIndex), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Property(Handle arg0, int propertyIndex, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_1(Handle.getCPtr(arg0), propertyIndex, componentIndex), true) {
+  public Property(Animatable arg0, int propertyIndex, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_1(Animatable.getCPtr(arg0), propertyIndex, componentIndex), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Property(Handle arg0, string propertyName) : this(NDalicPINVOKE.new_Property__SWIG_2(Handle.getCPtr(arg0), propertyName), true) {
+  public Property(Animatable arg0, string propertyName) : this(NDalicPINVOKE.new_Property__SWIG_2(Animatable.getCPtr(arg0), propertyName), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Property(Handle arg0, string propertyName, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_3(Handle.getCPtr(arg0), propertyName, componentIndex), true) {
+  public Property(Animatable arg0, string propertyName, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_3(Animatable.getCPtr(arg0), propertyName, componentIndex), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Handle _object {
+  public Animatable _object {
     set {
-      NDalicPINVOKE.Property__object_set(swigCPtr, Handle.getCPtr(value));
+      NDalicPINVOKE.Property__object_set(swigCPtr, Animatable.getCPtr(value));
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
+    }
     get {
-      Handle ret = new Handle(NDalicPINVOKE.Property__object_get(swigCPtr), false);
+      Animatable ret = new Animatable(NDalicPINVOKE.Property__object_get(swigCPtr), false);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public int propertyIndex {
diff --git a/plugins/dali-sharp/sharp/internal/PropertyNotification.cs b/plugins/dali-sharp/sharp/internal/PropertyNotification.cs
index 4fe13ec..14b25e8 100644
--- a/plugins/dali-sharp/sharp/internal/PropertyNotification.cs
+++ b/plugins/dali-sharp/sharp/internal/PropertyNotification.cs
@@ -162,8 +162,8 @@ public class NotifyEventArgs : EventArgs
     return ret;
   }
 
-  public Handle GetTarget() {
-    Handle ret = new Handle(NDalicPINVOKE.PropertyNotification_GetTarget(swigCPtr), true);
+  public Animatable GetTarget() {
+    Animatable ret = new Animatable(NDalicPINVOKE.PropertyNotification_GetTarget(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
diff --git a/plugins/dali-sharp/sharp/internal/RenderTask.cs b/plugins/dali-sharp/sharp/internal/RenderTask.cs
index 0bdc106..4363df5 100644
--- a/plugins/dali-sharp/sharp/internal/RenderTask.cs
+++ b/plugins/dali-sharp/sharp/internal/RenderTask.cs
@@ -10,7 +10,7 @@
 
 namespace Dali {
 
-public class RenderTask : Handle {
+public class RenderTask : Animatable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal RenderTask(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTask_SWIGUpcast(cPtr), cMemoryOwn) {
diff --git a/plugins/dali-sharp/sharp/internal/Renderer.cs b/plugins/dali-sharp/sharp/internal/Renderer.cs
index fb6aa2e..e7051be 100644
--- a/plugins/dali-sharp/sharp/internal/Renderer.cs
+++ b/plugins/dali-sharp/sharp/internal/Renderer.cs
@@ -26,7 +26,7 @@
 
 namespace Dali {
 
-public class Renderer : Handle {
+public class Renderer : Animatable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Renderer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Renderer_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -185,12 +185,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_INDEX).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_INDEX).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_INDEX, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.DEPTH_INDEX, new Dali.Property.Value( value ) );
     }
   }
   public int FaceCullingMode
@@ -198,12 +198,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.FACE_CULLING_MODE).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.FACE_CULLING_MODE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.FACE_CULLING_MODE, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.FACE_CULLING_MODE, new Dali.Property.Value( value ) );
     }
   }
   public int BlendMode
@@ -211,12 +211,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.BLEND_MODE).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_MODE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_MODE, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_MODE, new Dali.Property.Value( value ) );
     }
   }
   public int BlendEquationRgb
@@ -224,12 +224,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.BLEND_EQUATION_RGB).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_RGB).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_EQUATION_RGB, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_RGB, new Dali.Property.Value( value ) );
     }
   }
   public int BlendEquationAlpha
@@ -237,12 +237,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.BLEND_EQUATION_ALPHA).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_EQUATION_ALPHA, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA, new Dali.Property.Value( value ) );
     }
   }
   public int BlendFactorSrcRgb
@@ -250,12 +250,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB, new Dali.Property.Value( value ) );
     }
   }
   public int BlendFactorDestRgb
@@ -263,12 +263,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB, new Dali.Property.Value( value ) );
     }
   }
   public int BlendFactorSrcAlpha
@@ -276,12 +276,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA, new Dali.Property.Value( value ) );
     }
   }
   public int BlendFactorDestAlpha
@@ -289,12 +289,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA, new Dali.Property.Value( value ) );
     }
   }
   public Vector4 BlendColor
@@ -302,12 +302,12 @@ public class Renderer : Handle {
     get
     {
       Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Renderer.Property.BLEND_COLOR).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_COLOR).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_COLOR, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_COLOR, new Dali.Property.Value( value ) );
     }
   }
   public bool BlendPreMultipliedAlpha
@@ -315,12 +315,12 @@ public class Renderer : Handle {
     get
     {
       bool temp = false;
-      GetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA, new Dali.Property.Value( value ) );
     }
   }
   public int IndexRangeFirst
@@ -328,12 +328,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.INDEX_RANGE_FIRST).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_FIRST).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.INDEX_RANGE_FIRST, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_FIRST, new Dali.Property.Value( value ) );
     }
   }
   public int IndexRangeCount
@@ -341,12 +341,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.INDEX_RANGE_COUNT).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_COUNT).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.INDEX_RANGE_COUNT, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_COUNT, new Dali.Property.Value( value ) );
     }
   }
   public int DepthWriteMode
@@ -354,12 +354,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_WRITE_MODE).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_WRITE_MODE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_WRITE_MODE, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.DEPTH_WRITE_MODE, new Dali.Property.Value( value ) );
     }
   }
   public int DepthFunction
@@ -367,12 +367,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_FUNCTION).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_FUNCTION).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_FUNCTION, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.DEPTH_FUNCTION, new Dali.Property.Value( value ) );
     }
   }
   public int DepthTestMode
@@ -380,12 +380,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.DEPTH_TEST_MODE).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_TEST_MODE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_TEST_MODE, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.DEPTH_TEST_MODE, new Dali.Property.Value( value ) );
     }
   }
   public int RenderMode
@@ -393,12 +393,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.RENDER_MODE).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.RENDER_MODE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.RENDER_MODE, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.RENDER_MODE, new Dali.Property.Value( value ) );
     }
   }
   public int StencilFunction
@@ -406,12 +406,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_FUNCTION).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION, new Dali.Property.Value( value ) );
     }
   }
   public int StencilFunctionMask
@@ -419,12 +419,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_FUNCTION_MASK).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION_MASK, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK, new Dali.Property.Value( value ) );
     }
   }
   public int StencilFunctionReference
@@ -432,12 +432,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE, new Dali.Property.Value( value ) );
     }
   }
   public int StencilMask
@@ -445,12 +445,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_MASK).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_MASK).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_MASK, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.STENCIL_MASK, new Dali.Property.Value( value ) );
     }
   }
   public int StencilOperationOnFail
@@ -458,12 +458,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL, new Dali.Property.Value( value ) );
     }
   }
   public int StencilOperationOnZFail
@@ -471,12 +471,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL, new Dali.Property.Value( value ) );
     }
   }
   public int StencilOperationOnZPass
@@ -484,12 +484,12 @@ public class Renderer : Handle {
     get
     {
       int temp = 0;
-      GetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get( ref temp );
+      Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS, new Dali.Property.Value( value ) );
     }
   }
 
diff --git a/plugins/dali-sharp/sharp/internal/ScrollBar.cs b/plugins/dali-sharp/sharp/internal/ScrollBar.cs
index 28662d2..fce71d2 100644
--- a/plugins/dali-sharp/sharp/internal/ScrollBar.cs
+++ b/plugins/dali-sharp/sharp/internal/ScrollBar.cs
@@ -256,8 +256,8 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs
     return ret;
   }
 
-  public void SetScrollPropertySource(Handle handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize) {
-    NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Handle.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
+  public void SetScrollPropertySource(Animatable handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize) {
+    NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Animatable.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
diff --git a/plugins/dali-sharp/sharp/internal/Shader.cs b/plugins/dali-sharp/sharp/internal/Shader.cs
index ea03d17..1e6d722 100644
--- a/plugins/dali-sharp/sharp/internal/Shader.cs
+++ b/plugins/dali-sharp/sharp/internal/Shader.cs
@@ -26,7 +26,7 @@
 
 namespace Dali {
 
-public class Shader : Handle {
+public class Shader : Animatable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Shader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Shader_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -64,20 +64,20 @@ public class Shader : Handle {
   public class Hint : global::System.IDisposable {
     private global::System.Runtime.InteropServices.HandleRef swigCPtr;
     protected bool swigCMemOwn;
-  
+
     internal Hint(global::System.IntPtr cPtr, bool cMemoryOwn) {
       swigCMemOwn = cMemoryOwn;
       swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
     }
-  
+
     internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Hint obj) {
       return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
     }
-  
+
     ~Hint() {
       Dispose();
     }
-  
+
     public virtual void Dispose() {
       lock(this) {
         if (swigCPtr.Handle != global::System.IntPtr.Zero) {
@@ -90,28 +90,28 @@ public class Shader : Handle {
         global::System.GC.SuppressFinalize(this);
       }
     }
-  
+
     public Hint() : this(NDalicPINVOKE.new_Shader_Hint(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }
-  
+
     public enum Value {
       NONE = 0x00,
       OUTPUT_IS_TRANSPARENT = 0x01,
       MODIFIES_GEOMETRY = 0x02
     }
-  
+
   }
 
   public class Property : global::System.IDisposable {
     private global::System.Runtime.InteropServices.HandleRef swigCPtr;
     protected bool swigCMemOwn;
-  
+
     internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
       swigCMemOwn = cMemoryOwn;
       swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
     }
-  
+
     internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) {
       return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
     }
@@ -132,13 +132,13 @@ public class Shader : Handle {
         global::System.GC.SuppressFinalize(this);
       }
     }
-  
+
     public Property() : this(NDalicPINVOKE.new_Shader_Property(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }
-  
+
     public static readonly int PROGRAM = NDalicPINVOKE.Shader_Property_PROGRAM_get();
-  
+
   }
 
   public Shader (string vertexShader, string fragmentShader, Shader.Hint.Value hints) : this (NDalicPINVOKE.Shader_New__SWIG_0(vertexShader, fragmentShader, (int)hints), true) {
@@ -170,15 +170,14 @@ public class Shader : Handle {
     get
     {
       Dali.Property.Map temp = new Dali.Property.Map();
-      GetProperty( Shader.Property.PROGRAM).Get(  temp );
+      Dali.Object.GetProperty( swigCPtr, Shader.Property.PROGRAM).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( Shader.Property.PROGRAM, new Dali.Property.Value( value ) );
+      Dali.Object.SetProperty( swigCPtr, Shader.Property.PROGRAM, new Dali.Property.Value( value ) );
     }
   }
-
 }
 
 }