Fixed Coding Idioms Violations

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

diff --git a/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp b/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp
index 8eb35d6..b110b04 100644 (file)
--- a/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ExpandableListImpl.cpp
@@ -333,6 +333,10 @@ _ExpandableListImpl::_ExpandableListImpl(Control* pList, _TableView* pCore)
        , __pClosedImage(null)
        , __pEffectClosedImage(null)
        , __pEffectOpenedImage(null)
+       , __pOpenedDisabledImage(null)
+       , __pClosedDisabledImage(null)
+       , __pOpenedPressedImage(null)
+       , __pClosedPressedImage(null)
        , __pItemProvider(null)
        , __directDelete(false)
        , __groupExpandStateList(DeleteExpandStateFlag)
@@ -596,7 +600,6 @@ result
 _ExpandableListImpl::LoadArrowBitmap(void)
 {
        result r = E_SUCCESS;
-       Bitmap* pTempBitmap = null;
        Color normalColor;
        Color disabledColor;
        Color pressedColor;
@@ -605,31 +608,58 @@ _ExpandableListImpl::LoadArrowBitmap(void)
        GET_COLOR_CONFIG(LIST::EXPANDABLE_ARROW_DISABLED, disabledColor);
        GET_COLOR_CONFIG(LIST::EXPANDABLE_ARROW_PRESSED, pressedColor);
 
-       r = GET_BITMAP_CONFIG_N(LIST::BUTTON_COLLAPSE_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
-       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to fetch Arrow Bitmap");
-       __pOpenedImage = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
-       __pOpenedDisabledImage = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
-       __pOpenedPressedImage = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
+       r = GET_REPLACED_BITMAP_CONFIG_N(LIST::BUTTON_COLLAPSE_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, normalColor, __pOpenedImage);
+       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating. Failed to fetch Arrow Bitmap.", GetErrorMessage(r));
 
-       delete pTempBitmap;
-       pTempBitmap = null;
+       r = GET_REPLACED_BITMAP_CONFIG_N(LIST::BUTTON_COLLAPSE_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, disabledColor, __pOpenedDisabledImage);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating. Failed to fetch Disabled Arrow Bitmap.", GetErrorMessage(r));
 
-       r = GET_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
-       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to fetch Arrow Bitmap");
-       __pClosedImage = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
-       __pClosedDisabledImage = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
-       __pClosedPressedImage = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
+       r = GET_REPLACED_BITMAP_CONFIG_N(LIST::BUTTON_COLLAPSE_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, pressedColor, __pOpenedPressedImage);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating. Failed to fetch Pressed Arrow Bitmap.", GetErrorMessage(r));
 
-       delete pTempBitmap;
-       pTempBitmap = null;
+       r = GET_REPLACED_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, normalColor, __pClosedImage);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating. Failed to fetch Arrow Bitmap.", GetErrorMessage(r));
+
+       r = GET_REPLACED_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, disabledColor, __pClosedDisabledImage);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating. Failed to fetch Disabled Arrow Bitmap.", GetErrorMessage(r));
+
+       r = GET_REPLACED_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_GROUP, BITMAP_PIXEL_FORMAT_ARGB8888, pressedColor, __pClosedPressedImage);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating. Failed to fetch Pressed Arrow Bitmap.", GetErrorMessage(r));
 
        r = GET_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_CLOSED_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pEffectOpenedImage);
-       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to fetch Arrow effect Bitmap");
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating. Failed to fetch Arrow effect Bitmap.", GetErrorMessage(r));
 
        r = GET_BITMAP_CONFIG_N(LIST::BUTTON_EXPAND_OPENED_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pEffectClosedImage);
-       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Failed to fetch Arrow effect Bitmap");
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating. Failed to fetch Arrow effect Bitmap.", GetErrorMessage(r));
 
        return r;
+
+CATCH:
+       delete __pOpenedImage;
+       __pOpenedImage = null;
+
+       delete __pOpenedDisabledImage;
+       __pOpenedDisabledImage = null;
+
+       delete __pOpenedPressedImage;
+       __pOpenedPressedImage = null;
+
+       delete __pClosedImage;
+       __pClosedImage = null;
+
+       delete __pClosedDisabledImage;
+       __pClosedDisabledImage = null;
+
+       delete __pClosedPressedImage;
+       __pClosedPressedImage = null;
+
+       delete __pEffectOpenedImage;
+       __pEffectOpenedImage = null;
+
+       delete __pEffectClosedImage;
+       __pEffectClosedImage = null;
+
+    return r;
 }
 
 result
@@ -682,7 +712,7 @@ _ExpandableListImpl::InsertItemAt(int mainIndex, const CustomListItem& item, int
 
        item.__pCustomListItemImpl->itemId = itemId;
 
-       Boolean* pIsExpanded = new Boolean(false);
+       Boolean* pIsExpanded = new (std::nothrow) Boolean(false);
        SysTryReturn(NID_UI_CTRL, pIsExpanded, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        __groupExpandStateList.InsertAt(*pIsExpanded, mainIndex);
@@ -1002,7 +1032,7 @@ _ExpandableListImpl::SetItemExpanded(int mainIndex, bool expand)
 {
        SysTryReturnResult(NID_UI_CTRL, (mainIndex >= 0 && mainIndex < GetGroupCount()), E_INVALID_ARG, "Invalid argument used. mainIndex = %d", mainIndex);
 
-       Boolean* pIsExpanded = new Boolean(expand);
+       Boolean* pIsExpanded = new (std::nothrow) Boolean(expand);
        SysTryReturn(NID_UI_CTRL, pIsExpanded, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        __groupExpandStateList.SetAt(*pIsExpanded, mainIndex, true);
@@ -1943,7 +1973,7 @@ void
 _ExpandableListImpl::ProcessItemStateChange(int mainIndex, int subIndex, ItemStatus itemStatus)
 {
        int itemId = -1;
-       if (subIndex == -1 )
+       if (subIndex == -1)
        {
                itemId = GetItemIdAt(mainIndex);
        }