remove DOT_NET_CORE define, clean up debug log

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

diff --git a/Tizen.NUI/src/internal/Application.cs b/Tizen.NUI/src/internal/Application.cs
index a1ab80a..10311e6 100755 (executable)
--- a/Tizen.NUI/src/internal/Application.cs
+++ b/Tizen.NUI/src/internal/Application.cs
@@ -353,13 +353,6 @@ namespace Tizen.NUI
             base.Dispose(type);
         }
 
-        private static void LOG(string str)
-        {
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", str);
-#endif
-        }
-
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
         private delegate void NUIApplicationInitEventCallbackDelegate(IntPtr application);
         private DaliEventHandler<object, NUIApplicationInitEventArgs> _applicationInitEventHandler;
@@ -1057,13 +1050,12 @@ namespace Tizen.NUI
         internal void SetupDelegates()
         {
             InitDelegateInternal initializeCallback = new InitDelegateInternal(Initialization);
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", "InitSignal connection count");
-#endif
+
+            NUILog.Debug("InitSignal connection count");
+
             this.InitSignal().Connect(initializeCallback);
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", "InitSignal connection count = " + InitSignal().GetConnectionCount());
-#endif
+
+            NUILog.Debug("InitSignal connection count = " + InitSignal().GetConnectionCount());
         }
 
         public static Application NewApplication()
@@ -1092,24 +1084,24 @@ namespace Tizen.NUI
                         if (ver1 != Version.ver1 || ver2 != Version.ver2 || ver3 != Version.ver3)
                         {
                             //throw new System.InvalidOperationException("Dali native version mismatch error! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3 + " but dali=" + ver1 + "." + ver2 + "." + ver3);
-                            Tizen.Log.Fatal("NUI", "Dali native version mismatch error! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease + " but native dali=" + ver1 + "." + ver2 + "." + ver3);
+                            NUILog.Error("Dali native version mismatch error! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease + " but native dali=" + ver1 + "." + ver2 + "." + ver3);
                         }
                     }
                     else
                     {
                         //throw new System.InvalidOperationException("Dali native version mismatch error! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3 + " but dali=" + ver1 + "." + ver2 + "." + ver3);
-                        Tizen.Log.Fatal("NUI", "Dali native version mismatch error! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease + " but native dali=" + ver1 + "." + ver2 + "." + ver3);
+                        NUILog.Error("Dali native version mismatch error! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease + " but native dali=" + ver1 + "." + ver2 + "." + ver3);
                     }
                 }
                 catch (Exception exc)
                 {
                     //throw new System.InvalidOperationException("Dali native version is very old! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3);
-                    Tizen.Log.Fatal("NUI", "Dali native version is very old! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease);
-                    Tizen.Log.Fatal("NUI", "exception occured! =" + exc.Message);
+                    NUILog.Error("Dali native version is very old! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease);
+                    NUILog.Error("exception occured! =" + exc.Message);
                 }
-                LOG(" Dali native version=" + ver1 + "." + ver2 + "." + ver3 + "       NUI version=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease);
+                NUILog.Debug(" Dali native version=" + ver1 + "." + ver2 + "." + ver3 + "      NUI version=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease);
             }
-            LOG(" NewApplication(string stylesheet, Application.WindowMode windowMode) is called! ");
+            NUILog.Debug(" NewApplication(string stylesheet, Application.WindowMode windowMode) is called! ");
 
             // register all Views with the type registry, so that can be created / styled via JSON
             //ViewRegistryHelper.Initialize(); //moved to Application side.
@@ -1143,7 +1135,7 @@ namespace Tizen.NUI
         */
         public static Application New()
         {
-            LOG("New() is called!");
+            NUILog.Debug("New() is called!");
 
             Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_0(), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1152,7 +1144,7 @@ namespace Tizen.NUI
 
         public static Application New(int argc)
         {
-            LOG("New(int argc) is called!");
+            NUILog.Debug("New(int argc) is called!");
 
             Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_1(argc), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1161,7 +1153,7 @@ namespace Tizen.NUI
 
         public static Application New(int argc, string stylesheet)
         {
-            LOG("New(int argc, string stylesheet) is called!");
+            NUILog.Debug("New(int argc, string stylesheet) is called!");
 
             Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_2(argc, stylesheet), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1170,7 +1162,7 @@ namespace Tizen.NUI
 
         public static Application New(int argc, string stylesheet, Application.WindowMode windowMode)
         {
-            LOG("New(int argc, string stylesheet, Application.WindowMode windowMode) is called!");
+            NUILog.Debug("New(int argc, string stylesheet, Application.WindowMode windowMode) is called!");
 
             Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_3(argc, stylesheet, (int)windowMode), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1179,7 +1171,7 @@ namespace Tizen.NUI
 
         public Application() : this(NDalicPINVOKE.new_Application__SWIG_0(), true)
         {
-            LOG("Application() is called!");
+            NUILog.Debug("Application() is called!");
 
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }

diff --git a/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs b/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs
index 5733df1..4954fc6 100755 (executable)
--- a/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs
+++ b/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs
@@ -8,11 +8,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-//#define DOT_NET_CORE
-#if DOT_NET_CORE
 using System.Reflection;
-#endif
-
 using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
@@ -120,20 +116,12 @@ namespace Tizen.NUI
             NDalicPINVOKE.CustomAlgorithmInterface_director_connect(swigCPtr, swigDelegate0);
         }
 
-#if DOT_NET_CORE
         private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
         {
             global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);
             bool hasDerivedMethod = this.GetType().GetTypeInfo().IsSubclassOf(typeof(CustomAlgorithmInterface));
             return hasDerivedMethod && (methodInfo != null);
         }
-#else
-  private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {
-    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(CustomAlgorithmInterface));
-    return hasDerivedMethod;
-  }
-#endif
 
         private global::System.IntPtr SwigDirectorGetNextFocusableView(global::System.IntPtr current, global::System.IntPtr proposed, int direction)
         {

diff --git a/Tizen.NUI/src/internal/DaliEnumConstants.cs b/Tizen.NUI/src/internal/DaliEnumConstants.cs
index a64c3a1..58320ba 100755 (executable)
--- a/Tizen.NUI/src/internal/DaliEnumConstants.cs
+++ b/Tizen.NUI/src/internal/DaliEnumConstants.cs
@@ -14,6 +14,9 @@
  *
  */
 using System;
+using System.Reflection;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
 
 namespace Tizen.NUI
 {
@@ -80,4 +83,28 @@ namespace Tizen.NUI
             }
         }
     } // namespace Constants
+
+
+internal class NUILog
+{
+    [Conditional("DEBUG_ON")]
+    public static void Debug(string msg,
+        [CallerLineNumber] int lineNum = 0,
+        [CallerMemberName] string caller = null,
+        [CallerFilePath] string file = null
+    )
+    {
+        Tizen.Log.Debug("NUI", $"{msg} (at {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} line {lineNum} of {caller} in {file})" );
+    }
+
+    public static void Error(string msg,
+        [CallerLineNumber] int lineNum = 0,
+        [CallerMemberName] string caller = null,
+        [CallerFilePath] string file = null
+    )
+    {
+        Tizen.Log.Debug("NUI", $"[ERROR] {msg} (at {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} line {lineNum} of {caller} in {file})" );
+    }
+}
+
 } // namesapce Dali

diff --git a/Tizen.NUI/src/internal/ItemFactory.cs b/Tizen.NUI/src/internal/ItemFactory.cs
index dc841db..ea942ed 100755 (executable)
--- a/Tizen.NUI/src/internal/ItemFactory.cs
+++ b/Tizen.NUI/src/internal/ItemFactory.cs
@@ -8,10 +8,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-//#define DOT_NET_CORE
-#if (DOT_NET_CORE)
 using System.Reflection;
-#endif
 
 namespace Tizen.NUI
 {
@@ -135,24 +132,13 @@ namespace Tizen.NUI
             NDalicPINVOKE.ItemFactory_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2);
         }
 
-#if (DOT_NET_CORE)
         private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
         {
             global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);
             bool hasDerivedMethod = this.GetType().GetTypeInfo().IsSubclassOf(typeof(ItemFactory));
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod);
-#endif
+            NUILog.Debug("hasDerivedMethod=" + hasDerivedMethod);
             return hasDerivedMethod && (methodInfo != null);
         }
-#else
-        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
-        {
-            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-            bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ItemFactory));
-            return hasDerivedMethod;
-        }
-#endif
 
         private uint SwigDirectorGetNumberOfItems()
         {

diff --git a/Tizen.NUI/src/internal/PropertyRangeManager.cs b/Tizen.NUI/src/internal/PropertyRangeManager.cs
index a1a78fe..c875ef9 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyRangeManager.cs
+++ b/Tizen.NUI/src/internal/PropertyRangeManager.cs
@@ -1,8 +1,6 @@
 
-//#define DOT_NET_CORE
-#if (DOT_NET_CORE)
+
 using System.Reflection;
-#endif
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
@@ -94,23 +92,13 @@ namespace Tizen.NUI
             // we add 1000, just incase View class starts using animatable properties
             int startAnimatablePropertyIndex = (int)Tizen.NUI.PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + maxCountPerDerivation;
 
-#if (DOT_NET_CORE)
             while (viewType.GetTypeInfo().BaseType.Name != "CustomView")   // custom view is our C# view base class. we don't go any deeper.
-#else
-            while (viewType.BaseType.Name != "CustomView")   // custom view is our C# view base class. we don't go any deeper.
-#endif
             {
                 // for every base class increase property start index
                 startEventPropertyIndex += (int)Tizen.NUI.PropertyRanges.DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION; // DALi uses 10,000
                 startAnimatablePropertyIndex += maxCountPerDerivation;
-#if DEBUG_ON
-                Tizen.Log.Debug("NUI", "getStartPropertyIndex =  " + viewType.Name + "current index " + startEventPropertyIndex);
-#endif
-#if (DOT_NET_CORE)
+                NUILog.Debug("getStartPropertyIndex =  " + viewType.Name + "current index " + startEventPropertyIndex);
                 viewType = viewType.GetTypeInfo().BaseType;
-#else
-                viewType = viewType.BaseType;
-#endif
             }
 
             range.startEventIndex = startEventPropertyIndex;

diff --git a/Tizen.NUI/src/internal/Registry.cs b/Tizen.NUI/src/internal/Registry.cs
index c7a3597..cf91e4e 100755 (executable)
--- a/Tizen.NUI/src/internal/Registry.cs
+++ b/Tizen.NUI/src/internal/Registry.cs
@@ -1,8 +1,5 @@
 
-//#define DOT_NET_CORE
-#if (DOT_NET_CORE)
 using System.Reflection;
-#endif
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
@@ -43,9 +40,8 @@ namespace Tizen.NUI
             RefObject refObj = baseHandle.GetObjectPtr();
             IntPtr refCptr = (IntPtr)RefObject.getCPtr(refObj);
 
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", "________Storing ref object cptr in control map Hex: {0:X}" + refCptr);
-#endif
+            NUILog.Debug("________Storing ref object cptr in control map Hex: {0:X}" + refCptr);
+
             if (!Instance._controlMap.ContainsKey(refCptr))
             {
                 Instance._controlMap.Add(refCptr, new WeakReference(baseHandle, false));

diff --git a/Tizen.NUI/src/internal/ViewImpl.cs b/Tizen.NUI/src/internal/ViewImpl.cs
index 2037049..f954475 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewImpl.cs
+++ b/Tizen.NUI/src/internal/ViewImpl.cs
@@ -8,10 +8,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-#if (DOT_NET_CORE)
 using System.Reflection;
-#endif
-
 using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
@@ -591,25 +588,15 @@ namespace Tizen.NUI
         }
 
 
-#if (DOT_NET_CORE)
         private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
         {
             global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);
             bool hasDerivedMethod = this.GetType().GetTypeInfo().IsSubclassOf(typeof(ViewImpl));
 
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod);
-#endif
+            NUILog.Debug("hasDerivedMethod=" + hasDerivedMethod);
+
             return hasDerivedMethod && (methodInfo != null);
         }
-#else
-        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
-        {
-            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-            bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ViewImpl));
-            return hasDerivedMethod;
-        }
-#endif
 
         private void SwigDirectorOnStageConnection(int depth)
         {

diff --git a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
index 008211d..36585be 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
+++ b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
@@ -436,9 +436,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(TextEditor.Property.HORIZONTAL_ALIGNMENT).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "HorizontalAlignment get error!");
-#endif
+                    NUILog.Error("HorizontalAlignment get error!");
                 }
 
                 switch (temp)

diff --git a/Tizen.NUI/src/public/BaseComponents/TextField.cs b/Tizen.NUI/src/public/BaseComponents/TextField.cs
index 0c31cd9..b78fec2 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/TextField.cs
+++ b/Tizen.NUI/src/public/BaseComponents/TextField.cs
@@ -474,9 +474,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(TextField.Property.HORIZONTAL_ALIGNMENT).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "HorizontalAlignment get error!");
-#endif
+                    NUILog.Error("HorizontalAlignment get error!");
                 }
 
                 switch (temp)
@@ -531,9 +529,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(TextField.Property.VERTICAL_ALIGNMENT).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "VerticalAlignment get error!");
-#endif
+                    NUILog.Error("VerticalAlignment get error!");
                 }
 
                 switch (temp)

diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index 4cacebf..5e79250 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -236,9 +236,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(TextLabel.Property.HORIZONTAL_ALIGNMENT).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "HorizontalAlignment get error!");
-#endif
+                    NUILog.Error("HorizontalAlignment get error!");
                 }
                 switch (temp)
                 {
@@ -293,9 +291,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(TextLabel.Property.VERTICAL_ALIGNMENT).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "VerticalAlignment get error!");
-#endif
+                    NUILog.Error("VerticalAlignment get error!");
                 }
 
                 switch (temp)
@@ -693,9 +689,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if(GetProperty(TextLabel.Property.AUTO_SCROLL_STOP_MODE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "AutoScrollStopMode get error!");
-#endif
+                    NUILog.Error("AutoScrollStopMode get error!");
                 }
                 switch (temp)
                 {

diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs
index 71e85ce..13f5ae7 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -1128,9 +1128,7 @@ namespace Tizen.NUI.BaseComponents
                 int temp = 0;
                 if (GetProperty(View.Property.STATE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "State get error!");
-#endif
+                    NUILog.Error("State get error!");
                 }
                 switch (temp)
                 {
@@ -1168,9 +1166,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(View.Property.SUB_STATE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "subState get error!");
-#endif
+                    NUILog.Error("subState get error!");
                 }
                 switch (temp)
                 {
@@ -1414,9 +1410,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "CellHorizontalAlignment get error!");
-#endif
+                    NUILog.Error("CellHorizontalAlignment get error!");
                 }
 
                 switch (temp)
@@ -1471,9 +1465,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 GetProperty(TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT).Get(out temp);
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "CellVerticalAlignment get error!");
-#endif
+                    NUILog.Error("CellVerticalAlignment get error!");
                 }
 
                 switch (temp)
@@ -3306,9 +3298,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(View.Property.DRAW_MODE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "DrawMode get error!");
-#endif
+                    NUILog.Error("DrawMode get error!");
                 }
                 switch (temp)
                 {
@@ -3357,9 +3347,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(View.Property.WIDTH_RESIZE_POLICY).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "WidthResizePolicy get error!");
-#endif
+                    NUILog.Error("WidthResizePolicy get error!");
                 }
                 switch (temp)
                 {
@@ -3399,9 +3387,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(View.Property.HEIGHT_RESIZE_POLICY).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "HeightResizePolicy get error!");
-#endif
+                    NUILog.Error("HeightResizePolicy get error!");
                 }
                 switch (temp)
                 {
@@ -3442,9 +3428,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(View.Property.SIZE_SCALE_POLICY).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "SizeScalePolicy get error!");
-#endif
+                    NUILog.Error("SizeScalePolicy get error!");
                 }
                 switch (temp)
                 {
@@ -3602,9 +3586,7 @@ namespace Tizen.NUI.BaseComponents
                 string temp;
                 if (GetProperty(View.Property.CLIPPING_MODE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "ClippingMode get error!");
-#endif
+                    NUILog.Error("ClippingMode get error!");
                 }
                 switch (temp)
                 {

diff --git a/Tizen.NUI/src/public/BaseComponents/VisualView.cs b/Tizen.NUI/src/public/BaseComponents/VisualView.cs
index 9b6a90f..f88b1ff 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/VisualView.cs
+++ b/Tizen.NUI/src/public/BaseComponents/VisualView.cs
@@ -200,9 +200,7 @@ namespace Tizen.NUI.BaseComponents
             _tranformDictionary[visualIndex] = visualMap.OutputTransformMap;
 
             RelayoutRequest();
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", "UpdateVisual() name=" + visualName);
-#endif
+            NUILog.Debug("UpdateVisual() name=" + visualName);
         }
 
         /// <summary>

diff --git a/Tizen.NUI/src/public/CustomViewRegistry.cs b/Tizen.NUI/src/public/CustomViewRegistry.cs
old mode 100644 (file)
new mode 100755 (executable)
index 37180f9..df8a32b
--- a/Tizen.NUI/src/public/CustomViewRegistry.cs
+++ b/Tizen.NUI/src/public/CustomViewRegistry.cs
@@ -1,8 +1,5 @@
 
-//#define DOT_NET_CORE
-#if (DOT_NET_CORE)
 using System.Reflection;
-#endif
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
@@ -286,13 +283,9 @@ namespace Tizen.NUI
                 if (propertyInfo.CanRead)
                 {
 
-#if (DOT_NET_CORE)
                     IEnumerable<Attribute> ie_attrs = propertyInfo.GetCustomAttributes<Attribute>();
                     List<Attribute> li_attrs = new List<Attribute>(ie_attrs);
                     System.Attribute[] attrs = li_attrs.ToArray();
-#else
-                    System.Attribute[] attrs = System.Attribute.GetCustomAttributes(propertyInfo);
-#endif
 
                     foreach (System.Attribute attr in attrs)
                     {

diff --git a/Tizen.NUI/src/public/NUIApplication.cs b/Tizen.NUI/src/public/NUIApplication.cs
index 7411f0c..6c34da6 100755 (executable)
--- a/Tizen.NUI/src/public/NUIApplication.cs
+++ b/Tizen.NUI/src/public/NUIApplication.cs
@@ -27,13 +27,6 @@ namespace Tizen.NUI
     /// </summary>
     public class NUIApplication : CoreUIApplication
     {
-        private void LOG(string _str)
-        {
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", _str);
-#endif
-        }
-
         /// <summary>
         /// The instance of the Application.
         /// </summary>
@@ -103,7 +96,7 @@ namespace Tizen.NUI
         {
             base.OnPause();
             _applicationExt.Pause();
-            LOG("OnPause() is called!");
+            NUILog.Debug("OnPause() is called!");
         }
 
         /// <summary>
@@ -114,9 +107,7 @@ namespace Tizen.NUI
         {
             // Initialize DisposeQueue Singleton class.
             DisposeQueue disposeQ = DisposeQueue.Instance;
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", "##### 1) DisposeQueue.Instance.Initialize()!");
-#endif
+            NUILog.Debug("##### 1) DisposeQueue.Instance.Initialize()!");
             switch (_appMode)
             {
                 case AppMode.Default:
@@ -137,12 +128,10 @@ namespace Tizen.NUI
 
             // This is also required to create DisposeQueue on main thread.
             disposeQ.Initialize();
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", "##### 2) DisposeQueue.Instance.Initialize()!");
-#endif
+            NUILog.Debug("##### 2) DisposeQueue.Instance.Initialize()!");
             _window = Window.Instance;
             _window.SetBackgroundColor(Color.White);
-            LOG("OnPreCreate() is called!");
+            NUILog.Debug("OnPreCreate() is called!");
         }
 
         /// <summary>
@@ -152,7 +141,7 @@ namespace Tizen.NUI
         {
             base.OnResume();
             _applicationExt.Resume();
-            LOG("OnResume() is called!");
+            NUILog.Debug("OnResume() is called!");
         }
 
         /// <summary>
@@ -161,11 +150,11 @@ namespace Tizen.NUI
         protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
         {
             base.OnAppControlReceived(e);
-            LOG("OnAppControlReceived() is called!");
+            NUILog.Debug("OnAppControlReceived() is called!");
             if (e != null)
             {
-                LOG("OnAppControlReceived() is called! ApplicationId=" + e.ReceivedAppControl.ApplicationId);
-                LOG("CallerApplicationId=" + e.ReceivedAppControl.CallerApplicationId + "   IsReplyRequest=" + e.ReceivedAppControl.IsReplyRequest);
+                NUILog.Debug("OnAppControlReceived() is called! ApplicationId=" + e.ReceivedAppControl.ApplicationId);
+                NUILog.Debug("CallerApplicationId=" + e.ReceivedAppControl.CallerApplicationId + "   IsReplyRequest=" + e.ReceivedAppControl.IsReplyRequest);
             }
         }
 
@@ -175,7 +164,7 @@ namespace Tizen.NUI
         protected override void OnCreate()
         {
             base.OnCreate();
-            LOG("OnCreate() is called!");
+            NUILog.Debug("OnCreate() is called!");
         }
 
         /// <summary>
@@ -185,7 +174,7 @@ namespace Tizen.NUI
         {
             base.OnLocaleChanged(e);
             _applicationExt.LanguageChange();
-            LOG("OnLocaleChanged() is called!");
+            NUILog.Debug("OnLocaleChanged() is called!");
         }
 
         /// <summary>
@@ -194,7 +183,7 @@ namespace Tizen.NUI
         protected override void OnLowBattery(LowBatteryEventArgs e)
         {
             base.OnLowBattery(e);
-            LOG("OnLowBattery() is called!");
+            NUILog.Debug("OnLowBattery() is called!");
         }
 
         /// <summary>
@@ -203,7 +192,7 @@ namespace Tizen.NUI
         protected override void OnLowMemory(LowMemoryEventArgs e)
         {
             base.OnLowMemory(e);
-            LOG("OnLowMemory() is called!");
+            NUILog.Debug("OnLowMemory() is called!");
         }
 
         /// <summary>
@@ -212,7 +201,7 @@ namespace Tizen.NUI
         protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
         {
             base.OnRegionFormatChanged(e);
-            LOG("OnRegionFormatChanged() is called!");
+            NUILog.Debug("OnRegionFormatChanged() is called!");
         }
 
         /// <summary>
@@ -222,7 +211,7 @@ namespace Tizen.NUI
         {
             base.OnTerminate();
             _applicationExt.Terminate();
-            LOG("OnTerminate() is called!");
+            NUILog.Debug("OnTerminate() is called!");
         }
 
         /// <summary>

diff --git a/Tizen.NUI/src/public/Property.cs b/Tizen.NUI/src/public/Property.cs
index 7c87c3c..32ab22c 100755 (executable)
--- a/Tizen.NUI/src/public/Property.cs
+++ b/Tizen.NUI/src/public/Property.cs
@@ -1146,9 +1146,7 @@ namespace Tizen.NUI
             {
                 throw new global::System.InvalidOperationException("Unimplemented type for Property Value :" + type.Name);
             }
-#if DEBUG_ON
-            Tizen.Log.Debug("NUI", " got an property value of =" + type.Name);
-#endif
+            NUILog.Debug(" got an property value of =" + type.Name);
             return value;
         }
 

diff --git a/Tizen.NUI/src/public/UIComponents/Button.cs b/Tizen.NUI/src/public/UIComponents/Button.cs
index 313d2f9..a67858d 100755 (executable)
--- a/Tizen.NUI/src/public/UIComponents/Button.cs
+++ b/Tizen.NUI/src/public/UIComponents/Button.cs
@@ -403,9 +403,7 @@ namespace Tizen.NUI.UIComponents
                 string temp;
                 if (GetProperty(Button.Property.LABEL_RELATIVE_ALIGNMENT).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "LabelRelativeAlignment get error!");
-#endif
+                    NUILog.Error("LabelRelativeAlignment get error!");
                 }
                 switch (temp)
                 {

diff --git a/Tizen.NUI/src/public/UIComponents/Popup.cs b/Tizen.NUI/src/public/UIComponents/Popup.cs
index 4d7a0e2..5b9b619 100755 (executable)
--- a/Tizen.NUI/src/public/UIComponents/Popup.cs
+++ b/Tizen.NUI/src/public/UIComponents/Popup.cs
@@ -570,9 +570,7 @@ namespace Tizen.NUI.UIComponents
                 string temp;
                 if (GetProperty(Popup.Property.DISPLAY_STATE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "DisplayState get error!");
-#endif
+                    NUILog.Error("DisplayState get error!");
                 }
                 switch (temp)
                 {
@@ -680,9 +678,7 @@ namespace Tizen.NUI.UIComponents
                 string temp;
                 if (GetProperty(Popup.Property.CONTEXTUAL_MODE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "ContextualMode get error!");
-#endif
+                    NUILog.Error("ContextualMode get error!");
                 }
                 switch (temp)
                 {
@@ -765,9 +761,7 @@ namespace Tizen.NUI.UIComponents
                 string temp;
                 if (GetProperty(Popup.Property.ANIMATION_MODE).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "AnimationMode get error!");
-#endif
+                    NUILog.Error("AnimationMode get error!");
                 }
                 switch (temp)
                 {

diff --git a/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
index bb6e19c..ba9b603 100755 (executable)
--- a/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
+++ b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
@@ -370,9 +370,7 @@ namespace Tizen.NUI.UIComponents
                 string temp;
                 if (GetProperty(ScrollBar.Property.SCROLL_DIRECTION).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "ScrollDirection get error!");
-#endif
+                    NUILog.Error("ScrollDirection get error!");
                 }
 
                 switch (temp)
@@ -420,9 +418,7 @@ namespace Tizen.NUI.UIComponents
                 string temp;
                 if (GetProperty(ScrollBar.Property.INDICATOR_HEIGHT_POLICY).Get(out temp) == false)
                 {
-#if DEBUG_ON
-                    Tizen.Log.Error("NUI", "IndicatorHeightPolicy get error!");
-#endif
+                    NUILog.Error("IndicatorHeightPolicy get error!");
                 }
 
                 switch (temp)

diff --git a/Tizen.NUI/src/public/VisualMaps.cs b/Tizen.NUI/src/public/VisualMaps.cs
index 978611b..eac2ecb 100755 (executable)
--- a/Tizen.NUI/src/public/VisualMaps.cs
+++ b/Tizen.NUI/src/public/VisualMaps.cs
@@ -464,16 +464,12 @@ namespace Tizen.NUI
         {
             if (VisualIndex > 0)
             {
-#if DEBUG_ON
-                Tizen.Log.Debug("NUI", "UpdateVisual()! VisualIndex=" + VisualIndex);
-#endif
+                NUILog.Debug("UpdateVisual()! VisualIndex=" + VisualIndex);
                 Parent.UpdateVisual(VisualIndex, Name, this);
             }
             else
             {
-#if DEBUG_ON
-                Tizen.Log.Debug("NUI", "VisualIndex was not set");
-#endif
+                NUILog.Debug("VisualIndex was not set");
             }
         }