update exceptions

Change-Id: I9ddddcf69272cd835df128d0fac52c7f856e58cc

diff --git a/src/FShellAppWidgetManager.cpp b/src/FShellAppWidgetManager.cpp
index c1d74d7..8f78960 100644 (file)
--- a/src/FShellAppWidgetManager.cpp
+++ b/src/FShellAppWidgetManager.cpp
@@ -109,24 +109,42 @@ AppWidgetManager::Construct(void)
        return E_SUCCESS;
 }
 
-Tizen::Base::Collection::IList*
+//
+// E_SYSTEM
+//
+IList*
 AppWidgetManager::GetAppWidgetProviderInfoListN(void) const
 {
-       return __pAppWidgetManagerImpl->GetAppWidgetProviderInfoListN();
+       IList* pIList = __pAppWidgetManagerImpl->GetAppWidgetProviderInfoListN();
+       SysTryReturn(NID_SHELL, pIList, null, E_SYSTEM, "[E_SYSTEM] Failed to get the provider information.");
+
+       return pIList;
 }
 
+//
+// E_APP_NOT_INSTALLED
+// - E_OBJ_NOT_FOUND
+// - E_SYSTEM
+//
 AppWidgetProviderInfo*
 AppWidgetManager::GetAppWidgetProviderInfoN(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName) const
 {
        return __pAppWidgetManagerImpl->GetAppWidgetProviderInfoN(appId, providerName);
 }
 
+//
+// E_APP_NOT_INSTALLED
+// - E_SYSTEM
+//
 AppWidgetProviderInfo*
 AppWidgetManager::GetDefaultAppWidgetProviderInfoN(const Tizen::App::PackageId& packageId) const
 {
        return __pAppWidgetManagerImpl->GetDefaultAppWidgetProviderInfoN(packageId);
 }
 
+//
+// E_SYSTEM
+//
 result
 AppWidgetManager::SetAppWidgetRequestListener(IAppWidgetRequestListener* pListener)
 {

diff --git a/src/FShellAppWidgetPopupProvider.cpp b/src/FShellAppWidgetPopupProvider.cpp
index 8bda314..43bbf6a 100644 (file)
--- a/src/FShellAppWidgetPopupProvider.cpp
+++ b/src/FShellAppWidgetPopupProvider.cpp
@@ -54,12 +54,10 @@ AppWidgetPopupProvider::Construct(const String& instanceId, double x, double y)
        return E_SUCCESS;
 }
 
-/*String
-AppWidgetPopupProvider::GetId() const
-{
-       return __pAppWidgetPopupProviderImpl->GetId();
-}*/
-
+//
+// E_INVALID_ARG
+// E_SYSTEM
+//
 result
 AppWidgetPopupProvider::SetAppWidgetPopup(AppWidgetPopup* pAppWidgetPopup)
 {
@@ -78,10 +76,16 @@ AppWidgetPopupProvider::GetAppWidgetPopup() const
        return const_cast<const AppWidgetPopup*>(__pAppWidgetPopupProviderImpl->GetAppWidgetPopup());
 }
 
+//
+// E_SYSTEM
+//
 result
 AppWidgetPopupProvider::RequestUpdateToAppWidget()
 {
-       return __pAppWidgetPopupProviderImpl->RequestUpdateToAppWidget();
+       result r = __pAppWidgetPopupProviderImpl->RequestUpdateToAppWidget();
+       SysTryReturnResult(NID_SHELL, !IsFailed(r), E_SYSTEM, "Failed to request update.");
+
+       return r;
 }
 
 }} // Tizen::Shell

diff --git a/src/FShellAppWidgetProvider.cpp b/src/FShellAppWidgetProvider.cpp
index e41d840..cf78f58 100644 (file)
--- a/src/FShellAppWidgetProvider.cpp
+++ b/src/FShellAppWidgetProvider.cpp
@@ -51,12 +51,10 @@ AppWidgetProvider::Construct(const String& instanceId)
        return E_SUCCESS;
 }
 
-/*String
-AppWidgetProvider::GetId() const
-{
-       return __pAppWidgetProviderImpl->GetId();
-}*/
-
+//
+// E_INVALID_ARG
+// E_SYSTEM
+//
 result
 AppWidgetProvider::SetAppWidgetFrame(AppWidgetFrame* pAppWidgetFrame)
 {

diff --git a/src/FShellAppWidgetProviderInfo.cpp b/src/FShellAppWidgetProviderInfo.cpp
index 8ef810e..eb1a62e 100644 (file)
--- a/src/FShellAppWidgetProviderInfo.cpp
+++ b/src/FShellAppWidgetProviderInfo.cpp
@@ -90,6 +90,9 @@ AppWidgetProviderInfo::GetConfigurationAppControlAppId() const
        return __pAppWidgetProviderInfoImpl->GetConfigurationAppControlAppId();
 }
 
+//
+// E_SYSTEM
+//
 Tizen::Base::Collection::IList*
 AppWidgetProviderInfo::GetSizeInfoListN() const
 {

diff --git a/src/FShell_AppWidgetManagerImpl.cpp b/src/FShell_AppWidgetManagerImpl.cpp
index a00fb5c..8e60e3d 100644 (file)
--- a/src/FShell_AppWidgetManagerImpl.cpp
+++ b/src/FShell_AppWidgetManagerImpl.cpp
@@ -128,16 +128,9 @@ _AppWidgetManagerImpl::GetAppWidgetProviderInfoListN()
        SysTryReturn(NID_SHELL, pAppWidgetProviders.get(), null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Insufficient memory");
 
        pAppWidgetProviders->Construct();
+       
        int ret = livebox_service_get_pkglist(GetAppWidgetProviderInfoCallback, pAppWidgetProviders.get());
-       if (ret < 0)
-       {
-               SysLog(NID_SHELL, "Failed to invoke livebox_service_get_pkglist, ret (%d)", ret);
-       }
-
-       if (pAppWidgetProviders->GetCount() <= 0)
-       {
-               return null;
-       }
+       SysTryReturn(NID_SHELL, ret == 0, null, E_SYSTEM, "[E_SYSTEM] Failed to invoke livebox_service_get_pkglist, ret (%d)", ret);
 
        return pAppWidgetProviders.release();
 }
@@ -198,10 +191,11 @@ _AppWidgetManagerImpl::SetAppWidgetRequestListener(IAppWidgetRequestListener* pL
 {
 //     int ret = shortcut_set_request_cb(AppWidgetRequestHandlerCallback, this );
 //     SysTryReturnResult(NID_SHELL, ret == 0, E_SYSTEM, "failed to shortcut_set_request_cb (%d)", ret);
-       _ShortcutManagerImpl::GetInstance()->SetAppWidgetRequestHandlerCallback(AppWidgetRequestHandlerCallback);
+       result r = _ShortcutManagerImpl::GetInstance()->SetAppWidgetRequestHandlerCallback(AppWidgetRequestHandlerCallback);
 
        __pAppWidgetRequestEventListener = pListener;
-       return E_SUCCESS;
+
+       return r;
 }
 
 IAppWidgetRequestListener*

diff --git a/src/FShell_AppWidgetPopupProviderImpl.cpp b/src/FShell_AppWidgetPopupProviderImpl.cpp
index 2b7fa47..e8ca9fa 100644 (file)
--- a/src/FShell_AppWidgetPopupProviderImpl.cpp
+++ b/src/FShell_AppWidgetPopupProviderImpl.cpp
@@ -57,20 +57,20 @@ _AppWidgetPopupProviderImpl::GetInstanceId() const
 result
 _AppWidgetPopupProviderImpl::SetAppWidgetPopup(AppWidgetPopup* pAppWidgetPopup)
 {
-       if( __pAppWidgetPopup == pAppWidgetPopup)
+       if (__pAppWidgetPopup == pAppWidgetPopup)
        {
                return E_SUCCESS;
        }
 
        __pAppWidgetPopup = pAppWidgetPopup;
 
-       if( pAppWidgetPopup == null)
+       if (pAppWidgetPopup == null)
        {
                return E_SUCCESS;
        }
 
        _AppWidgetPopupImpl* pAppWidgetPopupImpl = _AppWidgetPopupImpl::GetInstance(*pAppWidgetPopup);
-       SysTryReturnResult(NID_SHELL, pAppWidgetPopupImpl, E_INVALID_OPERATION, "Not-yet constructed! AppWidgetPopup::Construct() should be called before use.");
+       SysTryReturnResult(NID_SHELL, pAppWidgetPopupImpl, E_INVALID_ARG, "The pointer to AppWidgetPopup is @c null, or not constructed as yet.");
 
        pAppWidgetPopupImpl->SetAnchorPosition(FloatPoint(__x, __y));
        pAppWidgetPopupImpl->SetProviderId(GetInstanceId());

diff --git a/src/FShell_AppWidgetProviderImpl.cpp b/src/FShell_AppWidgetProviderImpl.cpp
index e40dca8..2fb2ebf 100644 (file)
--- a/src/FShell_AppWidgetProviderImpl.cpp
+++ b/src/FShell_AppWidgetProviderImpl.cpp
@@ -65,7 +65,7 @@ _AppWidgetProviderImpl::SetAppWidgetFrame(AppWidgetFrame* pAppWidgetFrame)
 
        _AppWidgetFrameImpl* pAppWidgetFrameImpl = _AppWidgetFrameImpl::GetInstance(*pAppWidgetFrame);
 //     SysAssertf(pAppWidgetFrameImpl != null, "Not-yet constructed! Construct() should be called before use.");
-       SysTryReturnResult(NID_SHELL, pAppWidgetFrameImpl, E_INVALID_OPERATION, "Not-yet constructed! AppWidgetFrame::Construct() should be called before use.");
+       SysTryReturnResult(NID_SHELL, pAppWidgetFrameImpl, E_INVALID_ARG, "The pointer to AppWidgetFrame is @c null, or not constructed as yet.");
 
        result r = pAppWidgetFrameImpl->SetProviderId(GetInstanceId());
        SysTryReturnResult(NID_SHELL, !IsFailed(r), E_SYSTEM, "Failed to invoke _AppWidgetFrameImpl::SetProviderId.");

diff --git a/src/FShell_AppWidgetProviderInfoImpl.cpp b/src/FShell_AppWidgetProviderInfoImpl.cpp
index 7ab2b15..ecd7172 100644 (file)
--- a/src/FShell_AppWidgetProviderInfoImpl.cpp
+++ b/src/FShell_AppWidgetProviderInfoImpl.cpp
@@ -179,7 +179,7 @@ _AppWidgetProviderInfoImpl::GetSizeInfoListN() const
        std::unique_ptr<char[]> pPackageId(_StringConverter::CopyToCharArrayN(__providerId));
        livebox_service_get_supported_sizes(pPackageId.get(), &supportedSizeCount , widthArray, heightArray);
 
-       SysTryReturn(NID_SHELL, supportedSizeCount > 0, null, E_INVALID_ARG, "[E_INVALID_ARG] There is no appwidget of provider(%ls)",__providerId.GetPointer() );
+       SysTryReturn(NID_SHELL, supportedSizeCount > 0, null, E_SYSTEM, "[E_SYSTEM] There is no appwidget of provider(%ls)",__providerId.GetPointer() );
 
        std::unique_ptr<ArrayList> pSizes(new (std::nothrow) ArrayList);
        SysTryReturn(NID_SHELL, pSizes, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Failed to allocate memory for ArrayList." );

diff --git a/src/FShell_AppWidgetProviderManagerImpl.cpp b/src/FShell_AppWidgetProviderManagerImpl.cpp
index ea5dc63..5d46b23 100644 (file)
--- a/src/FShell_AppWidgetProviderManagerImpl.cpp
+++ b/src/FShell_AppWidgetProviderManagerImpl.cpp
@@ -380,13 +380,10 @@ _AppWidgetProviderManagerImpl::AddAppWidget(const AppId& providerAppId, const St
 {
        result r = _AccessController::CheckUserPrivilege(_PRV_APPWIDGETPROVIDER_INSTALL);
        SysTryReturnResult(NID_SHELL, !IsFailed(r), E_PRIVILEGE_DENIED, "The application does not have the privilege to call this method.");
-
-       SysTryReturnResult(NID_SHELL, providerAppId.IsEmpty()==false, E_INVALID_ARG, "The providerAppId is empty.");
-       SysTryReturnResult(NID_SHELL, providerAppId.GetLength() < NATIVE_APP_MAX_APPID_LENGTH, E_INVALID_ARG, "The providerAppId is too long (Maximum %d bytes).", NATIVE_APP_MAX_APPID_LENGTH);
        SysTryReturnResult(NID_SHELL, _Aul::IsInstalled(providerAppId) == true, E_APP_NOT_INSTALLED, "The application(%ls) is not installed.", providerAppId.GetPointer());
 
        r = CheckCertificate(Tizen::App::App::GetInstance()->GetAppId(), providerAppId);
-       SysTryReturn(NID_SHELL, !IsFailed(r), r, r, "[%s] VerifyCertification is failed.", GetErrorMessage(r));
+       SysTryReturnResult(NID_SHELL, !IsFailed(r), r, "VerifyCertification failed.");
 
        String providerId;
        if( providerAppId.StartsWith(L"com.samsung", 0) == true )
@@ -401,7 +398,8 @@ _AppWidgetProviderManagerImpl::AddAppWidget(const AppId& providerAppId, const St
        }
 
        PackageAppInfo* pPackageInfo = _PackageManagerImpl::GetInstance()->GetPackageAppInfoN(providerAppId);
-       SysTryReturn(NID_SHELL, pPackageInfo != null, GetLastResult(), GetLastResult(), "[%s] Propagating.", GetErrorMessage(r));
+       r = GetLastResult();
+       SysTryReturnResult(NID_SHELL, pPackageInfo != null, r, "Propagating.");
 
        String iconPath = pPackageInfo->GetAppMenuIconPath();
        delete pPackageInfo;
@@ -413,7 +411,7 @@ _AppWidgetProviderManagerImpl::AddAppWidget(const AppId& providerAppId, const St
 
        int ret = add_to_home_livebox(pProviderId.get(), pName.get(), LIVEBOX_TYPE_DEFAULT, pContent.get(), pIcon.get(), -1.0l, true, AddAppWidgetCallback, this);
        SysTryReturnResult(NID_SHELL, ret != SHORTCUT_ERROR_COMM, E_CONNECTION_FAILED, "Failed to add_to_home_livebox");
-       SysTryReturnResult(NID_SHELL, ret == SHORTCUT_SUCCESS, E_SYSTEM, "[E_SYSTEM] Failed to add_to_home_livebox (%s)", strerror(r));
+       SysTryReturnResult(NID_SHELL, ret == SHORTCUT_SUCCESS, E_SYSTEM, "Failed to add_to_home_livebox (%s)", strerror(r));
 
        return E_SUCCESS;
 }

diff --git a/src/core/FShell_ShortcutManagerImpl.cpp b/src/core/FShell_ShortcutManagerImpl.cpp
index 2ef24dc..b17615a 100644 (file)
--- a/src/core/FShell_ShortcutManagerImpl.cpp
+++ b/src/core/FShell_ShortcutManagerImpl.cpp
@@ -199,14 +199,18 @@ _ShortcutManagerImpl::GetShortcutRequestListenerList(void) const
        return &__shortcutRequestListenerList;
 }
 
-void
+result
 _ShortcutManagerImpl::SetAppWidgetRequestHandlerCallback(request_cb_t pAppWidgetRequestHandlerFn)
 {
-       if( __isListenerConstructed == false)
+       result r = E_SUCCESS;
+
+       if (__isListenerConstructed == false)
        {
-               ConstructListener();
+               r = ConstructListener();
        }
        __pAppWidgetRequestHandlerCallback = pAppWidgetRequestHandlerFn;
+
+       return r;
 }
 
 }} // Tizen::Shell

diff --git a/src/inc/FShell_ShortcutManagerImpl.h b/src/inc/FShell_ShortcutManagerImpl.h
index c72fc05..ff6a780 100644 (file)
--- a/src/inc/FShell_ShortcutManagerImpl.h
+++ b/src/inc/FShell_ShortcutManagerImpl.h
@@ -110,7 +110,7 @@ public:
        result RemoveShortcutRequestListener(IShortcutRequestListener& listener);
 
        // internal
-       void SetAppWidgetRequestHandlerCallback(int(*PShortcutRequestCallback)(const char *appid, const char *name, int type, const char *content_info, const char *icon, int pid, double period, int allowDuplication, void *data));
+       result SetAppWidgetRequestHandlerCallback(int(*PShortcutRequestCallback)(const char *appid, const char *name, int type, const char *content_info, const char *icon, int pid, double period, int allowDuplication, void *data));
        const Tizen::Base::Collection::ArrayListT<IShortcutRequestListener*>* GetShortcutRequestListenerList(void) const;
 
 private: