Removed unnecessary exception logs on _ListViewModel.

Modified OnChangeLayout() on ListView/GroupedListView.

Change-Id: Idfafe47ce279f12012abcefaee4372c8e9370bc2
Signed-off-by: Hyeonmi Kim <hm_85.kim@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
index 7e39ee4..05e7164 100644 (file)
--- a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
@@ -1895,9 +1895,9 @@ _GroupedListViewImpl::OnDraw(void)
 void
 _GroupedListViewImpl::OnChangeLayout(_ControlOrientation orientation)
 {
-       _ControlImpl::OnChangeLayout(orientation);
-
        __isOrientationChanged = true;
+
+       _ControlImpl::OnChangeLayout(orientation);
 }
 
 void

diff --git a/src/ui/controls/FUiCtrl_ListViewImpl.cpp b/src/ui/controls/FUiCtrl_ListViewImpl.cpp
index 7b3ca24..2f03051 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewImpl.cpp
@@ -1758,9 +1758,9 @@ _ListViewImpl::OnDraw(void)
 void
 _ListViewImpl::OnChangeLayout(_ControlOrientation orientation)
 {
-       _ControlImpl::OnChangeLayout(orientation);
-
        __isOrientationChanged = true;
+
+       _ControlImpl::OnChangeLayout(orientation);
 }
 
 void

diff --git a/src/ui/controls/FUiCtrl_ListViewModel.cpp b/src/ui/controls/FUiCtrl_ListViewModel.cpp
index 018462e..cc6c2b4 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListViewModel.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewModel.cpp
@@ -167,8 +167,10 @@ _ListViewModel::GetItemFromTemporaryBuffer(int groupIndex, int itemIndex)
 _IListItemCommon*
 _ListViewModel::GetItemFromContainer(int groupIndex, int itemIndex) const
 {
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), null, E_INVALID_ARG,
-                               "[E_INVALID_ARG] The group index is not valid.");
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return null;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, null, GetLastResult(),
@@ -210,8 +212,10 @@ _ListViewModel::LoadItem(int groupIndex, int itemIndex)
        }
 
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), null, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index.(%d)", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return null;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, null, GetLastResult(),
@@ -220,7 +224,6 @@ _ListViewModel::LoadItem(int groupIndex, int itemIndex)
        // check validation of item index
        if (itemIndex < -1 || itemIndex >= pListGroupNode->__itemCountInGroup)
        {
-               SysLogException(NID_UI_CTRL, E_INVALID_ARG, "[E_INVALID_ARG] The item index is not valid.");
                return null;
        }
 
@@ -358,16 +361,20 @@ bool
 _ListViewModel::IsValidItem(int groupIndex, int itemIndex) const
 {
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index(%d).", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return false;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, false, GetLastResult(),
                                 "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        // check validation of item index
-       SysTryReturn(NID_UI_CTRL, (itemIndex >= -1 && itemIndex < pListGroupNode->__itemCountInGroup), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong item index(%d).", itemIndex);
+       if (itemIndex < -1 || itemIndex >= pListGroupNode->__itemCountInGroup)
+       {
+               return false;
+       }
 
        return true;
 }
@@ -376,16 +383,20 @@ bool
 _ListViewModel::IsLoadedItem(int groupIndex, int itemIndex) const
 {
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index(%d).", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return false;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, false, GetLastResult(),
                                 "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        // check validation of item index
-       SysTryReturn(NID_UI_CTRL, (itemIndex < pListGroupNode->__itemCountInGroup), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong item index(%d).", itemIndex);
+       if (itemIndex < -1 || itemIndex >= pListGroupNode->__itemCountInGroup)
+       {
+               return false;
+       }
 
        int temporaryGroupIndex = -1;
        int temporaryItemIndex = -1;
@@ -954,8 +965,10 @@ int
 _ListViewModel::GetItemCountInGroup(int groupIndex) const
 {
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), -1, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index(%d).", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return -1;
+       }
 
        int itemCount = -1;