viemgr: renamed apis.

push_view_insert_before -> insert_view_before
push_view_insert_after -> insert_view_after

and force the exceptional handling whether view == before/aftr ?

Change-Id: I43b7acb0c196cfe3315f95ad82c8871f92588d32

diff --git a/src/include/efl/mobile/c/ui_viewmgr.h b/src/include/efl/mobile/c/ui_viewmgr.h
index 798bd5000407779bb0ca6a284b19696d4383a6c7..22c6d5b05b6b75c24c32385be4bd1c213b248e80 100644 (file)
--- a/src/include/efl/mobile/c/ui_viewmgr.h
+++ b/src/include/efl/mobile/c/ui_viewmgr.h
@@ -27,8 +27,8 @@ extern "C" {
  *  @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted.
  *
  *  @see ui_viewmgr_activate()
- *  @see ui_viewmgr_push_view_insert_before()
- *  @see ui_viewmgr_push_view_insert_after()
+ *  @see ui_viewmgr_insert_view_before()
+ *  @see ui_viewmgr_insert_view_after()
  *  @see ui_viewmgr_pop_view()
  */
 EAPI int ui_viewmgr_push_view(ui_view *view);
@@ -45,9 +45,9 @@ EAPI int ui_viewmgr_push_view(ui_view *view);
  *  @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted.
  *  @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid.
  *
- *  @see ui_viewmgr_push_view_insert_after()
+ *  @see ui_viewmgr_insert_view_after()
  */
-EAPI int ui_viewmgr_push_view_insert_before(ui_view *view, ui_view *before);
+EAPI int ui_viewmgr_insert_view_before(ui_view *view, ui_view *before);
 
 /**
  *  @brief Inserts a view in the ui_viewmgr view list. Specifically, insert a given @a view right after of the given view, @after.
@@ -61,9 +61,9 @@ EAPI int ui_viewmgr_push_view_insert_before(ui_view *view, ui_view *before);
  *  @retval #TIZEN_ERROR_NOT_PERMITTED @a view was already inserted.
  *  @retval #TIZEN_ERROR_INVALID_PARAMETER @a view is not valid.
  *
- *  @see ui_viewmgr_push_view_insert_before()
+ *  @see ui_viewmgr_insert_view_before()
  */
-EAPI int ui_viewmgr_push_view_insert_after(ui_view *view, ui_view *after);
+EAPI int ui_viewmgr_insert_view_after(ui_view *view, ui_view *after);
 
 /**
  *  @brief Pops the top(last) view from the ui_viewmgr view list.

diff --git a/src/lib/efl/mobile/c/ui_viewmgr.cpp b/src/lib/efl/mobile/c/ui_viewmgr.cpp
index d4977f25644851f92bdddf0ffba1e45876fd7f15..bda2b5527ad095569296adad919d010324a302be 100644 (file)
--- a/src/lib/efl/mobile/c/ui_viewmgr.cpp
+++ b/src/lib/efl/mobile/c/ui_viewmgr.cpp
@@ -12,7 +12,7 @@ EAPI int ui_viewmgr_push_view(ui_view *view)
        return UI_VIEWMGR->pushView(view);
 }
 
-EAPI int ui_viewmgr_push_view_insert_before(ui_view *view, ui_view *before)
+EAPI int ui_viewmgr_insert_view_before(ui_view *view, ui_view *before)
 {
        if (!before || !view)
        {
@@ -23,7 +23,7 @@ EAPI int ui_viewmgr_push_view_insert_before(ui_view *view, ui_view *before)
        return UI_VIEWMGR->insertViewBefore(view, before);
 }
 
-EAPI int ui_viewmgr_push_view_insert_after(ui_view *view, ui_view *after)
+EAPI int ui_viewmgr_insert_view_after(ui_view *view, ui_view *after)
 {
        if (!after || !view)
        {

diff --git a/src/lib/interface/UiIfaceViewmgr.cpp b/src/lib/interface/UiIfaceViewmgr.cpp
index 6f769cdbd21dfaa731d312b214ad0ce2be822b7b..75e4fbbe70298d55e3abc56609c24fbdbc1d4625 100644 (file)
--- a/src/lib/interface/UiIfaceViewmgr.cpp
+++ b/src/lib/interface/UiIfaceViewmgr.cpp
@@ -85,6 +85,12 @@ int UiIfaceViewmgrImpl::insertViewAfter(UiIfaceView *view, UiIfaceView *after)
                return TIZEN_ERROR_INVALID_PARAMETER;
        }
 
+       if (view == after) {
+               LOGE("invalid view argument. view == after?");
+               return TIZEN_ERROR_INVALID_PARAMETER;
+
+       }
+
        int ret = this->connectView(view);
 
        if (ret != TIZEN_ERROR_NONE) {
@@ -300,6 +306,12 @@ int UiIfaceViewmgrImpl::insertViewBefore(UiIfaceView *view, UiIfaceView *before)
 
        }
 
+       if (view == before) {
+               LOGE("invalid view argument. view == before?");
+               return TIZEN_ERROR_INVALID_PARAMETER;
+
+       }
+
        int ret = this->connectView(view);
 
        if (ret != TIZEN_ERROR_NONE) {