Revert "Overload methods to run with tizen id instead of widgetHandle"

This reverts commit 414c1eb084a4a83548d7ba8c878fd87291c4d997.

diff --git a/modules/localization/include/dpl/localization/w3c_file_localization.h b/modules/localization/include/dpl/localization/w3c_file_localization.h
index e0e5737..1e155ad 100644 (file)
--- a/modules/localization/include/dpl/localization/w3c_file_localization.h
+++ b/modules/localization/include/dpl/localization/w3c_file_localization.h
@@ -38,22 +38,10 @@ typedef std::list<WidgetIcon> WidgetIconList;
 DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
         WrtDB::DbWidgetHandle widgetHandle,
         const DPL::String &url);
-DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
-        const WrtDB::WidgetPkgName &pkgname,
-        const DPL::String &url);
-DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
-        WrtDB::WidgetDAOReadOnlyPtr dao,
-        const DPL::String &url);
 
 DPL::Optional<DPL::String> getFilePathInWidgetPackage(
         WrtDB::DbWidgetHandle widgetHandle,
         const DPL::String& file);
-DPL::Optional<DPL::String> getFilePathInWidgetPackage(
-        const WrtDB::WidgetPkgName &pkgname,
-        const DPL::String& file);
-DPL::Optional<DPL::String> getFilePathInWidgetPackage(
-        WrtDB::WidgetDAOReadOnlyPtr dao,
-        const DPL::String& file);
 
 DPL::OptionalString getStartFile(WrtDB::DbWidgetHandle handle);
 DPL::OptionalString getStartFile(const WrtDB::WidgetPkgName & pkgname);
@@ -65,17 +53,9 @@ OptionalWidgetIcon getIcon(WrtDB::WidgetDAOReadOnlyPtr dao);
 
 WidgetIconList getValidIconsList(
         WrtDB::DbWidgetHandle widgetHandle);
-WidgetIconList getValidIconsList(
-        const WrtDB::WidgetPkgName &pkgname);
-WidgetIconList getValidIconsList(
-        WrtDB::WidgetDAOReadOnlyPtr dao);
 
 OptionalWidgetStartFileInfo getStartFileInfo(
         WrtDB::DbWidgetHandle widgetHandle);
-OptionalWidgetStartFileInfo getStartFileInfo(
-        const WrtDB::WidgetPkgName &pkgname);
-OptionalWidgetStartFileInfo getStartFileInfo(
-        WrtDB::WidgetDAOReadOnlyPtr dao);
 
 WrtDB::WidgetLocalizedInfo getLocalizedInfo(WrtDB::DbWidgetHandle widgetHandle);
 WrtDB::WidgetLocalizedInfo getLocalizedInfo(const WrtDB::WidgetPkgName & pkgname);

diff --git a/modules/localization/src/w3c_file_localization.cpp b/modules/localization/src/w3c_file_localization.cpp
index 4a6cfe1..60ea79d 100644 (file)
--- a/modules/localization/src/w3c_file_localization.cpp
+++ b/modules/localization/src/w3c_file_localization.cpp
@@ -105,37 +105,19 @@ DPL::Optional<DPL::String> GetFilePathInWidgetPackageInternal(
 }
 
 namespace W3CFileLocalization {
-
 DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
         DbWidgetHandle widgetHandle,
         const DPL::String &url)
 {
-    return getFilePathInWidgetPackageFromUrl(
-            WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(widgetHandle)),
-            url);
-}
-
-DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
-        const WrtDB::WidgetPkgName &pkgname,
-        const DPL::String &url)
-{
-    return getFilePathInWidgetPackageFromUrl(
-            WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(pkgname)),
-            url);
-}
-
-DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
-        WrtDB::WidgetDAOReadOnlyPtr dao,
-        const DPL::String &url)
-{
     DPL::String req = url;
+    WidgetDAOReadOnly dao(widgetHandle);
 
     if (req.find(WIDGET_URI_BEGIN) == 0) {
         req.erase(0, WIDGET_URI_BEGIN.length());
     } else if (req.find(FILE_URI_BEGIN) == 0) {
         req.erase(0, FILE_URI_BEGIN.length());
-        if (req.find(dao->getPath()) == 0) {
-            req.erase(0, dao->getPath().length());
+        if (req.find(dao.getPath()) == 0) {
+            req.erase(0, dao.getPath().length());
         }
         if (req.find(LOCALE_PREFIX) == 0) {
             req.erase(0, LOCALE_PREFIX.length());
@@ -151,7 +133,7 @@ DPL::Optional<DPL::String> getFilePathInWidgetPackageFromUrl(
         return DPL::Optional<DPL::String>::Null;
     }
 
-    auto widgetPath = dao->getPath();
+    auto widgetPath = dao.getPath();
 
     DPL::Optional<DPL::String> found =
         GetFilePathInWidgetPackageInternal(widgetPath, req);
@@ -170,25 +152,8 @@ DPL::Optional<DPL::String> getFilePathInWidgetPackage(
         WrtDB::DbWidgetHandle widgetHandle,
         const DPL::String& file)
 {
-    return getFilePathInWidgetPackage(
-            WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(widgetHandle)),
-            file);
-}
-
-DPL::Optional<DPL::String> getFilePathInWidgetPackage(
-        const WrtDB::WidgetPkgName &pkgname,
-        const DPL::String& file)
-{
-    return getFilePathInWidgetPackage(
-            WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(pkgname)),
-            file);
-}
-
-DPL::Optional<DPL::String> getFilePathInWidgetPackage(
-        WrtDB::WidgetDAOReadOnlyPtr dao,
-        const DPL::String& file)
-{
-    return GetFilePathInWidgetPackageInternal(dao->getPath(), file);
+    WidgetDAOReadOnly dao(widgetHandle);
+    return GetFilePathInWidgetPackageInternal(dao.getPath(), file);
 }
 
 DPL::OptionalString getStartFile(const WrtDB::WidgetPkgName & pkgname)
@@ -273,28 +238,18 @@ OptionalWidgetIcon getIcon(WrtDB::WidgetDAOReadOnlyPtr dao)
     return OptionalWidgetIcon::Null;
 }
 
-WidgetIconList getValidIconsList(WrtDB::DbWidgetHandle widgetHandle)
-{
-    return getValidIconsList(
-            WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(widgetHandle)));
-}
-
-WidgetIconList getValidIconsList(const WrtDB::WidgetPkgName &pkgname)
+WidgetIconList getValidIconsList(
+        WrtDB::DbWidgetHandle widgetHandle)
 {
-    return getValidIconsList(
-            WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(pkgname)));
-}
-
-WidgetIconList getValidIconsList(WrtDB::WidgetDAOReadOnlyPtr dao)
-{
-    WidgetDAOReadOnly::WidgetIconList list = dao->getIconList();
+    WidgetDAOReadOnly dao(widgetHandle);
+    WidgetDAOReadOnly::WidgetIconList list = dao.getIconList();
 
     WidgetIconList outlist;
 
     FOREACH(it, list)
     {
         LogDebug(":" << it->iconSrc);
-        if (!!getFilePathInWidgetPackage(dao->getHandle(),
+        if (!!getFilePathInWidgetPackage(widgetHandle,
                                          it->iconSrc))
         {
             WidgetIcon ret;
@@ -307,27 +262,15 @@ WidgetIconList getValidIconsList(WrtDB::WidgetDAOReadOnlyPtr dao)
     return outlist;
 }
 
-OptionalWidgetStartFileInfo getStartFileInfo(WrtDB::DbWidgetHandle widgetHandle)
-{
-    return getStartFileInfo(
-        WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(widgetHandle)));
-}
-
-OptionalWidgetStartFileInfo getStartFileInfo(const WrtDB::WidgetPkgName &pkgname)
-{
-    return getStartFileInfo(
-        WidgetDAOReadOnlyPtr(new WidgetDAOReadOnly(pkgname)));
-
-}
-
-
-OptionalWidgetStartFileInfo getStartFileInfo(WrtDB::WidgetDAOReadOnlyPtr dao)
+OptionalWidgetStartFileInfo getStartFileInfo(
+        WrtDB::DbWidgetHandle widgetHandle)
 {
     WidgetStartFileInfo info;
 
+    WidgetDAOReadOnly dao(widgetHandle);
     WidgetDAOReadOnly::LocalizedStartFileList locList =
-        dao->getLocalizedStartFileList();
-    WidgetDAOReadOnly::WidgetStartFileList list = dao->getStartFileList();
+        dao.getLocalizedStartFileList();
+    WidgetDAOReadOnly::WidgetStartFileList list = dao.getStartFileList();
     const LanguageTags tagsList = LanguageTagsProviderSingleton::Instance().getLanguageTags();
 
     FOREACH(tag, tagsList)

diff --git a/modules/security_origin_dao/dao/security_origin_dao.cpp b/modules/security_origin_dao/dao/security_origin_dao.cpp
index c1bb112..6dde00e 100644 (file)
--- a/modules/security_origin_dao/dao/security_origin_dao.cpp
+++ b/modules/security_origin_dao/dao/security_origin_dao.cpp
@@ -76,27 +76,6 @@ std::string createDatabasePath(int widgetHandle)
 
 }
 
-std::string createDatabasePath(const DPL::String& tizenId)
-{
-    using namespace DPL::DB::ORM;
-    using namespace WrtDB::WidgetConfig;
-    using namespace WrtDB::GlobalConfig;
-
-    SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
-    {
-        std::stringstream filename;
-        WrtDB::WidgetDAOReadOnly widgetDAO(tizenId);
-        DPL::String pkgname = widgetDAO.getPkgname_NOTNULL();
-
-        filename << GetWidgetPersistentStoragePath(pkgname)
-                 << "/"
-                 << SECURITY_ORIGIN_DB_NAME;
-        return filename.str();
-    }
-    SQL_CONNECTION_EXCEPTION_HANDLER_END("Fail to get database Path")
-
-}
-
 void checkDatabase(std::string databasePath)
 {
     SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
@@ -142,14 +121,6 @@ SecurityOriginDAO::SecurityOriginDAO(int handle) :
     m_securityOriginDBInterface.AttachToThread(SECURITY_ORIGIN_DB_OPTION);
 }
 
-SecurityOriginDAO::SecurityOriginDAO(const DPL::String& tizenId):
-    m_securityOriginDBPath(createDatabasePath(tizenId)),
-    m_securityOriginDBInterface(m_securityOriginDBPath, SECURITY_ORIGIN_DB_TYPE)
-{
-    checkDatabase(m_securityOriginDBPath);
-    m_securityOriginDBInterface.AttachToThread(SECURITY_ORIGIN_DB_OPTION);
-}
-
 SecurityOriginDAO::~SecurityOriginDAO()
 {
     m_securityOriginDBInterface.DetachFromThread();

diff --git a/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h b/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h
index 3d6a6f3..a92650c 100644 (file)
--- a/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h
+++ b/modules/security_origin_dao/include/wrt-commons/security-origin-dao/security_origin_dao.h
@@ -24,7 +24,6 @@
 
 #include <dpl/db/thread_database_support.h>
 #include <wrt-commons/security-origin-dao/security_origin_dao_types.h>
-#include <dpl/string.h>
 
 namespace SecurityOriginDB {
 
@@ -40,7 +39,6 @@ class SecurityOriginDAO
     };
 
     explicit SecurityOriginDAO(int handle);
-    explicit SecurityOriginDAO(const DPL::String& tizenId);
     virtual ~SecurityOriginDAO();
     SecurityOriginDataList getSecurityOriginDataList();
     Result getResult(const SecurityOriginData &securityOriginData);