Revert "[Tizen] keep important ..."

- Revert "[Tizen] keep important deprecated APIs for future 5 version releases"

This reverts commit f63d2ad1c1df61df40e14e7e30ee010812f44bdd.

Change-Id: I35c8d966f9c556a04ddd5ead8afd6660c432ac98

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 0fe8b84fdec97a70ab437d0e57754c6e6e664591..788010bdff2bb36c9a4d70b8b66c22f68725047c 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Version>0.2.42</Version>
@@ -17,8 +17,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard1.6</TargetFramework>
     <DefineConstants>$(DefineConstants);DEBUG_ON;DOT_NET_CORE</DefineConstants>
-    <SignAssembly>False</SignAssembly>
-    <AssemblyOriginatorKeyFile>TizenTVNUI.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Tizen.NUI/TizenTVNUI.snk b/src/Tizen.NUI/TizenTVNUI.snk
deleted file mode 100755 (executable)
index 957e8d4..0000000
Binary files a/src/Tizen.NUI/TizenTVNUI.snk and /dev/null differ

diff --git a/src/Tizen.NUI/src/internal/FriendAssembly.cs b/src/Tizen.NUI/src/internal/FriendAssembly.cs
old mode 100755 (executable)
new mode 100644 (file)
index 6ba2744..98b0db6
--- a/src/Tizen.NUI/src/internal/FriendAssembly.cs
+++ b/src/Tizen.NUI/src/internal/FriendAssembly.cs
@@ -22,7 +22,8 @@
 using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Tizen.NUI.Extension.Test, PublicKey=00240000048000009400000006020000002400005253413100040000010001004d7c7c03a196ecb8e7cc5056750e1f40ee2bbe99f0e53a07f2538f2b0f450bd731b9dca3706503a0378baca74a09cf3af6261b330c031f44817ab6ed64189460765a402279d3e0c1fa7295ae1dccb2e3ff329705fd85b58d66ae7cb7e95ba06e0d847c3e3ba918798f579e5caeb1c6149955e6baf24236eec46227a623e494b1")]
 [assembly: InternalsVisibleTo("Tizen.Multimedia, PublicKey=0024000004800000940000000602000000240000525341310004000001000100bd36a93b6d224759632d08a501b9dcb99a533e8ff0c3a1fc7044f5b05e176c005e5a7fc4d1dfa54da4d4cad4868c4518aa1f661380fb90685dc699d5e48dcc697b33c1e38b70845f405612d6827e7337c191ddd0a0aa35fdad654efe4c54881fdaa82ce35dce18ea918953e448c7aa284a47ed6fe3aa9404930b2b973a28cddf")]
-[assembly: InternalsVisibleTo("Tizen.TV.NUI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]
+//[assembly: InternalsVisibleTo("Tizen.TV.NUI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]
+//[assembly: InternalsVisibleTo("Tizen.TV.NUI.Component, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]
 
 namespace Tizen.NUI
 {

diff --git a/src/Tizen.NUI/src/internal/Size.cs b/src/Tizen.NUI/src/internal/Size.cs
index 975badfa22ccf05bfe8c8946d5fe4183c688b3a4..83cd23b34e3105878a72cd3f0dd7d19b7f2d2f1b 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Size.cs
+++ b/src/Tizen.NUI/src/internal/Size.cs
@@ -21,9 +21,6 @@ namespace Tizen.NUI
     /*********************************************************************************/\r
     /*** will be removed/deprecated                                                  ***/\r
     /*********************************************************************************/\r
-    /// <summary>\r
-    /// will be changed as internal class in nui_0.2.50\r
-    /// </summary>\r
     public class Size : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 615ce4dce74b1ea6ce55d0530002edeb44e2da1e..3875e18a016d6a2ea45478cd8577f953fdbced8c 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -43,12 +43,12 @@ namespace Tizen.NUI.BaseComponents
         //you can override it to clean-up your own resources.
         protected override void Dispose(DisposeTypes type)
         {
-            if (disposed)
+            if(disposed)
             {
                 return;
             }
 
-            if (type == DisposeTypes.Explicit)
+            if(type == DisposeTypes.Explicit)
             {
                 //Called by User
                 //Release your own managed resources here.
@@ -227,9 +227,9 @@ namespace Tizen.NUI.BaseComponents
                 Delegate[] delegateList = _keyEventHandler.GetInvocationList();
 
                 // Oring the result of each callback.
-                foreach (EventHandlerWithReturnType<object, KeyEventArgs, bool> del in delegateList)
+                foreach ( EventHandlerWithReturnType<object, KeyEventArgs, bool> del in delegateList )
                 {
-                    result |= del(this, e);
+                    result |= del( this, e );
                 }
             }
 
@@ -1069,22 +1069,22 @@ namespace Tizen.NUI.BaseComponents
                 }
                 switch (temp)
                 {
-                    case 0:\r
-                        {\r
-                            return States.Normal;\r
-                        }
-                    case 1:\r
-                        {\r
-                            return States.Focused;\r
-                        }
-                    case 2:\r
-                        {\r
-                            return States.Disabled;\r
-                        }
-                    default:\r
-                        {\r
-                            return States.Normal;\r
-                        }
+                    case 0:
+                    {
+                        return States.Normal;
+                    }
+                    case 1:
+                    {
+                        return States.Focused;
+                    }
+                    case 2:
+                    {
+                        return States.Disabled;
+                    }
+                    default:
+                    {
+                        return States.Normal;
+                    }
                 }
             }
             set
@@ -1124,26 +1124,26 @@ namespace Tizen.NUI.BaseComponents
                 string valueToString = "";
                 switch (value)
                 {
-                    case States.Normal:\r
-                        {\r
-                            valueToString = "NORMAL";\r
-                            break;\r
-                        }
-                    case States.Focused:\r
-                        {\r
-                            valueToString = "FOCUSED";\r
-                            break;\r
-                        }
-                    case States.Disabled:\r
-                        {\r
-                            valueToString = "DISABLED";\r
-                            break;\r
-                        }
-                    default:\r
-                        {\r
-                            valueToString = "NORMAL";\r
-                            break;\r
-                        }
+                    case States.Normal:
+                    {
+                        valueToString = "NORMAL";
+                        break;
+                    }
+                    case States.Focused:
+                    {
+                        valueToString = "FOCUSED";
+                        break;
+                    }
+                    case States.Disabled:
+                    {
+                        valueToString = "DISABLED";
+                        break;
+                    }
+                    default:
+                    {
+                        valueToString = "NORMAL";
+                        break;
+                    }
                 }
                 SetProperty(View.Property.SUB_STATE, new Tizen.NUI.PropertyValue(valueToString));
             }
@@ -1371,26 +1371,26 @@ namespace Tizen.NUI.BaseComponents
                 string valueToString = "";
                 switch (value)
                 {
-                    case Tizen.NUI.HorizontalAlignmentType.Left:\r
-                        {\r
-                            valueToString = "left";\r
-                            break;\r
-                        }
-                    case Tizen.NUI.HorizontalAlignmentType.Center:\r
-                        {\r
-                            valueToString = "center";\r
-                            break;\r
-                        }
-                    case Tizen.NUI.HorizontalAlignmentType.Right:\r
-                        {\r
-                            valueToString = "right";\r
-                            break;\r
-                        }
-                    default:\r
-                        {\r
-                            valueToString = "left";\r
-                            break;\r
-                        }
+                    case Tizen.NUI.HorizontalAlignmentType.Left:
+                    {
+                        valueToString = "left";
+                        break;
+                    }
+                    case Tizen.NUI.HorizontalAlignmentType.Center:
+                    {
+                        valueToString = "center";
+                        break;
+                    }
+                    case Tizen.NUI.HorizontalAlignmentType.Right:
+                    {
+                        valueToString = "right";
+                        break;
+                    }
+                    default:
+                    {
+                        valueToString = "left";
+                        break;
+                    }
                 }
                 SetProperty(TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT, new Tizen.NUI.PropertyValue(valueToString));
             }
@@ -1428,26 +1428,26 @@ namespace Tizen.NUI.BaseComponents
                 string valueToString = "";
                 switch (value)
                 {
-                    case Tizen.NUI.VerticalAlignmentType.Top:\r
-                        {\r
-                            valueToString = "top";\r
-                            break;\r
-                        }
-                    case Tizen.NUI.VerticalAlignmentType.Center:\r
-                        {\r
-                            valueToString = "center";\r
-                            break;\r
-                        }
-                    case Tizen.NUI.VerticalAlignmentType.Bottom:\r
-                        {\r
-                            valueToString = "bottom";\r
-                            break;\r
-                        }
-                    default:\r
-                        {\r
-                            valueToString = "top";\r
-                            break;\r
-                        }
+                    case Tizen.NUI.VerticalAlignmentType.Top:
+                    {
+                        valueToString = "top";
+                        break;
+                    }
+                    case Tizen.NUI.VerticalAlignmentType.Center:
+                    {
+                        valueToString = "center";
+                        break;
+                    }
+                    case Tizen.NUI.VerticalAlignmentType.Bottom:
+                    {
+                        valueToString = "bottom";
+                        break;
+                    }
+                    default:
+                    {
+                        valueToString = "top";
+                        break;
+                    }
                 }
                 SetProperty(TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT, new Tizen.NUI.PropertyValue(valueToString));
             }
@@ -2658,8 +2658,7 @@ namespace Tizen.NUI.BaseComponents
             return ret;
         }
 
-        internal ViewVisibilityChangedSignal VisibilityChangedSignal(View view)\r
-        {
+        internal ViewVisibilityChangedSignal VisibilityChangedSignal(View view) {
             ViewVisibilityChangedSignal ret = new ViewVisibilityChangedSignal(NDalicPINVOKE.VisibilityChangedSignal(View.getCPtr(view)), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -3225,14 +3224,14 @@ namespace Tizen.NUI.BaseComponents
                 }
                 switch (temp)
                 {
-                    case "NORMAL":\r
-                        return DrawModeType.Normal;
-                    case "OVERLAY_2D":\r
-                        return DrawModeType.Overlay2D;
-                    case "STENCIL":\r
-                        return DrawModeType.Stencil;
-                    default:\r
-                        return DrawModeType.Normal;
+                    case "NORMAL":
+                    return DrawModeType.Normal;
+                    case "OVERLAY_2D":
+                    return DrawModeType.Overlay2D;
+                    case "STENCIL":
+                    return DrawModeType.Stencil;
+                    default:
+                    return DrawModeType.Normal;
                 }
             }
             set
@@ -3521,12 +3520,12 @@ namespace Tizen.NUI.BaseComponents
                 }
                 switch (temp)
                 {
-                    case "DISABLED":\r
-                        return ClippingModeType.Disabled;
-                    case "CLIP_CHILDREN":\r
-                        return ClippingModeType.ClipChildren;
-                    default:\r
-                        return ClippingModeType.Disabled;
+                    case "DISABLED":
+                    return ClippingModeType.Disabled;
+                    case "CLIP_CHILDREN":
+                    return ClippingModeType.ClipChildren;
+                    default:
+                    return ClippingModeType.Disabled;
                 }
             }
             set
@@ -3542,9 +3541,6 @@ namespace Tizen.NUI.BaseComponents
         /*********************************************************************************/\r
         /*** will be removed/deprecated                                                  ***/\r
         /*********************************************************************************/\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
         public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touched
         {
             add
@@ -3569,9 +3565,6 @@ namespace Tizen.NUI.BaseComponents
 
             }
         }\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
         public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hovered
         {
             add
@@ -3595,10 +3588,7 @@ namespace Tizen.NUI.BaseComponents
                 }
 
             }
-        }\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
+        }
         public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelMoved
         {
             add
@@ -3622,10 +3612,7 @@ namespace Tizen.NUI.BaseComponents
                 }
 
             }
-        }\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
+        }
         public Position AnchorPoint
         {
             get
@@ -3639,9 +3626,7 @@ namespace Tizen.NUI.BaseComponents
                 SetProperty(View.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value));
             }
         }\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
+\r
         public Size Size
         {
             get
@@ -3655,6 +3640,8 @@ namespace Tizen.NUI.BaseComponents
                 SetProperty(View.Property.SIZE, new Tizen.NUI.PropertyValue(value));
             }
         }
+
+
         /*********************************************************************************/\r
         /*** will be removed/deprecated                                                  ***/\r
         /*********************************************************************************/\r

diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs
index 52ad9d746a53cad148fd8293910fed4b73a96f76..4c48ab64d95568a3b274f4a2eb1082ecae268f4d 100755 (executable)
--- a/src/Tizen.NUI/src/public/Layer.cs
+++ b/src/Tizen.NUI/src/public/Layer.cs
@@ -37,12 +37,12 @@ namespace Tizen.NUI
 
         protected override void Dispose(DisposeTypes type)
         {
-            if (disposed)
+            if(disposed)
             {
                 return;
             }
 
-            if (type == DisposeTypes.Explicit)
+            if(type == DisposeTypes.Explicit)
             {
                 //Called by User
                 //Release your own managed resources here.
@@ -367,36 +367,6 @@ namespace Tizen.NUI
                     throw NDalicPINVOKE.SWIGPendingException.Retrieve();
                 return ret;
             }
-        }\r
-\r
-        /// <summary>\r
-        /// Gets/Sets the Layer's name.\r
-        /// </summary>\r
-        public string Name\r
-        {\r
-            get\r
-            {\r
-                return GetName();\r
-            }\r
-            set\r
-            {\r
-                SetName(value);\r
-            }\r
-        }\r
-\r
-        internal string GetName()\r
-        {\r
-            string ret = NDalicPINVOKE.Actor_GetName(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending)\r
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetName(string name)\r
-        {\r
-            NDalicPINVOKE.Actor_SetName(swigCPtr, name);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending)\r
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
+        }
     }
 }

diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index 43cb209dbeff6c352ad912ad2354f17155751b3e..f9490efd4a33e57739cbc86140ba7122ddf88fe8 100755 (executable)
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -59,12 +59,12 @@ namespace Tizen.NUI
         /// </summary>
         protected override void Dispose(DisposeTypes type)
         {
-            if (disposed)
+            if(disposed)
             {
                 return;
             }
 
-            if (type == DisposeTypes.Explicit)
+            if(type == DisposeTypes.Explicit)
             {
                 //Called by User
                 //Release your own managed resources here.
@@ -94,14 +94,14 @@ namespace Tizen.NUI
             Window ret = new Window(NDalicPINVOKE.Stage_GetCurrent(), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
-        }\r
-\r
-        internal static bool IsInstalled()\r
-        {
+        }
+
+       internal static bool IsInstalled()
+       {
             bool ret = NDalicPINVOKE.Stage_IsInstalled();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;\r
-        }
+            return ret;
+       }
 
         /*********************************************************************************/\r
         /*** will be removed/deprecated                                                  ***/\r
@@ -154,8 +154,7 @@ namespace Tizen.NUI
         /// Gets the count of supported auxiliary hints of the window.
         /// </summary>
         /// <returns>The number of supported auxiliary hints.</returns>
-        public uint GetSupportedAuxiliaryHintCount()\r
-        {
+        public uint GetSupportedAuxiliaryHintCount() {
             uint ret = NDalicPINVOKE.GetSupportedAuxiliaryHintCount(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -166,8 +165,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="index">The index of the supported auxiliary hint lists.</param>
         /// <returns>The auxiliary hint string of the index.</returns>
-        public string GetSupportedAuxiliaryHint(uint index)\r
-        {
+        public string GetSupportedAuxiliaryHint(uint index) {
             string ret = NDalicPINVOKE.GetSupportedAuxiliaryHint(swigCPtr, index);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -179,8 +177,7 @@ namespace Tizen.NUI
         /// <param name="hint">The auxiliary hint string.</param>
         /// <param name="value">The value string.</param>
         /// <returns>The ID of created auxiliary hint, or 0 on failure.</returns>
-        public uint AddAuxiliaryHint(string hint, string value)\r
-        {
+        public uint AddAuxiliaryHint(string hint, string value) {
             uint ret = NDalicPINVOKE.AddAuxiliaryHint(swigCPtr, hint, value);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -191,8 +188,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="id">The ID of the auxiliary hint.</param>
         /// <returns>True if no error occurred, false otherwise.</returns>
-        public bool RemoveAuxiliaryHint(uint id)\r
-        {
+        public bool RemoveAuxiliaryHint(uint id) {
             bool ret = NDalicPINVOKE.RemoveAuxiliaryHint(swigCPtr, id);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -204,8 +200,7 @@ namespace Tizen.NUI
         /// <param name="id">The auxiliary hint ID.</param>
         /// <param name="value">The value string to be set.</param>
         /// <returns>True if no error occurred, false otherwise.</returns>
-        public bool SetAuxiliaryHintValue(uint id, string value)\r
-        {
+        public bool SetAuxiliaryHintValue(uint id, string value) {
             bool ret = NDalicPINVOKE.SetAuxiliaryHintValue(swigCPtr, id, value);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -216,8 +211,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="id">The auxiliary hint ID.</param>
         /// <returns>The string value of the auxiliary hint ID, or an empty string if none exists.</returns>
-        public string GetAuxiliaryHintValue(uint id)\r
-        {
+        public string GetAuxiliaryHintValue(uint id) {
             string ret = NDalicPINVOKE.GetAuxiliaryHintValue(swigCPtr, id);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -228,8 +222,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="hint">The auxiliary hint string.</param>
         /// <returns>The ID of auxiliary hint string, or 0 on failure.</returns>
-        public uint GetAuxiliaryHintId(string hint)\r
-        {
+        public uint GetAuxiliaryHintId(string hint) {
             uint ret = NDalicPINVOKE.GetAuxiliaryHintId(swigCPtr, hint);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -239,8 +232,7 @@ namespace Tizen.NUI
         /// Sets a region to accept input events.
         /// </summary>
         /// <param name="inputRegion">The region to accept input events.</param>
-        public void SetInputRegion(Rectangle inputRegion)\r
-        {
+        public void SetInputRegion(Rectangle inputRegion) {
             NDalicPINVOKE.SetInputRegion(swigCPtr, Rectangle.getCPtr(inputRegion));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -268,8 +260,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="level">The notification window level.</param>
         /// <returns>True if no error occurred, false otherwise.</returns>
-        public bool SetNotificationLevel(NotificationLevel level)\r
-        {
+        public bool SetNotificationLevel(NotificationLevel level) {
             bool ret = NDalicPINVOKE.SetNotificationLevel(swigCPtr, (int)level);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -279,8 +270,7 @@ namespace Tizen.NUI
         /// Gets a priority level for the specified notification window.
         /// </summary>
         /// <returns>The notification window level.</returns>
-        public NotificationLevel GetNotificationLevel()\r
-        {
+        public NotificationLevel GetNotificationLevel() {
             NotificationLevel ret = (NotificationLevel)NDalicPINVOKE.GetNotificationLevel(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -290,8 +280,7 @@ namespace Tizen.NUI
         /// Sets a transparent window's visual state to opaque.
         /// </summary>
         /// <param name="opaque">Whether the window's visual state is opaque.</param>
-        public void SetOpaqueState(bool opaque)\r
-        {
+        public void SetOpaqueState(bool opaque) {
             NDalicPINVOKE.SetOpaqueState(swigCPtr, opaque);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -300,8 +289,7 @@ namespace Tizen.NUI
         /// Returns whether a transparent window's visual state is opaque or not.
         /// </summary>
         /// <returns>True if the window's visual state is opaque, false otherwise.</returns>
-        public bool IsOpaqueState()\r
-        {
+        public bool IsOpaqueState() {
             bool ret = NDalicPINVOKE.IsOpaqueState(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -312,8 +300,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="screenMode">The screen mode.</param>
         /// <returns>True if no error occurred, false otherwise.</returns>
-        public bool SetScreenMode(ScreenMode screenMode)\r
-        {
+        public bool SetScreenMode(ScreenMode screenMode) {
             bool ret = NDalicPINVOKE.SetScreenMode(swigCPtr, (int)screenMode);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -323,8 +310,7 @@ namespace Tizen.NUI
         /// Gets a screen mode of the window.
         /// </summary>
         /// <returns>The screen mode.</returns>
-        public ScreenMode GetScreenMode()\r
-        {
+        public ScreenMode GetScreenMode() {
             ScreenMode ret = (ScreenMode)NDalicPINVOKE.GetScreenMode(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -335,8 +321,7 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="brightness">The preferred brightness (0 to 100).</param>
         /// <returns>True if no error occurred, false otherwise.</returns>
-        public bool SetBrightness(int brightness)\r
-        {
+        public bool SetBrightness(int brightness) {
             bool ret = NDalicPINVOKE.SetBrightness(swigCPtr, brightness);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -346,8 +331,7 @@ namespace Tizen.NUI
         /// Gets preffered brightness of the window.
         /// </summary>
         /// <returns>The preffered brightness.</returns>
-        public int GetBrightness()\r
-        {
+        public int GetBrightness() {
             int ret = NDalicPINVOKE.GetBrightness(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -1237,99 +1221,6 @@ namespace Tizen.NUI
             {
                 return GetLayerCount();
             }
-        }\r
-\r
-\r
-        /*********************************************************************************/\r
-        /*** will be removed/deprecated                                                  ***/\r
-        /*********************************************************************************/\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
-        public event EventHandler<TouchEventArgs> TouchEvent
-        {
-            add
-            {
-                lock (this)
-                {
-                    _stageTouchHandler += value;
-                    _stageTouchCallbackDelegate = OnStageTouch;
-                    this.TouchSignal().Connect(_stageTouchCallbackDelegate);
-                }
-            }
-            remove
-            {
-                lock (this)
-                {
-                    if (_stageTouchHandler != null)
-                    {
-                        this.TouchSignal().Disconnect(_stageTouchCallbackDelegate);
-                    }
-                    _stageTouchHandler -= value;
-                }
-            }
-        }\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
-        public event EventHandler<WheelEventArgs> WheelEvent
-        {
-            add
-            {
-                if (_stageWheelHandler == null)
-                {
-                    _stageWheelCallbackDelegate = OnStageWheel;
-                    WheelEventSignal().Connect(_stageWheelCallbackDelegate);
-                }
-                _stageWheelHandler += value;
-            }
-            remove
-            {
-                _stageWheelHandler -= value;
-                if (_stageWheelHandler == null && WheelEventSignal().Empty() == false)
-                {
-                    WheelEventSignal().Disconnect(_stageWheelCallbackDelegate);
-                }
-            }
-        }\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>
-        public event EventHandler<KeyEventArgs> KeyEvent
-        {
-            add
-            {
-                if (_stageKeyHandler == null)
-                {
-                    _stageKeyCallbackDelegate = OnStageKey;
-                    KeyEventSignal().Connect(_stageKeyCallbackDelegate);
-                }
-                _stageKeyHandler += value;
-            }
-            remove
-            {
-                _stageKeyHandler -= value;
-                if (_stageKeyHandler == null && KeyEventSignal().Empty() == false)
-                {
-                    KeyEventSignal().Disconnect(_stageKeyCallbackDelegate);
-                }
-            }
-        }\r
-\r
-        /// <summary>\r
-        /// will be deprecated at nui_0.2.50\r
-        /// </summary>\r
-        /// <param name="layer"></param>\r
-        public void AddLayer(Layer layer)\r
-        {\r
-            NDalicPINVOKE.Stage_Add(stageCPtr, Layer.getCPtr(layer));\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        /*********************************************************************************/\r
-        /*** will be removed/deprecated                                                  ***/\r
-        /*********************************************************************************/\r
-\r
-\r
+        }
     }
 }