From 547f0bcf6da4ada4d88bfa2ad62398f4cf0b7727 Mon Sep 17 00:00:00 2001
From: dongsug-song <35130733+dongsug-song@users.noreply.github.com>
Date: Thu, 25 Jan 2018 10:36:35 +0900
Subject: [PATCH] [NUI] NUI_1.2.83 version release (#77)

* [NUI] remove this.Reset in Animation Dispose

* [NUI] NUI_1.2.83 Version
---
 packaging/version.txt                           | 4 ++--
 src/Tizen.NUI/src/internal/VersionCheck.cs      | 6 +++---
 src/Tizen.NUI/src/public/Animation.cs           | 7 +------
 src/Tizen.NUI/src/public/BaseComponents/View.cs | 8 ++++----
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/packaging/version.txt b/packaging/version.txt
index ed39e9f..196bab0 100755
--- a/packaging/version.txt
+++ b/packaging/version.txt
@@ -7,7 +7,7 @@ NUGET_VERSION=4.0.1-preview1-99999
 INTERNAL_NUGET_VERSION=4.0.1.999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui82
+RPM_VERSION_SUFFIX=nui83
 
 # Native Dependencies
-DALI_VERSION=1.2.82
+DALI_VERSION=1.2.83
diff --git a/src/Tizen.NUI/src/internal/VersionCheck.cs b/src/Tizen.NUI/src/internal/VersionCheck.cs
index fb51f00..899f087 100755
--- a/src/Tizen.NUI/src/internal/VersionCheck.cs
+++ b/src/Tizen.NUI/src/internal/VersionCheck.cs
@@ -24,10 +24,10 @@ namespace Tizen.NUI
     {
         public const int daliVer1 = 1;
         public const int daliVer2 = 2;
-        public const int daliVer3 = 82;
-        public const int nuiVer1 = 0;
+        public const int daliVer3 = 83;
+        public const int nuiVer1 = 1;
         public const int nuiVer2 = 2;
-        public const int nuiVer3 = 82;
+        public const int nuiVer3 = 83;
         public const string nuiRelease = "";
 
 
diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs
index c079d5b..6bd8eee 100755
--- a/src/Tizen.NUI/src/public/Animation.cs
+++ b/src/Tizen.NUI/src/public/Animation.cs
@@ -83,12 +83,7 @@ namespace Tizen.NUI
 
             }
 
-            if (this)
-            {
-                this.Clear();
-                this.Reset();
-                //throw new System.InvalidOperationException("Animation Instance should not be disposed until getting Finished event. Should be a global variable");
-            }
+            this?.Clear();
 
             //Release your own unmanaged resources here.
             //You should not access any managed member here except static instance.
diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 504ca45..0e3ae04 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -414,7 +414,7 @@ namespace Tizen.NUI.BaseComponents
         {
             if (keyEvent == global::System.IntPtr.Zero)
             {
-                Tizen.Log.Error("NUI", "keyEvent should not be null!");
+                NUILog.Error("keyEvent should not be null!");
                 return true;
             }
 
@@ -547,7 +547,7 @@ namespace Tizen.NUI.BaseComponents
         {
             if (touchData == global::System.IntPtr.Zero)
             {
-                Tizen.Log.Error("NUI", "touchData should not be null!");
+                NUILog.Error("touchData should not be null!");
                 return true;
             }
 
@@ -628,7 +628,7 @@ namespace Tizen.NUI.BaseComponents
         {
             if (hoverEvent == global::System.IntPtr.Zero)
             {
-                Tizen.Log.Error("NUI", "hoverEvent should not be null!");
+                NUILog.Error("hoverEvent should not be null!");
                 return true;
             }
 
@@ -709,7 +709,7 @@ namespace Tizen.NUI.BaseComponents
         {
             if (wheelEvent == global::System.IntPtr.Zero)
             {
-                Tizen.Log.Error("NUI", "wheelEvent should not be null!");
+                NUILog.Error("wheelEvent should not be null!");
                 return true;
             }
 
-- 
2.7.4