Coding idioms in Progress and Slider

Change-Id: I52a97315de55552686249027fa71f0f31ecfd4af
Signed-off-by: Debajit Das <debajit.das@samsung.com>

diff --git a/src/ui/controls/FUiCtrlProgress.cpp b/src/ui/controls/FUiCtrlProgress.cpp
index e200290..97d16bd 100644 (file)
--- a/src/ui/controls/FUiCtrlProgress.cpp
+++ b/src/ui/controls/FUiCtrlProgress.cpp
@@ -47,7 +47,7 @@ Progress::Construct(const Rectangle& rect, int minValue, int maxValue)
 
        pProgressImpl = _ProgressImpl::CreateProgressImplN(this, rect);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pProgressImpl != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pProgressImpl != null, r, "Propagating.");
 
        _pControlImpl = pProgressImpl;
 
@@ -78,7 +78,7 @@ Progress::Construct(const FloatRectangle& rect, int minValue, int maxValue)
 
        pProgressImpl = _ProgressImpl::CreateProgressImplFN(this, rect);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pProgressImpl != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pProgressImpl != null, r, "Propagating.");
 
        _pControlImpl = pProgressImpl;
 

diff --git a/src/ui/controls/FUiCtrlSlider.cpp b/src/ui/controls/FUiCtrlSlider.cpp
index 26037e6..3110c3a 100644 (file)
--- a/src/ui/controls/FUiCtrlSlider.cpp
+++ b/src/ui/controls/FUiCtrlSlider.cpp
@@ -56,7 +56,7 @@ Slider::Construct(const Rectangle& rect, BackgroundStyle backgroundStyle, bool s
 
        pSliderImpl = _SliderImpl::CreateSliderImplN(this, rect, sliderStyle);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pSliderImpl != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pSliderImpl != null, r, "Propagating.");
 
        r = pSliderImpl->Initialize(minValue, maxValue, backgroundStyle, sliderStyle, groupStyle);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -89,7 +89,7 @@ Slider::Construct(const FloatRectangle& rect, BackgroundStyle backgroundStyle, b
 
        pSliderImpl = _SliderImpl::CreateSliderImplFN(this, rect, sliderStyle);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pSliderImpl != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pSliderImpl != null, r, "Propagating.");
 
        r = pSliderImpl->Initialize(minValue, maxValue, backgroundStyle, sliderStyle, groupStyle);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -115,7 +115,7 @@ Slider::Construct(const Rectangle& rect, unsigned long sliderStyle, int minValue
 
        pSliderImpl = _SliderImpl::CreateSliderImplN(this, rect, sliderStyle);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pSliderImpl != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pSliderImpl != null, r, "Propagating.");
 
        r = pSliderImpl->Initialize(minValue, maxValue, BACKGROUND_STYLE_DEFAULT, sliderStyle, GROUP_STYLE_NONE);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -141,7 +141,7 @@ Slider::Construct(const FloatRectangle& rect, unsigned long sliderStyle, int min
 
        pSliderImpl = _SliderImpl::CreateSliderImplFN(this, rect, sliderStyle);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pSliderImpl != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pSliderImpl != null, r, "Propagating.");
 
        r = pSliderImpl->Initialize(minValue, maxValue, BACKGROUND_STYLE_DEFAULT, sliderStyle, GROUP_STYLE_NONE);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -164,7 +164,7 @@ Slider::SetRange(int minValue, int maxValue)
        SysAssertf(pSliderImpl != null, "Not yet constructed. Construct() should be called before use.");
 
        result r = pSliderImpl->SetRange(minValue, maxValue);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        return r;
 }
@@ -249,7 +249,7 @@ Slider::SetTitleText(const String& title)
        SysAssertf(pSliderImpl != null, "Not yet constructed. Construct() should be called before use.");
 
        result r = pSliderImpl->SetTitleText(title);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        return r;
 }
@@ -323,7 +323,7 @@ Slider::SetBarColor(const Color& color)
        SysAssertf(pSliderImpl != null, "Not yet constructed. Construct() should be called before use.");
 
        result r = pSliderImpl->SetBarColor(color);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        return r;
 }
@@ -373,7 +373,7 @@ Slider::SetColor(const Color& color)
        SysAssertf(pSliderImpl != null, "Not yet constructed. Construct() should be called before use.");
 
        result r = pSliderImpl->SetColor(color);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        return r;
 }
@@ -398,7 +398,7 @@ Slider::SetThumbBitmap(SliderThumbStatus status, const Bitmap& bitmap)
        SysAssertf(pSliderImpl != null, "Not yet constructed. Construct() should be called before use.");
 
        result r = pSliderImpl->SetThumbBitmap(status, bitmap);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        return r;
 }

diff --git a/src/ui/controls/FUiCtrl_Progress.cpp b/src/ui/controls/FUiCtrl_Progress.cpp
index 4b6be57..510c083 100644 (file)
--- a/src/ui/controls/FUiCtrl_Progress.cpp
+++ b/src/ui/controls/FUiCtrl_Progress.cpp
@@ -67,7 +67,7 @@ _Progress::CreateProgressN()
        result r = E_SUCCESS;
 
        _Progress* pProgress = new (std::nothrow) _Progress;
-       SysTryReturn(NID_UI_CTRL, pProgress, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       SysTryReturn(NID_UI_CTRL, pProgress, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        _AccessibilityContainer* pContainer = pProgress->GetAccessibilityContainer();
 
@@ -115,7 +115,7 @@ _Progress::InitializeAccessibilityElement(void)
        if (pContainer != null)
        {
                __pAccessibilityElement = new _AccessibilityElement(true);
-               SysTryReturn(NID_UI_CTRL, __pAccessibilityElement, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+               SysTryReturnResult(NID_UI_CTRL, __pAccessibilityElement, E_OUT_OF_MEMORY, "Memory allocation failed.");
                __pAccessibilityElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBounds().width, GetBounds().height));
                __pAccessibilityElement->SetName(L"ProgressingImage");
                __pAccessibilityElement->SetLabel(L"Progressing");
@@ -126,7 +126,7 @@ _Progress::InitializeAccessibilityElement(void)
                __pAccessibilityElement->SetValue(string);
 
                r = pContainer->AddElement(*__pAccessibilityElement);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
 
        return r;
@@ -166,12 +166,12 @@ _Progress::SetPropertyValue(const Variant& value)
 
        int tempValue = value.ToInt();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pProgressPresenter->SetValue(tempValue);
 
        r = InitializeAccessibilityElement();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        if (__pAccessibilityElement != null)
        {
@@ -203,10 +203,10 @@ _Progress::GetPropertyValue(void) const
 result
 _Progress::SetRange(int minValue, int maxValue)
 {
-       SysTryReturn(NID_UI_CTRL, minValue >= 0 && maxValue >= 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE,
-                                       "[E_OUT_OF_RANGE] Values can not be negative.");
-       SysTryReturn(NID_UI_CTRL, minValue < maxValue, E_INVALID_ARG, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Invalid argument(s) is used. The minimum value is greater than maximum value.");
+       SysTryReturnResult(NID_UI_CTRL, minValue >= 0 && maxValue >= 0, E_OUT_OF_RANGE,
+                    "Values can not be negative.");
+       SysTryReturnResult(NID_UI_CTRL, minValue < maxValue, E_INVALID_ARG,
+                "Invalid argument(s) is used. The minimum value is greater than maximum value.");
 
        result r = E_SUCCESS;
 
@@ -214,7 +214,7 @@ _Progress::SetRange(int minValue, int maxValue)
        Variant value = GetProperty("value");
 
        r = SetProperty("minValue", Variant(minValue));
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Failed to set minimum value.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to set minimum value.");
 
        r = SetProperty("maxValue", Variant(maxValue));
        if (r != E_SUCCESS)
@@ -253,7 +253,7 @@ _Progress::SetPropertyMinValue(const Variant& minValue)
 
        int tempMinValue = minValue.ToInt();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pProgressPresenter->SetMinValue(tempMinValue);
 
@@ -267,7 +267,7 @@ _Progress::SetPropertyMaxValue(const Variant& maxValue)
 
        int tempMaxValue = maxValue.ToInt();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pProgressPresenter->SetMaxValue(tempMaxValue);
 
@@ -281,11 +281,11 @@ _Progress::GetRange(int& minValue, int& maxValue) const
 
        Variant minimum = GetProperty("minValue");
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        Variant maximum = GetProperty("maxValue");
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        minValue = minimum.ToInt();
        maxValue = maximum.ToInt();
@@ -324,7 +324,7 @@ _Progress::SetPropertyBarColor(const Variant& barColor)
 
        Color tempColor = barColor.ToColor();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __barColor = tempColor;
        __barColor.SetAlpha(0xFF);
@@ -361,7 +361,7 @@ _Progress::SetPropertyBarBackgroundColor(const Variant& barBgColor)
 
        Color tempColor = barBgColor.ToColor();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __barBgColor = tempColor;
        __barBgColor.SetAlpha(0xFF);

diff --git a/src/ui/controls/FUiCtrl_ProgressImpl.cpp b/src/ui/controls/FUiCtrl_ProgressImpl.cpp
index 5d2d28e..f589362 100644 (file)
--- a/src/ui/controls/FUiCtrl_ProgressImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressImpl.cpp
@@ -76,8 +76,7 @@ _ProgressImpl::CreateProgressImplN(Progress* pControl, const Rectangle& bounds)
        SysTryReturn(NID_UI_CTRL, pCore != null, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
        _ProgressImpl* pImpl = new (std::nothrow) _ProgressImpl(pControl, pCore);
-       r = CheckConstruction(pCore, pImpl);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, pImpl != null, null, E_OUT_OF_MEMORY, "[%s] Memory Allocation Failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        r = pImpl->InitializeBoundsProperties(GET_SIZE_INFO(Progress), bounds, pCore->GetOrientation());
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -106,8 +105,7 @@ _ProgressImpl::CreateProgressImplFN(Progress* pControl, const FloatRectangle& bo
        SysTryReturn(NID_UI_CTRL, pCore != null, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
        _ProgressImpl* pImpl = new (std::nothrow) _ProgressImpl(pControl, pCore);
-       r = CheckConstruction(pCore, pImpl);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, pImpl != null, null, E_OUT_OF_MEMORY, "[%s] Memory Allocation Failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        r = pImpl->InitializeBoundsPropertiesF(GET_SIZE_INFO(Progress), bounds, pCore->GetOrientation());
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));

diff --git a/src/ui/controls/FUiCtrl_ProgressPresenter.cpp b/src/ui/controls/FUiCtrl_ProgressPresenter.cpp
index 50d14c0..ca02761 100644 (file)
--- a/src/ui/controls/FUiCtrl_ProgressPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressPresenter.cpp
@@ -67,18 +67,18 @@ _ProgressPresenter::CreateInstanceN(const _Progress& progress)
        result r = E_SUCCESS;
        _ProgressPresenter* pProgressPresenter = new (std::nothrow) _ProgressPresenter;
        SysTryReturn(NID_UI_CTRL, pProgressPresenter != null, null, E_OUT_OF_MEMORY,
-                               "[E_OUT_OF_MEMORY] Memory allocation failed.");
+                "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        pProgressPresenter->__pProgress = const_cast <_Progress*>(&progress);
        SysTryCatch(NID_UI_CTRL, pProgressPresenter->__pProgress != null, , E_SYSTEM,
-                               "[E_SYSTEM] A system error has occurred. The Progress control core is null");
+                "A system error has occurred. The Progress control core is null", GetErrorMessage(E_SYSTEM));
 
        pProgressPresenter->__pProgressModel = new (std::nothrow) _ProgressModel;
        SysTryCatch(NID_UI_CTRL, pProgressPresenter->__pProgressModel != null, , E_OUT_OF_MEMORY,
-                               "[E_OUT_OF_MEMORY] Memory allocation failed.");
+                "Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        r = pProgressPresenter->LoadResource();
-       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. The loading of resource failed");
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. The loading of resource failed", GetErrorMessage(E_SYSTEM) );
 
        return pProgressPresenter;
 
@@ -177,13 +177,13 @@ _ProgressPresenter::LoadResource(void)
        Color barColor;
 
        r = GET_COLOR_CONFIG(PROGRESS::BAR_BG_NORMAL, bgColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(PROGRESS::BAR_NORMAL, barColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, " Propagating.");
 
        r = GET_REPLACED_BITMAP_CONFIG_N(PROGRESS::BAR_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, bgColor, __pBarBgColorReplacementBitmap);
-       SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r , r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
 
        r = GET_REPLACED_BITMAP_CONFIG_N(PROGRESS::BAR_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, barColor, __pBarColorReplacementBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -244,7 +244,7 @@ _ProgressPresenter::Draw(void)
 
        FloatRectangle bounds = __pProgress->GetBoundsF();
        Canvas* pCanvas = __pProgress->GetCanvasN();
-       SysTryReturn(NID_UI_CTRL, pCanvas != null, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Failed to get a canvas.");
+       SysTryReturnResult(NID_UI_CTRL, pCanvas != null, E_SYSTEM, "Failed to get a canvas.");
 
        int minValue = __pProgressModel->GetMinValue();
        int maxValue = __pProgressModel->GetMaxValue();

diff --git a/src/ui/controls/FUiCtrl_Slider.cpp b/src/ui/controls/FUiCtrl_Slider.cpp
index 4863f90..66404c6 100644 (file)
--- a/src/ui/controls/FUiCtrl_Slider.cpp
+++ b/src/ui/controls/FUiCtrl_Slider.cpp
@@ -115,7 +115,7 @@ _Slider::CreateSliderN(void)
        result r = E_SUCCESS;
 
        _Slider* pSlider = new (std::nothrow) _Slider;
-       SysTryReturn(NID_UI_CTRL, pSlider, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       SysTryReturn(NID_UI_CTRL, pSlider, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        pSlider->__pSliderPresenter = _SliderPresenter::CreateInstanceN(*pSlider);
        r = GetLastResult();
@@ -144,28 +144,28 @@ _Slider::Initialize(void)
        _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation();
 
        r = GET_COLOR_CONFIG(SLIDER::BG_DEFAULT_NORMAL, __bgColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::BAR_NORMAL, __barColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::BAR_BG_NORMAL, __barBgColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::TITLE_TEXT_NORMAL, __titleTextColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_SHAPE_CONFIG(SLIDER::HANDLE_WIDTH, orientation, handleRect.width);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_SHAPE_CONFIG(SLIDER::HANDLE_HEIGHT, orientation, handleRect.height);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pHandle = new (std::nothrow) Tizen::Ui::Animations::_VisualElement;
-       SysTryReturn(NID_UI_CTRL, __pHandle != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       SysTryReturnResult(NID_UI_CTRL, __pHandle != null, E_OUT_OF_MEMORY,  "Memory allocation failed.");
 
        r = __pHandle->Construct();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pHandle->SetBounds(FloatRectangle(handleRect.x, handleRect.y, handleRect.width, handleRect.height));
 
@@ -176,20 +176,20 @@ _Slider::Initialize(void)
 
 
        r = __pHandle->SetSurfaceOpaque(false);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pHandle->SetImplicitAnimationEnabled(false);
 
        r = __pBase->AttachChild(*__pHandle);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pAdjustmentEvent = _AdjustmentEvent::CreateInstanceN(*this);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, __pAdjustmentEvent, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, __pAdjustmentEvent, r, "Propagating.");
 
        __pSliderEvent = _SliderEvent::CreateInstanceN(*this);
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, __pSliderEvent, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, __pSliderEvent, r, "Propagating.");
 
        InitializeAccessibilityElement();
 
@@ -210,8 +210,8 @@ _Slider::InitializeAccessibilityElement(void)
        if (pContainer != null)
        {
                __pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true);
-               SysTryReturn(NID_UI_CTRL, __pAccessibilityElement, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
-                                       "[E_OUT_OF_MEMORY] Memory allocation failed.");
+               SysTryReturnResult(NID_UI_CTRL, __pAccessibilityElement, E_OUT_OF_MEMORY,
+                    "Memory allocation failed.");
                __pAccessibilityElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBounds().width, GetBounds().height));
                __pAccessibilityElement->SetLabel(__titleText);
                __pAccessibilityElement->SetName(L"SliderControl");
@@ -219,7 +219,7 @@ _Slider::InitializeAccessibilityElement(void)
                __pAccessibilityElement->SetHintWithStringId("IDS_TPLATFORM_BODY_FLICK_UP_AND_DOWN_TO_ADJUST_THE_POSITION_T_TTS");
                SetAccessibilityElementValue();
                r = pContainer->AddElement(*__pAccessibilityElement);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r,  "Propagating.");
                pContainer->AddListener(*this);
        }
 
@@ -480,18 +480,18 @@ _Slider::SetRange(int minValue, int maxValue)
 {
        result r = E_SUCCESS;
 
-       SysTryReturn(NID_UI_CTRL, (minValue >= _SLIDER_MINIMUM_VALUE && maxValue >= _SLIDER_MINIMUM_VALUE),
-                               E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The minimum value %d is out of range [-99 to 999].", minValue);
-       SysTryReturn(NID_UI_CTRL, (minValue <= _SLIDER_MAXIMUM_VALUE && maxValue <= _SLIDER_MAXIMUM_VALUE),
-                               E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The maximum value %d is out of range [-99 to 999].", maxValue);
-       SysTryReturn(NID_UI_CTRL, (minValue < maxValue), E_INVALID_ARG, E_INVALID_ARG,
-                               "[E_INVALID_ARG] The minimum value is greater than maximum value.");
+       SysTryReturnResult(NID_UI_CTRL, (minValue >= _SLIDER_MINIMUM_VALUE && maxValue >= _SLIDER_MINIMUM_VALUE),
+                E_OUT_OF_RANGE,  "[The minimum value %d is out of range [-99 to 999].", minValue);
+       SysTryReturnResult(NID_UI_CTRL, (minValue <= _SLIDER_MAXIMUM_VALUE && maxValue <= _SLIDER_MAXIMUM_VALUE),
+                E_OUT_OF_RANGE,  "The maximum value %d is out of range [-99 to 999].", maxValue);
+       SysTryReturnResult(NID_UI_CTRL, (minValue < maxValue), E_INVALID_ARG,
+                "The minimum value is greater than maximum value.");
 
        Variant oldMinValue = GetProperty("minValue");
        Variant value = GetProperty("value");
 
        r = SetProperty("minValue", Variant(minValue));
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Failed to set minimum value.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r,  " Failed to set minimum value.");
 
        r = SetProperty("maxValue", Variant(maxValue));
        if (r != E_SUCCESS)
@@ -524,7 +524,7 @@ _Slider::SetPropertyMinValue(const Variant& minValue)
 
        int tempMinValue = minValue.ToInt();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __pSliderPresenter->SetMinValue(tempMinValue);
 
@@ -538,7 +538,7 @@ _Slider::SetPropertyMaxValue(const Variant& maxValue)
 
        int tempMaxValue = maxValue.ToInt();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, " Propagating.");
 
        __pSliderPresenter->SetMaxValue(tempMaxValue);
 
@@ -552,11 +552,11 @@ _Slider::GetRange(int& minValue, int& maxValue) const
 
        Variant minimum = GetProperty("minValue");
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r,  "Propagating.");
 
        Variant maximum = GetProperty("maxValue");
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        minValue = minimum.ToInt();
        maxValue = maximum.ToInt();
@@ -591,7 +591,7 @@ _Slider::SetPropertyValue(const Variant& value)
 
        int tempValue = value.ToInt();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r,  "Propagating.");
 
        if (__pSliderPresenter->GetValue() != tempValue)
        {
@@ -650,17 +650,17 @@ _Slider::SetIcon(IconPosition position, const Bitmap& icon)
        Bitmap* pNewBitmap = null;
 
        r = GET_SHAPE_CONFIG(SLIDER::ICON_WIDTH, orientation, iconWidth);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r,"Propagating.");
 
        r = GET_SHAPE_CONFIG(SLIDER::ICON_HEIGHT, orientation, iconHeight);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        if (position == ICON_POSITION_LEFT)
        {
                pNewBitmap = _BitmapImpl::CloneN(icon);
 
                r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, pNewBitmap != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, pNewBitmap != null, r, "Propagating.");
 
                r = pNewBitmap->Scale(Dimension(iconWidth, iconHeight));
                SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -674,7 +674,7 @@ _Slider::SetIcon(IconPosition position, const Bitmap& icon)
                pNewBitmap = _BitmapImpl::CloneN(icon);
 
                r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, pNewBitmap != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, pNewBitmap != null, r, "Propagating.");
 
                r = pNewBitmap->Scale(Dimension(iconWidth, iconHeight));
                SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -729,7 +729,7 @@ _Slider::SetPropertyTitleText(const Variant& titleText)
        __pSliderPresenter->SetNeedUpdate();
 
        r = InitializeAccessibilityElement();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        if (__pAccessibilityElement != null)
        {
@@ -770,7 +770,7 @@ _Slider::SetPropertyTitleTextColor(const Variant& titleTextColor)
 
        Color tempColor = titleTextColor.ToColor();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __titleTextColor = tempColor;
        __pSliderPresenter->SetNeedUpdate();
@@ -833,7 +833,7 @@ _Slider::SetPropertyBarColor(const Variant& barColor)
 
        Color tempBarColor = barColor.ToColor();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __barColor = tempBarColor;
        __barColor.SetAlpha(0xFF);
@@ -872,7 +872,7 @@ _Slider::SetPropertyBarBackgroundColor(const Variant& barBackgroundColor)
 
        Color tempBarBackgroundColor = barBackgroundColor.ToColor();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __barBgColor = tempBarBackgroundColor;
        __barBgColor.SetAlpha(0xFF);
@@ -916,7 +916,7 @@ _Slider::SetPropertyColor(const Variant& color)
        result r = E_SUCCESS;
 
        Color tempBgColor = color.ToColor();
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        __bgColor = tempBgColor;
 

diff --git a/src/ui/controls/FUiCtrl_SliderEvent.cpp b/src/ui/controls/FUiCtrl_SliderEvent.cpp
index 183e17a..61aeba5 100644 (file)
--- a/src/ui/controls/FUiCtrl_SliderEvent.cpp
+++ b/src/ui/controls/FUiCtrl_SliderEvent.cpp
@@ -89,7 +89,7 @@ _SliderEvent*
 _SliderEvent::CreateInstanceN(const _Slider& source)
 {
        _SliderEvent* pSliderEvent = new (std::nothrow) _SliderEvent(source);
-       SysTryReturn(NID_UI_CTRL, pSliderEvent != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       SysTryReturn(NID_UI_CTRL, pSliderEvent != null, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        if (IsFailed(GetLastResult()))
        {
@@ -117,12 +117,12 @@ _SliderEvent::FireImpl(IEventListener& listener, const IEventArg& arg)
        // cast to ISliderEventListener
        _ISliderEventListener* pSliderListener = dynamic_cast <_ISliderEventListener*>(&listener);
        SysTryReturnVoidResult(NID_UI_CTRL, pSliderListener != null, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Invalid argument(s) is used. The _ISliderEventListener is null");
+                "Invalid argument(s) is used. The _ISliderEventListener is null");
 
        // cast to _SliderEventArg
        const _SliderEventArg* pSliderEventArg = dynamic_cast <const _SliderEventArg*>(&arg);
        SysTryReturnVoidResult(NID_UI_CTRL, pSliderEventArg != null, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Invalid argument(s) is used. The _SliderEventArg is null");
+                "Invalid argument(s) is used. The _SliderEventArg is null");
 
        // call cursor change event listener method
        pSliderListener->OnSliderBarMoved(*__pSource, pSliderEventArg->GetValue());
@@ -134,7 +134,7 @@ IEventArg*
 _SliderEvent::CreateSliderEventArgN(int value)
 {
        _SliderEventArg* pEventArg = new (std::nothrow) _SliderEventArg(value);
-       SysTryReturn(NID_UI_CTRL, pEventArg != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       SysTryReturn(NID_UI_CTRL, pEventArg != null, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        return pEventArg;
 }

diff --git a/src/ui/controls/FUiCtrl_SliderImpl.cpp b/src/ui/controls/FUiCtrl_SliderImpl.cpp
index ab87c43..6ee0c81 100644 (file)
--- a/src/ui/controls/FUiCtrl_SliderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_SliderImpl.cpp
@@ -81,17 +81,16 @@ _SliderImpl::CreateSliderImplN(Slider* pControl, const Rectangle& rect, int slid
        SysTryReturn(NID_UI_CTRL, pCore != null, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
        _SliderImpl* pImpl = new (std::nothrow) _SliderImpl(pControl, pCore);
-       r = CheckConstruction(pCore, pImpl);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, pImpl != null, null, E_OUT_OF_MEMORY, "[%s] Memory Allocation Failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        r = pImpl->InitializeBoundsProperties(FUNC_SIZE_INFO(Slider)(sliderStyle), rect, pCore->GetOrientation());
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        pImpl->__pPublicAdjustmentEvent = _PublicAdjustmentEvent::CreateInstanceN(*pControl);
-       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicAdjustmentEvent != null, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to construct an AdjustmentEvent instance");
+       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicAdjustmentEvent != null, , E_SYSTEM, "A system error has occurred. Failed to construct an AdjustmentEvent instance");
 
        pImpl->__pPublicSliderEvent = _PublicSliderEvent::CreateInstanceN(*pControl);
-       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicSliderEvent != null, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to construct a SliderEvent instance");
+       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicSliderEvent != null, , E_SYSTEM, "A system error has occurred. Failed to construct a SliderEvent instance");
 
        r = pCore->AddAdjustmentEventListener(*pImpl);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -123,17 +122,16 @@ _SliderImpl::CreateSliderImplFN(Slider* pControl, const FloatRectangle& rect, in
        SysTryReturn(NID_UI_CTRL, pCore != null, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
        _SliderImpl* pImpl = new (std::nothrow) _SliderImpl(pControl, pCore);
-       r = CheckConstruction(pCore, pImpl);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, pImpl != null, null, E_OUT_OF_MEMORY, "[%s] Memory Allocation Failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        r = pImpl->InitializeBoundsPropertiesF(FUNC_SIZE_INFO(Slider)(sliderStyle), rect, pCore->GetOrientation());
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        pImpl->__pPublicAdjustmentEvent = _PublicAdjustmentEvent::CreateInstanceN(*pControl);
-       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicAdjustmentEvent != null, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to construct an AdjustmentEvent instance");
+       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicAdjustmentEvent != null, , E_SYSTEM, "A system error has occurred. Failed to construct an AdjustmentEvent instance");
 
        pImpl->__pPublicSliderEvent = _PublicSliderEvent::CreateInstanceN(*pControl);
-       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicSliderEvent != null, , E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to construct a SliderEvent instance");
+       SysTryCatch(NID_UI_CTRL, pImpl->__pPublicSliderEvent != null, , E_SYSTEM, "A system error has occurred. Failed to construct a SliderEvent instance");
 
        r = pCore->AddAdjustmentEventListener(*pImpl);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -166,8 +164,8 @@ _SliderImpl::Initialize(int minValue, int maxValue, BackgroundStyle bgStyle, int
 
        if (bgStyle == BACKGROUND_STYLE_NONE)
        {
-               SysTryReturn(NID_UI_CTRL, groupStyle == GROUP_STYLE_NONE, E_INVALID_OPERATION, E_INVALID_OPERATION,
-                                  "[E_INVALID_OPERATION] The current Slider style does not support given group style.");
+               SysTryReturnResult(NID_UI_CTRL, groupStyle == GROUP_STYLE_NONE, E_INVALID_OPERATION,
+                   "The current Slider style does not support given group style.");
 
                style |= _SLIDER_STYLE_NO_BG;
        }
@@ -177,7 +175,7 @@ _SliderImpl::Initialize(int minValue, int maxValue, BackgroundStyle bgStyle, int
        }
 
        r = SetRange(minValue, maxValue);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        GetCore().SetStyle(style);
        GetCore().SetGroupStyle(groupStyle);

diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp
index c2fb5a9..c37aa94 100644 (file)
--- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp
@@ -175,21 +175,21 @@ _SliderPresenter::CreateInstanceN(const _Slider& slider)
 
        _SliderPresenter* pSliderPresenter = new (std::nothrow) _SliderPresenter;
        SysTryReturn(NID_UI_CTRL, pSliderPresenter != null, null, E_OUT_OF_MEMORY,
-                                "[E_OUT_OF_MEMORY] Memory allocation failed.");
+                 "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
 
        pSliderPresenter->__pSlider = const_cast <_Slider*>(&slider);
        SysTryCatch(NID_UI_CTRL, pSliderPresenter->__pSlider != null, , E_SYSTEM,
-                               "[E_SYSTEM] A system error has occurred. The Slider control core is null.");
+                "A system error has occurred. The Slider control core is null.");
 
        pSliderPresenter->__pSliderModel = new (std::nothrow) _SliderModel;
        SysTryCatch(NID_UI_CTRL, pSliderPresenter->__pSliderModel != null, , E_OUT_OF_MEMORY,
-                               "[E_OUT_OF_MEMORY] Memory allocation failed.");
+                "Memory allocation failed.");
 
        if (pSliderPresenter->__pSlider->GetStyle() & _SLIDER_STYLE_OVERLAY)
        {
                pSliderPresenter->__pSliderOverlay = new (std::nothrow) _SliderOverlay;
                SysTryCatch(NID_UI_CTRL, pSliderPresenter->__pSliderOverlay != null, , E_OUT_OF_MEMORY,
-                                       "[E_OUT_OF_MEMORY] Memory allocation failed.");
+                    "Memory allocation failed.");
 
                r = pSliderPresenter->__pSliderOverlay->Construct(*pSliderPresenter->__pSlider);
                SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -229,46 +229,46 @@ _SliderPresenter::Resize(void)
        if (!__isResourceLoaded)
        {
                r = LoadBitmap();
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
                __isResourceLoaded = true;
 
                r = GET_SHAPE_CONFIG(SLIDER::HANDLE_ONE_DIGIT_TEXT_SIZE, orientation, __fontSize);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                __pFont = __pSlider->GetFallbackFont();
                r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                r = GET_COLOR_CONFIG(SLIDER::HANDLE_NUMBER_TEXT_NORMAL, __handleTextColor);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                r = GET_COLOR_CONFIG(SLIDER::HANDLE_NUMBER_TEXT_DISABLED, __handleTextDisabledColor);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                r = GET_COLOR_CONFIG(SLIDER::HANDLE_NUMBER_TEXT_PRESSED, __handleTextPressedColor);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                r = GET_COLOR_CONFIG(SLIDER::HANDLE_NUMBER_TEXT_HIGHLIGHTED, __handleTextHighlightedColor);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        }
 
        r = GET_SHAPE_CONFIG(SLIDER::BAR_HEIGHT, orientation, barHeight);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_SHAPE_CONFIG(SLIDER::ICON_WIDTH, orientation, iconWidth);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_SHAPE_CONFIG(SLIDER::BAR_OFFSET, orientation, __barOffset);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        if (!__isCustomHandle)
        {
                r = GET_SHAPE_CONFIG(SLIDER::HANDLE_WIDTH, orientation, __handleRect.width);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                r = GET_SHAPE_CONFIG(SLIDER::HANDLE_HEIGHT, orientation, __handleRect.height);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                __handleOffset = __handleRect.width / 2;
        }
@@ -276,23 +276,23 @@ _SliderPresenter::Resize(void)
        __rect = FloatRectangle(0.0f, 0.0f, __pSlider->GetBoundsF().width, __pSlider->GetBoundsF().height);
 
        r = GET_SHAPE_CONFIG(SLIDER::ICON_RIGHT_MARGIN, orientation, iconRightMargin);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        if ((__pSlider->GetIcon(ICON_POSITION_LEFT) != null) || (__pSlider->GetIcon(ICON_POSITION_RIGHT) != null))
        {
                r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_WIDTH_WITH_ICON, orientation, minimumWidth);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                r = GET_SHAPE_CONFIG(SLIDER::ICON_LEFT_MARGIN, orientation, barLeftMargin);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
        else
        {
                r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_WIDTH_WITHOUT_ICON, orientation, minimumWidth);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                r = GET_SHAPE_CONFIG(SLIDER::BAR_LEFT_MARGIN, orientation, barLeftMargin);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
 
        barRightMargin = barLeftMargin;
@@ -303,12 +303,12 @@ _SliderPresenter::Resize(void)
        }
 
        r = GET_SHAPE_CONFIG(SLIDER::MINIMUM_HEIGHT, orientation, minimumHeight);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        if (__pSlider->GetStyle() & _SLIDER_STYLE_TITLE_TEXT)
        {
                r = GET_SHAPE_CONFIG(SLIDER::TITLE_TEXT_HEIGHT, orientation, titleHeight);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+        SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
                minimumHeight = minimumHeight + titleHeight;
        }
@@ -368,32 +368,32 @@ _SliderPresenter::LoadBitmap(void)
        Color handleHighlightedColor;
 
        r = GET_COLOR_CONFIG(SLIDER::BG_OTHERS_NORMAL, __currentBgColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::BG_DEFAULT_NORMAL, __currentGrpStyleNoneColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::BAR_NORMAL, __currentBarColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::BAR_BG_NORMAL, __currentBarBgColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::HANDLE_BG_NORMAL, handleNormalColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::HANDLE_BG_PRESSED, handlePressedColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::HANDLE_BG_DISABLED, handleDisabledColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_COLOR_CONFIG(SLIDER::HANDLE_BG_HIGHLIGHTED, handleHighlightedColor);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        // for GROUP_STYLE_TOP
        r = GET_REPLACED_BITMAP_CONFIG_N(SLIDER::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __currentBgColor, __pBgTopBitmap);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgTopEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -647,7 +647,7 @@ _SliderPresenter::DrawSlider(void)
        int style = __pSlider->GetStyle();
 
        Canvas* pCanvas = __pSlider->GetCanvasN();
-       SysTryReturn(NID_UI_CTRL, pCanvas != null, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] System error occurred.");
+       SysTryReturnResult(NID_UI_CTRL, pCanvas != null, E_SYSTEM, "System error occurred.");
 
        if (__isNeedToBeUpdated)
        {
@@ -984,7 +984,7 @@ _SliderPresenter::DrawSliderBar(Canvas& canvas)
        if (__pSlider->GetBarBackgroundColor() != __currentBarBgColor)
        {
                r = GET_REPLACED_BITMAP_CONFIG_N(SLIDER::BAR_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pSlider->GetBarBackgroundColor(), pReplacementBitmap);
-               SysTryReturn(NID_UI_CTRL, (pReplacementBitmap != null), r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, (pReplacementBitmap != null), r, "Propagating.");
 
                delete __pBarBgColorReplacementBitmap;
                __pBarBgColorReplacementBitmap = null;
@@ -996,7 +996,7 @@ _SliderPresenter::DrawSliderBar(Canvas& canvas)
        if (__pSlider->GetBarColor() != __currentBarColor)
        {
                r = GET_REPLACED_BITMAP_CONFIG_N(SLIDER::BAR_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pSlider->GetBarColor(), pReplacementBitmap);
-               SysTryReturn(NID_UI_CTRL, (pReplacementBitmap != null), r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, (pReplacementBitmap != null), r, "Propagating.");
 
                delete __pBarColorReplacementBitmap;
                __pBarColorReplacementBitmap = null;
@@ -1037,7 +1037,7 @@ _SliderPresenter::DrawSliderBar(Canvas& canvas)
 
        Canvas* pHandleCanvas = __pSlider->GetHandleCanvasN();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pHandleCanvas != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pHandleCanvas != null, r, "Propagating.");
 
        pHandleCanvas->SetBackgroundColor(0x00000000);
        pHandleCanvas->Clear();
@@ -1150,24 +1150,24 @@ _SliderPresenter::DrawSliderBarNumber(int value)
        if (valueLength == SLIDER_HANDLE_THREE_DIGIT)
        {
                r = GET_SHAPE_CONFIG(SLIDER::HANDLE_THREE_DIGIT_TEXT_SIZE, orientation, handleNumberSize);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
        else if (valueLength == SLIDER_HANDLE_TWO_DIGIT)
        {
                r = GET_SHAPE_CONFIG(SLIDER::HANDLE_TWO_DIGIT_TEXT_SIZE, orientation, handleNumberSize);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
        else
        {
                r = GET_SHAPE_CONFIG(SLIDER::HANDLE_ONE_DIGIT_TEXT_SIZE, orientation, handleNumberSize);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
 
        (_FontImpl::GetInstance(*__pFont))->SetSize(handleNumberSize);
 
        Canvas* pHandleCanvas = __pSlider->GetHandleCanvasN();
        r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, pHandleCanvas != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, pHandleCanvas != null, r, "Propagating.");
 
        pHandleCanvas->SetFont(*__pFont);
        __pFont->GetTextExtent(text, valueLength, textDim);
@@ -1197,10 +1197,10 @@ _SliderPresenter::DrawTitleText(Canvas& canvas)
        _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation();
 
        titleLength = __pSlider->GetTitleText().GetLength();
-       SysTryReturn(NID_UI_CTRL, titleLength != 0, E_SUCCESS, E_SUCCESS, "Title text is empty");
+       SysTryReturnResult(NID_UI_CTRL, titleLength != 0, E_SUCCESS, "Title text is empty");
 
        r = GET_SHAPE_CONFIG(SLIDER::TITLE_TEXT_SIZE, orientation, titleTextSize);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        (_FontImpl::GetInstance(*__pFont))->SetSize(titleTextSize);
 
@@ -1209,7 +1209,7 @@ _SliderPresenter::DrawTitleText(Canvas& canvas)
        if (__pTitleTextObject == null)
        {
                __pTitleTextObject = new (std::nothrow) TextObject();
-               SysTryReturn(NID_UI_CTRL, __pTitleTextObject != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+               SysTryReturnResult(NID_UI_CTRL, __pTitleTextObject != null, r = E_OUT_OF_MEMORY, "Memory allocation failed.");
                __pTitleTextObject->Construct();
        }
 
@@ -1241,13 +1241,13 @@ _SliderPresenter::DrawIcon(Canvas& canvas)
        if (pLeftBitmap != null)
        {
                r = DrawBitmap(canvas, GetIconBounds(ICON_POSITION_LEFT), pLeftBitmap);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
 
        if (pRightBitmap != null)
        {
                r = DrawBitmap(canvas, GetIconBounds(ICON_POSITION_RIGHT), pRightBitmap);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
        }
 
        return r;
@@ -1260,10 +1260,10 @@ _SliderPresenter::DrawSliderOverlay(int value)
 
        FloatRectangle absBounds = __pSlider->GetAbsoluteBoundsF(true);
        r = __pSliderOverlay->SetSliderRect(absBounds, __touchRect);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        r = __pSliderOverlay->DrawSliderOverlay(__touchRect.x + __handleX, __handleRect.width, value);
-       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+       SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating.");
 
        return r;
 }
@@ -1276,12 +1276,12 @@ _SliderPresenter::DrawBitmap(Canvas& canvas, const FloatRectangle& bounds, Bitma
        if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBitmap))
        {
                r = canvas.DrawNinePatchedBitmap(bounds, *pBitmap);
-               SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
        }
        else
        {
                r = canvas.DrawBitmap(bounds, *pBitmap);
-               SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.", GetErrorMessage(r));
        }
        return r;
 }