modify license, permission and remove ^M char

[platform/framework/native/uifw.git] / src / ui / FUi_ContainerImpl.cpp

diff --git a/src/ui/FUi_ContainerImpl.cpp b/src/ui/FUi_ContainerImpl.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 6871ed1..8b418d9
--- a/src/ui/FUi_ContainerImpl.cpp
+++ b/src/ui/FUi_ContainerImpl.cpp
@@ -2,14 +2,14 @@
 // Open Service Platform
 // Copyright (c) 2012-2013 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// 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://floralicense.org/license/
+//     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,
+// 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.
@@ -229,7 +229,7 @@ _ContainerImpl::RemoveControl(_ControlImpl* pChild, bool deallocate)
        }
        else
        {
-               SysTryReturn(NID_UI, pChild, E_OBJ_NOT_FOUND, E_OBJ_NOT_FOUND, "[E_OBJ_NOT_FOUND] The control is not a child of this container.");
+               SysTryReturn(NID_UI, pChild, E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The specified child is not constructed.");
                r = RemoveChild(pChild, deallocate);
                SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
        }
@@ -252,7 +252,7 @@ _ContainerImpl::RemoveChild(_ControlImpl* pChild, bool deallocate)
                return E_SUCCESS;
        }
 
-       GetChildIndex(pChild); 
+       GetChildIndex(pChild);
        r = GetLastResult();
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -274,7 +274,7 @@ _ContainerImpl::RemoveControl(int index)
        _ControlImpl* pChild = GetChild(index); // Find child control.
        r = GetLastResult();
        SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-       
+
        _ContainerImpl* pChildContainer = dynamic_cast <_ContainerImpl*>(pChild);
        if (pChildContainer)
        {