Modify logs of Canvas, Bitmap and Util.

Change-Id: I42e73186c1c5bf5cea3e1196728ef026bea9e48b
Signed-off-by: hoonik.lee <hoonik.lee@samsung.com>

diff --git a/src/graphics/FGrp_Bitmap.cpp b/src/graphics/FGrp_Bitmap.cpp
index 144498f..446b2d3 100755 (executable)
--- a/src/graphics/FGrp_Bitmap.cpp
+++ b/src/graphics/FGrp_Bitmap.cpp
@@ -722,7 +722,7 @@ _Bitmap::Merge(const Point& dest, const _Bitmap& src, const Rectangle& srcRect)
        }
 
        // TODO, shkim, I'm not sure why it's E_OUT_OF_RANGE?
-       // TryReturnI(NID_GRP, srcRect.x >= 0 && srcRect.y >= 0, E_OUT_OF_RANGE, "the argument is out of range.\n");
+       // SysTryReturnResult(NID_GRP, srcRect.x >= 0 && srcRect.y >= 0, E_OUT_OF_RANGE, "the argument is out of range.\n");
 
        SysTryReturnResult(NID_GRP, src.IsValid(), E_INVALID_ARG, "The specified source bitmap is invalid.\n");
 

diff --git a/src/graphics/FGrp_CanvasImpl.cpp b/src/graphics/FGrp_CanvasImpl.cpp
index 387d7b4..becafe0 100755 (executable)
--- a/src/graphics/FGrp_CanvasImpl.cpp
+++ b/src/graphics/FGrp_CanvasImpl.cpp
@@ -2340,7 +2340,7 @@ _CanvasImpl::SetLineCapStyle(LineCapStyle lineCapStyle)
        case LINE_CAP_STYLE_SQUARE:
                break;
        default:
-               SysTryReturn(NID_GRP, false, E_INVALID_ARG, E_INVALID_ARG, "The given line cap style is out of range.");
+               SysTryReturnResult(NID_GRP, false, E_INVALID_ARG, "The given line cap style is out of range.");
        }
 
        return this->_pNativeCanvas->SetLineCapStyle(lineCapStyle);
@@ -2358,7 +2358,7 @@ _CanvasImpl::SetLineJoinStyle(LineJoinStyle lineJoinStyle)
        case LINE_JOIN_STYLE_BEVEL:
                break;
        default:
-               SysTryReturn(NID_GRP, false, E_INVALID_ARG, E_INVALID_ARG, "The given line join style is out of range.");
+               SysTryReturnResult(NID_GRP, false, E_INVALID_ARG, "The given line join style is out of range.");
        }
 
        return this->_pNativeCanvas->SetLineJoinStyle(lineJoinStyle);
@@ -3118,7 +3118,7 @@ _CanvasImpl::SetPosition(int vcX, int vcY)
 Canvas*
 _CanvasImpl::GetSubCanvasN(const Rectangle& subRegion) const
 {
-       SysTryReturn(NID_GRP, INSTANCE_IS_VALID, null, E_OPERATION_FAILED, "This instance is not constructed yet.");
+       SysTryReturn(NID_GRP, INSTANCE_IS_VALID, null, E_OPERATION_FAILED, "[E_OPERATION_FAILED] This instance is not constructed yet.");
 
        _Canvas* pSourceNativeCanvas = this->_pNativeCanvas;
 

diff --git a/src/graphics/util/FGrp_Util.cpp b/src/graphics/util/FGrp_Util.cpp
index 3356a97..8dc9a56 100644 (file)
--- a/src/graphics/util/FGrp_Util.cpp
+++ b/src/graphics/util/FGrp_Util.cpp
@@ -90,7 +90,7 @@ _Util::Validate(const ::Tizen::Graphics::Rectangle& rtSrc, const ::Tizen::Graphi
        if (rtSrc.width <= 0 || rtSrc.height <= 0 || rtDest.width <= 0 || rtDest.height <= 0)
        {
                SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-               SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(w:%d,h:%d), dst(w:%d,h:%d)).\n", rtSrc.width, rtSrc.height, rtDest.width, rtDest.height);
+               SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(w:%d,h:%d), dst(w:%d,h:%d)).\n", rtSrc.width, rtSrc.height, rtDest.width, rtDest.height);
        }
 
        // check 2.     is src exiting outside of dest entirely?
@@ -98,14 +98,14 @@ _Util::Validate(const ::Tizen::Graphics::Rectangle& rtSrc, const ::Tizen::Graphi
                rtSrc.x + rtSrc.width - 1 < rtDest.x)
        {
                SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-               SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(x:%d,y:%d,w:%d,h:%d), dst(x:%d,y:%d,w:%d,h:%d)).\n",rtSrc.x, rtSrc.y, rtSrc.width, rtSrc.height, rtDest.x, rtDest.y, rtDest.width, rtDest.height);
+               SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(x:%d,y:%d,w:%d,h:%d), dst(x:%d,y:%d,w:%d,h:%d)).\n",rtSrc.x, rtSrc.y, rtSrc.width, rtSrc.height, rtDest.x, rtDest.y, rtDest.width, rtDest.height);
        }
 
        if (rtSrc.y > rtDest.y + rtDest.height - 1 ||
                rtSrc.y + rtSrc.height - 1 < rtDest.y)
        {
                SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-               SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(x:%d,y:%d,w:%d,h:%d), dst(x:%d,y:%d,w:%d,h:%d)).\n",rtSrc.x, rtSrc.y, rtSrc.width, rtSrc.height, rtDest.x, rtDest.y, rtDest.width, rtDest.height);
+               SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(x:%d,y:%d,w:%d,h:%d), dst(x:%d,y:%d,w:%d,h:%d)).\n",rtSrc.x, rtSrc.y, rtSrc.width, rtSrc.height, rtDest.x, rtDest.y, rtDest.width, rtDest.height);
        }
 
        return E_SUCCESS;
@@ -118,21 +118,21 @@ _Util::Validate(const ::Tizen::Graphics::FloatRectangle& rtSrcF, const ::Tizen::
        if (rtSrcF.width <= 0.0f || rtSrcF.height <= 0.0f || rtDestF.width <= 0.0f || rtDestF.height <= 0.0f)
        {
                SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-               SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(w:%f,h:%f), dst(w:%f,h:%f)).\n", rtSrcF.width, rtSrcF.height, rtDestF.width, rtDestF.height);
+               SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(w:%f,h:%f), dst(w:%f,h:%f)).\n", rtSrcF.width, rtSrcF.height, rtDestF.width, rtDestF.height);
        }
 
        // check 2.     is src exiting outside of dest entirely?
        if (rtSrcF.x >= rtDestF.x + rtDestF.width || rtSrcF.x + rtSrcF.width <= rtDestF.x)
        {
                SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-               SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(x:%f,y:%f,w:%f,h:%f), dst(x:%f,y:%f,w:%f,h:%f)).\n", rtSrcF.x, rtSrcF.y, rtSrcF.width, rtSrcF.height, rtDestF.x, rtDestF.y, rtDestF.width, rtDestF.height);
+               SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(x:%f,y:%f,w:%f,h:%f), dst(x:%f,y:%f,w:%f,h:%f)).\n", rtSrcF.x, rtSrcF.y, rtSrcF.width, rtSrcF.height, rtDestF.x, rtDestF.y, rtDestF.width, rtDestF.height);
 
        }
 
        if (rtSrcF.y >= rtDestF.y + rtDestF.height || rtSrcF.y + rtSrcF.height <= rtDestF.y)
        {
                SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-               SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(x:%f,y:%f,w:%f,h:%f), dst(x:%f,y:%f,w:%f,h:%f)).\n", rtSrcF.x, rtSrcF.y, rtSrcF.width, rtSrcF.height, rtDestF.x, rtDestF.y, rtDestF.width, rtDestF.height);
+               SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(x:%f,y:%f,w:%f,h:%f), dst(x:%f,y:%f,w:%f,h:%f)).\n", rtSrcF.x, rtSrcF.y, rtSrcF.width, rtSrcF.height, rtDestF.x, rtDestF.y, rtDestF.width, rtDestF.height);
        }
 
        return E_SUCCESS;
@@ -147,7 +147,7 @@ _Util::Validate(const ::Tizen::Graphics::Point& ptSrc, const ::Tizen::Graphics::
        }
 
        SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-       SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(x:%d,y:%d), dst(x:%d,y:%d,w:%d,h:%d)).\n", ptSrc.x, ptSrc.y, rtDest.x, rtDest.y, rtDest.width, rtDest.height);
+       SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(x:%d,y:%d), dst(x:%d,y:%d,w:%d,h:%d)).\n", ptSrc.x, ptSrc.y, rtDest.x, rtDest.y, rtDest.width, rtDest.height);
 }
 
 result
@@ -159,7 +159,7 @@ _Util::Validate(const ::Tizen::Graphics::FloatPoint& ptSrcF, const ::Tizen::Grap
        }
 
        SysLogException(NID_GRP, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The argument is out of range.");
-       SysSecureTryReturn(NID_GRP, 0, E_OUT_OF_RANGE, E_OUT_OF_RANGE, " (src(x:%f,y:%f), dst(x:%f,y:%f,w:%f,h:%f)).\n", ptSrcF.x, ptSrcF.y, rtDestF.x, rtDestF.y, rtDestF.width, rtDestF.height);
+       SysSecureTryReturnResult(NID_GRP, 0, E_OUT_OF_RANGE, "(src(x:%f,y:%f), dst(x:%f,y:%f,w:%f,h:%f)).\n", ptSrcF.x, ptSrcF.y, rtDestF.x, rtDestF.y, rtDestF.width, rtDestF.height);
 }
 
 bool