[TDIS-5865] Correct doxygen & error log in ScrollPanel.

Change-Id: I05f5efc6d0ef703e35c56ac8e0542c272f0ac33d
Signed-off-by: SungHee Kim <sh.victoria.kim@samsung.com>

diff --git a/inc/FUiCtrlScrollPanel.h b/inc/FUiCtrlScrollPanel.h
index 1b9d017..8e3a10e 100644 (file)
--- a/inc/FUiCtrlScrollPanel.h
+++ b/inc/FUiCtrlScrollPanel.h
@@ -185,7 +185,7 @@ public:
         * @exception  E_INVALID_FORMAT        The specified XML format is invalid.
         * @exception  E_OPERATION_FAILED      The operation has failed.
         * @remarks     If SetBounds(), SetSize(), SetPosition() methods are called before the control is added to the parent via AddControl(), then the new value is applied
-        *                      to both orientations because the current orientation is not known. After AddControl() is called, then the values are applied only to the current orientation. 
+        *                      to both orientations because the current orientation is not known. After AddControl() is called, then the values are applied only to the current orientation.
         */
        result Construct(const Tizen::Base::String& resourceId);
 
@@ -540,8 +540,8 @@ public:
         * @param[in]     width                        The width of the client area to set
         * @exception     E_SUCCESS                   The method is successful.
         * @exception     E_INVALID_ARG             @c width is less than the width of %ScrollPanel
-        * @exception     E_INVALID_OPERATION    The width of the client area cannot be set when auto resizing of the client area is off, or the scroll
-        *                                                                      direction is vertical.
+        * @exception     E_INVALID_OPERATION    The width of the client area cannot be set when auto resizing of the client area is on,
+        *                                                                      or the scroll direction is vertical.
         *
         */
        result SetClientAreaWidth(int width);
@@ -556,7 +556,7 @@ public:
         * @param[in]     width                        The width of the client area to set
         * @exception     E_SUCCESS                   The method is successful.
         * @exception     E_INVALID_ARG             @c width is less than the width of %ScrollPanel
-        * @exception     E_INVALID_OPERATION    The width of the client area cannot be set when auto resizing of the client area is off,
+        * @exception     E_INVALID_OPERATION    The width of the client area cannot be set when auto resizing of the client area is on,
         *                                                                      or the scroll direction is vertical.
         *
         */
@@ -572,7 +572,7 @@ public:
         * @param[in]     height                        The height of the client area to set
         * @exception     E_SUCCESS                   The method is successful.
         * @exception     E_INVALID_ARG             @c height is less than the height of %ScrollPanel
-        * @exception     E_INVALID_OPERATION    The height of the client area cannot be set when auto resizing of the client area is off,
+        * @exception     E_INVALID_OPERATION    The height of the client area cannot be set when auto resizing of the client area is on,
         *                                                                      or the scroll direction is horizontal.
         *
         */
@@ -588,7 +588,7 @@ public:
         * @param[in]     height                        The height of the client area to set
         * @exception     E_SUCCESS                   The method is successful.
         * @exception     E_INVALID_ARG             @c height is less than the height of %ScrollPanel
-        * @exception     E_INVALID_OPERATION    The height of the client area cannot be set when auto resizing of the client area is off,
+        * @exception     E_INVALID_OPERATION    The height of the client area cannot be set when auto resizing of the client area is on,
         *                                                                      or the scroll direction is horizontal.
         *
         */

diff --git a/src/ui/controls/FUiCtrlScrollPanel.cpp b/src/ui/controls/FUiCtrlScrollPanel.cpp
index af86418..49e31e1 100644 (file)
--- a/src/ui/controls/FUiCtrlScrollPanel.cpp
+++ b/src/ui/controls/FUiCtrlScrollPanel.cpp
@@ -363,7 +363,7 @@ ScrollPanel::SetClientAreaWidth(int width)
        float floatWidth = _CoordinateSystemUtils::ConvertToFloat(width);
        result r = pImpl->SetClientAreaWidth(floatWidth);
        SysTryReturn(NID_UI_CTRL, r != E_INVALID_ARG, r, r, "[%s] width is less than the width of ScrollPanel.", GetErrorMessage(r));
-       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The width of the client area cannot be set when auto resizing of the client area is off, or the scroll direction is vertical.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The width of the client area cannot be set when auto resizing of the client area is on, or the scroll direction is vertical.", GetErrorMessage(r));
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] A system error has occurred.", GetErrorMessage(E_SYSTEM));
 
        return r;
@@ -377,7 +377,7 @@ ScrollPanel::SetClientAreaWidth(float width)
 
        result r = pImpl->SetClientAreaWidth(width);
        SysTryReturn(NID_UI_CTRL, r != E_INVALID_ARG, r, r, "[%s] width is less than the width of ScrollPanel.", GetErrorMessage(r));
-       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The width of the client area cannot be set when auto resizing of the client area is off, or the scroll direction is vertical.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The width of the client area cannot be set when auto resizing of the client area is on, or the scroll direction is vertical.", GetErrorMessage(r));
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] A system error has occurred.", GetErrorMessage(E_SYSTEM));
 
        return r;
@@ -392,7 +392,7 @@ ScrollPanel::SetClientAreaHeight(int height)
        float floatHeight = _CoordinateSystemUtils::ConvertToFloat(height);
        result r = pImpl->SetClientAreaHeight(floatHeight);
        SysTryReturn(NID_UI_CTRL, r != E_INVALID_ARG, r, r, "[%s] height is less than the height of ScrollPanel.", GetErrorMessage(r));
-       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The height of the client area cannot be set when auto resizing of the client area is off, or the scroll direction is horizontal.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The height of the client area cannot be set when auto resizing of the client area is on, or the scroll direction is horizontal.", GetErrorMessage(r));
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] A system error has occurred.", GetErrorMessage(E_SYSTEM));
 
        return r;
@@ -406,7 +406,7 @@ ScrollPanel::SetClientAreaHeight(float height)
 
        result r = pImpl->SetClientAreaHeight(height);
        SysTryReturn(NID_UI_CTRL, r != E_INVALID_ARG, r, r, "[%s] height is less than the height of ScrollPanel.", GetErrorMessage(r));
-       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The height of the client area cannot be set when auto resizing of the client area is off, or the scroll direction is horizontal.", GetErrorMessage(r));
+       SysTryReturn(NID_UI_CTRL, r != E_INVALID_OPERATION, r, r, "[%s] The height of the client area cannot be set when auto resizing of the client area is on, or the scroll direction is horizontal.", GetErrorMessage(r));
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] A system error has occurred.", GetErrorMessage(E_SYSTEM));
 
        return r;

diff --git a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
index 09d4103..9a285be 100644 (file)
--- a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
@@ -1868,7 +1868,7 @@ _ScrollPanelPresenter::UpdateClientBounds(const Tizen::Graphics::FloatDimension&
 result
 _ScrollPanelPresenter::SetScrollAreaBounds(FloatRectangle& bounds)
 {
-       SysTryReturn(NID_UI_CTRL, !__pScrollPanel->IsScrollAreaAutoResizingEnabled(), E_INVALID_OPERATION, E_INVALID_OPERATION, "[%s] The width of the client area cannot be set when auto resizing of the client area is off.", GetErrorMessage(E_INVALID_OPERATION));
+       SysTryReturn(NID_UI_CTRL, !__pScrollPanel->IsScrollAreaAutoResizingEnabled(), E_INVALID_OPERATION, E_INVALID_OPERATION, "[%s] The width of the client area cannot be set when auto resizing of the client area is on.", GetErrorMessage(E_INVALID_OPERATION));
 
        bounds.x = 0.0f;
        bounds.y = 0.0f;