fix unnecessary log

Change-Id: I10466018b447cff306efa97cf7a4dde5ae7364f1

diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp
index 2ef302f..27659d9 100644 (file)
--- a/src/ui/FUi_Control.cpp
+++ b/src/ui/FUi_Control.cpp
@@ -4457,6 +4457,12 @@ _Control::GetStartedGestureDetectorEnumeratorN(void) const
        return __pDetectStartedGestureMap->GetMapEnumeratorN();
 }
 
+IListT <_TouchGestureDetector*>*
+_Control::GetStartedGestureDetectorListN(void) const
+{
+       return __pDetectStartedGestureMap->GetKeysN();
+}
+
 result
 _Control::AddStartedGestureDetector(const _TouchGestureDetector& gestureDetector, _TouchGestureDetectorState state)
 {

diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp
index a67375e..2080e63 100644 (file)
--- a/src/ui/FUi_ControlImpl.cpp
+++ b/src/ui/FUi_ControlImpl.cpp
@@ -1658,7 +1658,7 @@ public:
 
        virtual bool OnMousePressed(const _Control& source, const _MouseInfo& mouseInfo)
        {
-               SysLog(NID_UI, "Minkyu OnMousePressed, source = 0x%x", &source);
+               SysLog(NID_UI, "OnMousePressed, source = 0x%x", &source);
                bool isFiltered = false;
 
                // 3. Impl
@@ -1676,7 +1676,7 @@ public:
 
        virtual bool OnMouseReleased(const _Control& source, const _MouseInfo& mouseInfo)
        {
-               SysLog(NID_UI, "Minkyu OnMouseReleased, source = 0x%x", &source);
+               SysLog(NID_UI, "OnMouseReleased, source = 0x%x", &source);
                bool isFiltered = false;
 
                // 3. Impl

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index 45f2001..b6e4359 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -534,7 +534,7 @@ public:
                        delete pFingerInfoList;
 
                        pointId = pTouchManager->GeneratePointId(deviceId);
-                       SysSecureLog(NID_UI, "OnTouchPressed GeneratePointId = pointId %d", pointId);
+                       SysSecureLog(NID_UI, "OnTouchPressed pointId = %d", pointId);
                }
                else
                {
@@ -543,7 +543,7 @@ public:
 
                if (status == _TOUCH_RELEASED)
                {
-                       SysSecureLog(NID_UI, "OnTouchReleased GetPointId = pointId %d", pointId);
+                       SysSecureLog(NID_UI, "OnTouchReleased pointId = %d", pointId);
                }
 
                if (pointId == INVALID_POINT_ID)
@@ -595,7 +595,6 @@ public:
                        {
                                r = __pTouchEventManager->AddControl(pointId, pControl->GetHandle());
                                SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
-                               SysSecureLog(NID_UI, "touch_pressed : pointId = %d, AddControl = 0x%x", pointId, pControl);
                        }
                }
                else

diff --git a/src/ui/FUi_TouchGestureDetector.cpp b/src/ui/FUi_TouchGestureDetector.cpp
index 2d26724..07a6739 100644 (file)
--- a/src/ui/FUi_TouchGestureDetector.cpp
+++ b/src/ui/FUi_TouchGestureDetector.cpp
@@ -340,25 +340,29 @@ _TouchGestureDetector::SetDetectorState(_TouchGestureDetectorState state)
                _Control* pControl = GetControl();
                if (pControl)
                {
-                       IMapEnumeratorT <_TouchGestureDetector*, _TouchGestureDetectorState>*  pMapEnumerator = pControl->GetStartedGestureDetectorEnumeratorN();
-                       if (pMapEnumerator)
+                       IListT <_TouchGestureDetector*>* pList = pControl->GetStartedGestureDetectorListN();
+                       if (pList)
                        {
-                               while(pMapEnumerator->MoveNext() == E_SUCCESS)
+                               IEnumeratorT<_TouchGestureDetector*>* pEnumerator = pList->GetEnumeratorN();
+                               if (pEnumerator)
                                {
-                                       _TouchGestureDetector* pStartedGestureDetector = null;
-                                       pMapEnumerator->GetKey(pStartedGestureDetector);
-
-                                       if (pStartedGestureDetector && (pStartedGestureDetector == this))
+                                       while(pEnumerator->MoveNext() == E_SUCCESS)
                                        {
-                                               _TouchGestureDetectorEventType eventType = pStartedGestureDetector->GetGestureDetectorEventType();
-                                               if (eventType == _TOUCH_GESTURE_DETECTOR_EVENT_TYPE_DISCRETE ||
-                                                       (eventType == _TOUCH_GESTURE_DETECTOR_EVENT_TYPE_CONTINUOUS && state == _TOUCH_GESTURE_DETECTOR_STATE_FINISHED))
+                                               _TouchGestureDetector* pStartedGestureDetector = null;
+                                               pEnumerator->GetCurrent(pStartedGestureDetector);
+                                               if (pStartedGestureDetector && (pStartedGestureDetector == this))
                                                {
-                                                       pControl->SetStartedGestureDetector(*this, _TOUCH_GESTURE_DETECTOR_STATE_SUCCESS);
+                                                       _TouchGestureDetectorEventType eventType = pStartedGestureDetector->GetGestureDetectorEventType();
+                                                       if (eventType == _TOUCH_GESTURE_DETECTOR_EVENT_TYPE_DISCRETE ||
+                                                               (eventType == _TOUCH_GESTURE_DETECTOR_EVENT_TYPE_CONTINUOUS && state == _TOUCH_GESTURE_DETECTOR_STATE_FINISHED))
+                                                       {
+                                                               pControl->SetStartedGestureDetector(*this, _TOUCH_GESTURE_DETECTOR_STATE_SUCCESS);
+                                                       }
                                                }
                                        }
+                                       delete pEnumerator;
                                }
-                               delete pMapEnumerator;
+                               delete pList;
                        }
                }
 
@@ -371,20 +375,24 @@ _TouchGestureDetector::SetDetectorState(_TouchGestureDetectorState state)
                _Control* pControl = GetControl();
                if (pControl)
                {
-                       IMapEnumeratorT <_TouchGestureDetector*, _TouchGestureDetectorState>*  pMapEnumerator = pControl->GetStartedGestureDetectorEnumeratorN();
-                       if (pMapEnumerator)
+                       IListT <_TouchGestureDetector*>* pList = pControl->GetStartedGestureDetectorListN();
+                       if (pList)
                        {
-                               while(pMapEnumerator->MoveNext() == E_SUCCESS)
+                               IEnumeratorT<_TouchGestureDetector*>* pEnumerator = pList->GetEnumeratorN();
+                               if (pEnumerator)
                                {
-                                       _TouchGestureDetector* pStartedGestureDetector = null;
-                                       pMapEnumerator->GetKey(pStartedGestureDetector);
-
-                                       if (pStartedGestureDetector && (pStartedGestureDetector == this))
+                                       while(pEnumerator->MoveNext() == E_SUCCESS)
                                        {
-                                               pControl->SetStartedGestureDetector(*this, _TOUCH_GESTURE_DETECTOR_STATE_FAILED);
+                                               _TouchGestureDetector* pStartedGestureDetector = null;
+                                               pEnumerator->GetCurrent(pStartedGestureDetector);
+                                               if (pStartedGestureDetector && (pStartedGestureDetector == this))
+                                               {
+                                                       pControl->SetStartedGestureDetector(*this, _TOUCH_GESTURE_DETECTOR_STATE_FAILED);
+                                               }
                                        }
+                                       delete pEnumerator;
                                }
-                               delete pMapEnumerator;
+                               delete pList;
                        }
                }
 

diff --git a/src/ui/inc/FUi_Control.h b/src/ui/inc/FUi_Control.h
index e1e18b4..9d05c81 100644 (file)
--- a/src/ui/inc/FUi_Control.h
+++ b/src/ui/inc/FUi_Control.h
@@ -519,6 +519,7 @@ public:
        result ClearStartedGestureDetectorList(void);
        result SetStartedGestureDetector(const _TouchGestureDetector& gestureDetector, _TouchGestureDetectorState state);
        Tizen::Base::Collection::IMapEnumeratorT <_TouchGestureDetector*, _TouchGestureDetectorState>* GetStartedGestureDetectorEnumeratorN(void) const;
+       Tizen::Base::Collection::IListT <_TouchGestureDetector*>* GetStartedGestureDetectorListN(void) const;
 
        void SetMultiTouchEnabled(bool enabled);
        bool IsMultiTouchEnabled(void) const;