fix unnecessary logs

Change-Id: Idfbb9edf7de270424e6c0f45d23006dc91b9a510

diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp
index f7168a1..7eb6ff5 100644 (file)
--- a/src/ui/FUi_ControlImpl.cpp
+++ b/src/ui/FUi_ControlImpl.cpp
@@ -3355,9 +3355,11 @@ _ControlImpl::SendNotification(const _ControlImpl& source, Tizen::Base::Collecti
 result
 _ControlImpl::Draw(bool recursive)
 {
-       SysTryReturn(NID_UI,
-                               IsAttachedToMainTree(), E_INVALID_OPERATION,
-                               E_INVALID_OPERATION, "[E_INVALID_OPERATION] The control should be attached to the main tree.");
+       if (IsAttachedToMainTree() == false)
+       {
+               SetLastResult(E_INVALID_OPERATION);
+               return E_INVALID_OPERATION;
+       }
 
        GetCore().Draw(recursive);
 

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 56ac1f1..d5fbfbe 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -599,7 +599,11 @@ public:
                {
                        r = GetPosition(status, x, y, current);
                        SysTryReturnVoidResult(NID_UI, r != E_OBJ_NOT_FOUND, E_OBJ_NOT_FOUND, "[E_OBJ_NOT_FOUND] A system error occurred.");
-                       SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
+                       if (r != E_SUCCESS)
+                       {
+                               SetLastResult(E_SYSTEM);
+                               return;
+                       }
                }
                else
                {
@@ -616,12 +620,17 @@ public:
                        {
                                pTouchManager->ResetTouchInfo();
                                SysSecureLog(NID_UI, "ResetTouchInfo x(%d), y(%d), deviceID(%d), pointID(%d)", current.x, current.y, deviceId, pointId);
-                               SysTryReturnVoidResult(NID_UI, false, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
+                               SetLastResult(E_SYSTEM);
+                               return;
                        }
                        else
                        {
                                r = __pTouchEventManager->AddControl(pointId, pControl->GetHandle());
-                               SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
+                               if (r != E_SUCCESS)
+                               {
+                                       SetLastResult(E_SYSTEM);
+                                       return;
+                               }
                        }
                }
                else
@@ -636,8 +645,12 @@ public:
                                if (pControl->GetChangingEventTarget() == true && pControl->GetVisibleState() == true)
                                {
                                        r = __pTouchEventManager->AddControl(pointId, pControl->GetHandle());
-                                       SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
                                        SysSecureLog(NID_UI, "touch_moved, touch_released : pointId = %d, AddControl = 0x%x", pointId, pControl);
+                                       if (r != E_SUCCESS)
+                                       {
+                                               SetLastResult(E_SYSTEM);
+                                               return;
+                                       }
                                }
                        }
                }
@@ -700,7 +713,11 @@ private:
                {
                        _Window* pWindow = null;
                        pWindow = pControlManager->GetTouchedWindow();
-                       SysTryReturn(NID_UI, pWindow, null, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
+                       if (pWindow == null)
+                       {
+                               SetLastResult(E_SYSTEM);
+                               return null;
+                       }
 
                        Rectangle winBounds = pWindow->GetBounds();
 
@@ -710,13 +727,25 @@ private:
                        pRootControlElement = dynamic_cast <_ControlVisualElement*>(pWindow->GetVisualElement());
                }
 
-               SysTryReturn(NID_UI, pRootControlElement, null, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
+               if (pRootControlElement == null)
+               {
+                       SetLastResult(E_SYSTEM);
+                       return null;
+               }
 
                _ControlVisualElement* pControlVisualElement = pRootControlElement->GetControlChildAtPoint(ptf);
-               SysTryReturn(NID_UI, pControlVisualElement, null, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
+               if (pControlVisualElement == null)
+               {
+                       SetLastResult(E_SYSTEM);
+                       return null;
+               }
 
                pControl = static_cast <_Control*>(pControlVisualElement->GetUserData());
-               SysTryReturn(NID_UI, pControl, null, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
+               if (pControl == null)
+               {
+                       SetLastResult(E_SYSTEM);
+                       return null;
+               }
 
                if (pCapturedControl)
                {