From: sriram.k Date: Fri, 12 Apr 2013 10:57:32 +0000 (+0530) Subject: GroupContainer doxygen changes. X-Git-Tag: accepted/tizen_2.1/20130425.033138~224 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6afd4e22fdd2293890dd375b55fbfda2f60efdd;p=platform%2Fframework%2Fnative%2Fuifw.git GroupContainer doxygen changes. Signed-off-by: sriram.k Change-Id: I767fed503734142ea0f9800ff43e28f213db183b Signed-off-by: Syed Khaja Moinuddin --- diff --git a/inc/FUiCtrlGroupContainer.h b/inc/FUiCtrlGroupContainer.h index 924fc48..4f4288e 100644 --- a/inc/FUiCtrlGroupContainer.h +++ b/inc/FUiCtrlGroupContainer.h @@ -103,7 +103,8 @@ public: * @param[in] columnIndex The column index of the cell * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The specified @c rowIndex or @c columnIndex is greater than the number of elements or less than @c 0. - * @exception E_INVALID_OPERATION The specified operation is not allowed + * @exception E_INVALID_ARG A specified input parameter @c control is invalid. + * @exception E_INVALID_OPERATION The cell specified by @c rowIndex and @c columnIndex is already bound to another control. * @see Merge() * @remarks If a control is being added to the merged cells, the row index and column index of a representative cell should be given. * @remarks The control to add should be allocated in heap memory, and the ownership of the control is transferred to the platform. @@ -121,7 +122,8 @@ public: * @param[in] columnIndex The column index of the cell * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The specified @c rowIndex or @c columnIndex is greater than the number of elements or less than @c 0. - * @exception E_INVALID_OPERATION The specified operation is not allowed + * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * @exception E_INVALID_OPERATION No control has been bound to the specified cell. * @remarks When you get the control from the merged cell, the row index and column index of a representative cell should be given. */ const Tizen::Ui::Control* GetControlAt(int rowIndex, int columnIndex) const; @@ -136,8 +138,8 @@ public: * @param[in] rowIndex The row index of the cell * @param[in] columnIndex The column index of the cell * @exception E_SUCCESS The method is successful. - * @exception E_OUT_OF_RANGE The specified @c rowIndex or @c columnIndex is greater than the number of elements or less than @c 0. - * @exception E_INVALID_OPERATION The specified operation is not allowed + * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * @exception E_INVALID_OPERATION No control has been bound to the specified cell. * @remarks When you get the control from the merged cells, the row index and column index of a representative cell should be given. */ Tizen::Ui::Control* GetControlAt(int rowIndex, int columnIndex); @@ -153,8 +155,7 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The specified @c rowIndex or @c columnIndex is greater than the number of elements or less than @c 0. * @exception E_OPERATION_FAILED The operation has failed. - * @exception E_OBJ_NOT_FOUND The specified cell does not have any control. - * @exception E_INVALID_OPERATION The specified operation is not allowed + * @exception E_INVALID_OPERATION No control has been bound to the specified cell. * @remarks When you remove the control from the merged cell, the row index and column index of a representative cell should be given. * @remarks The removed child control is deleted from the memory. Before it is removed from the container, OnTerminating() of the child control is called. * @see Tizen::Ui::Control::OnTerminating() @@ -282,6 +283,7 @@ public: * @param[in] rowCount The number of cells to merge along the row * @param[in] columnCount The number of cells to merge along the column * @exception E_SUCCESS The method is successful. + * @exception E_INVALID_ARG One or more cells in the specified range is(are) already merged. * @exception E_OUT_OF_RANGE The specified @c rowStartIndex or @c columnStartIndex is greater than the number of elements or less than @c 0 * @remarks When the cells are merged, the top-left cell will play the role of representative cell on behalf of merged cells. @n * To manipulate the merge cell, the row index and column index of the representative cell has to be given. Merging cells with the merged cell diff --git a/src/ui/controls/FUiCtrl_GroupContainer.cpp b/src/ui/controls/FUiCtrl_GroupContainer.cpp index f7c4aea..cd861b7 100644 --- a/src/ui/controls/FUiCtrl_GroupContainer.cpp +++ b/src/ui/controls/FUiCtrl_GroupContainer.cpp @@ -987,7 +987,7 @@ _GroupContainer::GetControlCoreAt(int rowIndex, int columnIndex) if (!pControl) { - SysLogException(NID_UI, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Failed to get control at specified index."); + SysLogException(NID_UI, E_INVALID_OPERATION, "[E_INVALID_OPERATION] Failed to get control at specified index."); } return pControl;