Styel check

Change-Id: I102408c0f7ff520be398dbf102f5711954c283c5

diff --git a/src/hybrid/step/pkgmgr/step_generate_xml.cc b/src/hybrid/step/pkgmgr/step_generate_xml.cc
index df049ff..2004179 100644 (file)
--- a/src/hybrid/step/pkgmgr/step_generate_xml.cc
+++ b/src/hybrid/step/pkgmgr/step_generate_xml.cc
@@ -16,6 +16,7 @@
 #include <common/utils/file_util.h>
 #include <common/utils/glist_range.h>
 
+#include <utility>
 #include <string>
 #include <vector>
 

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 66ca801..38193da 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -50,9 +50,9 @@ const uid_t kDefaultUserUid = tzplatform_getuid(TZ_SYS_DEFAULT_USER);
 const uid_t kTestUserId = kGlobalUserUid;
 const gid_t kTestGroupId = kGlobalUserGid;
 const char kSystemShareGroupName[] = "system_share";
-const std::string kTestUserIdStr =
+const std::string& kTestUserIdStr =
     std::to_string(kTestUserId);
-const std::string kDefaultUserIdStr = std::to_string(kDefaultUserUid);
+const std::string& kDefaultUserIdStr = std::to_string(kDefaultUserUid);
 const char kLegacyExtImageDir[] = "legacy_extimage_dir";
 const char kMigrateTestDBName[] = "app2sd_migrate.db";
 
@@ -1153,7 +1153,8 @@ TEST_F(SmokeTest, InstallExternalMode) {
 
 TEST_F(SmokeTest, MigrateLegacyExternalImageMode) {
   ASSERT_TRUE(CheckAvailableExternalPath());
-  bf::path path = kSmokePackagesDirectory / "MigrateLegacyExternalImageMode.wgt";
+  bf::path path =
+      kSmokePackagesDirectory / "MigrateLegacyExternalImageMode.wgt";
   std::string pkgid = "smokeapp36";
   std::string appid = "smokeapp36.web";
   bf::path legacy_path = kSmokePackagesDirectory / kLegacyExtImageDir;

diff --git a/src/wgt/extension_config_parser.cc b/src/wgt/extension_config_parser.cc
index 1a1258d..2409389 100755 (executable)
--- a/src/wgt/extension_config_parser.cc
+++ b/src/wgt/extension_config_parser.cc
@@ -12,6 +12,7 @@
 namespace wgt {
 
 namespace {
+
 const xmlChar kExtensionNodeKey[] = "extension";
 const xmlChar kNamePrivilegeKey[] = "privilege";
 const xmlChar kPrivigeNameAttributeKey[] = "name";
@@ -21,6 +22,7 @@ const char kXmlTextKey[] = "#text";
 const char kNamespaceKey[] = "@namespace";
 const char kExtensionPath[] = "extension.privilege";
 const char kExtensionNameKey[] = "@name";
+
 }  // namespace
 
 ExtensionConfigParser::ExtensionConfigParser(std::string config_xml)
@@ -186,4 +188,5 @@ std::vector<std::string> ExtensionConfigParser::GetExtensionPrivilegeList() {
   }
   return privilege_list;
 }
+
 }  // namespace wgt

diff --git a/src/wgt/extension_config_parser.h b/src/wgt/extension_config_parser.h
index c5cd454..915497e 100755 (executable)
--- a/src/wgt/extension_config_parser.h
+++ b/src/wgt/extension_config_parser.h
@@ -10,6 +10,7 @@
 #include <manifest_parser/values.h>
 #include <manifest_parser/manifest_util.h>
 
+#include <memory>
 #include <string>
 #include <map>
 #include <vector>
@@ -31,6 +32,7 @@ class ExtensionConfigParser {
       xmlNode* root, const std::string& inherit_dir = "");
   std::string config_xml_;
 };
+
 }  // namespace wgt
 
 #endif  // WGT_EXTENSION_CONFIG_PARSER_H_

diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index d9a96ba..01ae9bc 100644 (file)
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -54,7 +54,7 @@ const char kCategoryWearableClock[] =
     "http://tizen.org/category/wearable_clock";
 const char kCategoryWatchClock[] = "com.samsung.wmanager.WATCH_CLOCK";
 
-const std::string kManifestVersion = "1.0.0";
+const char kManifestVersion[] = "1.0.0";
 const char kTizenPackageXmlNamespace[] = "http://tizen.org/ns/packages";
 const char kImeCategoryName[] = "http://tizen.org/category/ime";
 const char kDownloadableFontCategoryName[] =
@@ -119,6 +119,7 @@ void AppendLabel(T* root, const std::string& label,
       strdup(locale.c_str()) : strdup(DEFAULT_LOCALE);
   root->label = g_list_append(root->label, label_item);
 }
+
 }  // namespace
 
 namespace wgt {

diff --git a/src/wgt/step/configuration/step_parse_recovery.cc b/src/wgt/step/configuration/step_parse_recovery.cc
index 8ff406d..36b472c 100644 (file)
--- a/src/wgt/step/configuration/step_parse_recovery.cc
+++ b/src/wgt/step/configuration/step_parse_recovery.cc
@@ -11,7 +11,7 @@ namespace {
 
 const char kResWgtPath[] = "res/wgt";
 
-}
+}  // namespace
 
 namespace wgt {
 namespace configuration {

diff --git a/src/wgt/step/encryption/step_encrypt_resources.cc b/src/wgt/step/encryption/step_encrypt_resources.cc
index 9c6b9d8..dc4b6ec 100644 (file)
--- a/src/wgt/step/encryption/step_encrypt_resources.cc
+++ b/src/wgt/step/encryption/step_encrypt_resources.cc
@@ -20,6 +20,7 @@
 #include <cstdlib>
 #include <set>
 #include <string>
+#include <memory>
 
 namespace {
 

diff --git a/src/wgt/step/encryption/step_remove_encryption_data.h b/src/wgt/step/encryption/step_remove_encryption_data.h
index 0fe8d67..691760b 100644 (file)
--- a/src/wgt/step/encryption/step_remove_encryption_data.h
+++ b/src/wgt/step/encryption/step_remove_encryption_data.h
@@ -33,6 +33,7 @@ class StepRemoveEncryptionData : public common_installer::Step {
 
   STEP_NAME(RemoveEncryptionData)
 };
+
 }  // namespace encryption
 }  // namespace wgt
 

diff --git a/src/wgt/step/security/step_check_extension_privileges.cc b/src/wgt/step/security/step_check_extension_privileges.cc
index 2e8d2a2..47f874e 100755 (executable)
--- a/src/wgt/step/security/step_check_extension_privileges.cc
+++ b/src/wgt/step/security/step_check_extension_privileges.cc
@@ -25,11 +25,13 @@
 #include "wgt/extension_config_parser.h"
 
 namespace {
+
 const char kPluginsDirectory[] = "/res/wgt/plugin/";
 const char kArchArmv7l[] = "armv7l";
 const char kArchI586[] = "i586";
 const char kArchDefault[] = "default";
-}
+
+}  // namespace
 
 namespace wgt {
 namespace security {

diff --git a/src/wgt/step/security/step_check_wgt_background_category.cc b/src/wgt/step/security/step_check_wgt_background_category.cc
index cd59ef6..b3d6a2c 100644 (file)
--- a/src/wgt/step/security/step_check_wgt_background_category.cc
+++ b/src/wgt/step/security/step_check_wgt_background_category.cc
@@ -10,7 +10,9 @@
 #include "wgt/wgt_backend_data.h"
 
 namespace {
+
 namespace ci_sec = common_installer::security;
+
 }  // namespace
 
 namespace wgt {

diff --git a/src/wgt/step/security/step_check_wgt_ime_privilege.cc b/src/wgt/step/security/step_check_wgt_ime_privilege.cc
index aedbbaf..2703b7e 100644 (file)
--- a/src/wgt/step/security/step_check_wgt_ime_privilege.cc
+++ b/src/wgt/step/security/step_check_wgt_ime_privilege.cc
@@ -13,8 +13,10 @@
 #include <string>
 
 namespace {
+
 const char kImeCategoryName[] = "http://tizen.org/category/ime";
-}
+
+}  // namespace
 
 namespace wgt {
 namespace security {
@@ -86,5 +88,6 @@ StepCheckWgtImePrivilege::CheckImePrivilege() const {
   LOG(DEBUG) << "Missing IME privilege.";
   return Status::PRIVILEGE_ERROR;
 }
+
 }  // namespace security
 }  // namespace wgt

diff --git a/src/wgt/step/security/step_check_wgt_ime_privilege.h b/src/wgt/step/security/step_check_wgt_ime_privilege.h
index 04f49c8..192ae2e 100644 (file)
--- a/src/wgt/step/security/step_check_wgt_ime_privilege.h
+++ b/src/wgt/step/security/step_check_wgt_ime_privilege.h
@@ -33,6 +33,7 @@ class StepCheckWgtImePrivilege :
 
   STEP_NAME(CheckWgtImePrivilege)
 };
+
 }  // namespace security
 }  // namespace wgt
 

diff --git a/src/wgt/step/security/step_check_wgt_notification_category.cc b/src/wgt/step/security/step_check_wgt_notification_category.cc
index 67eca45..8057035 100644 (file)
--- a/src/wgt/step/security/step_check_wgt_notification_category.cc
+++ b/src/wgt/step/security/step_check_wgt_notification_category.cc
@@ -9,9 +9,11 @@
 #include <manifest_parser/utils/logging.h>
 
 namespace {
+
 const char kNotificationCategoryName[]
     = "http://tizen.org/category/always_on_top";
-}
+
+}  // namespace
 
 namespace wgt {
 namespace security {

diff --git a/src/wgt/step/security/step_check_wgt_notification_category.h b/src/wgt/step/security/step_check_wgt_notification_category.h
index 842b531..1d52f71 100644 (file)
--- a/src/wgt/step/security/step_check_wgt_notification_category.h
+++ b/src/wgt/step/security/step_check_wgt_notification_category.h
@@ -27,6 +27,7 @@ class StepCheckWgtNotificationCategory :
 
   STEP_NAME(CheckWgtNotificationCategory)
 };
+
 }  // namespace security
 }  // namespace wgt
 

diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc
index 8c75226..a2bd61d 100644 (file)
--- a/src/wgt/wgt_app_query_interface.cc
+++ b/src/wgt/wgt_app_query_interface.cc
@@ -24,10 +24,10 @@
 #include <wgt_manifest_handlers/widget_handler.h>
 
 #include <memory>
+#include <utility>
 #include <string>
 #include <vector>
 
-
 namespace bf = boost::filesystem;
 namespace bs = boost::system;
 namespace ci = common_installer;

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 337f446..9413c22 100755 (executable)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -113,6 +113,87 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
   /* treat the request */
   switch (pkgmgr_->GetRequestType()) {
     case ci::RequestType::Install : {
+      InstallSteps();
+      break;
+    }
+    case ci::RequestType::Update: {
+      UpdateSteps();
+      break;
+    }
+    case ci::RequestType::Uninstall: {
+      UninstallSteps();
+      break;
+    }
+    case ci::RequestType::Reinstall: {
+      ReinstallSteps();
+      break;
+    }
+    case ci::RequestType::Delta: {
+      DeltaSteps();
+      break;
+    }
+    case ci::RequestType::Recovery: {
+      RecoverySteps();
+      break;
+    }
+    case ci::RequestType::MountInstall: {
+      MountInstallSteps();
+      break;
+    }
+    case ci::RequestType::MountUpdate: {
+      MountUpdateSteps();
+      break;
+    }
+    case ci::RequestType::ManifestDirectInstall: {
+      ManifestDirectInstallSteps();
+      break;
+    }
+    case ci::RequestType::ManifestDirectUpdate: {
+      ManifestDirectUpdateSteps();
+      break;
+    }
+    case ci::RequestType::ReadonlyUpdateInstall: {
+      ReadonlyUpdateInstallSteps();
+      break;
+    }
+    case ci::RequestType::ReadonlyUpdateUninstall: {
+      ReadonlyUpdateUninstallSteps();
+      break;
+    }
+    case ci::RequestType::ManifestPartialInstall: {
+      ManifestPartialInstallSteps();
+      break;
+    }
+    case ci::RequestType::ManifestPartialUpdate: {
+      ManifestPartialUpdateSteps();
+      break;
+    }
+    case ci::RequestType::PartialUninstall: {
+      ManifestPartialUninstallSteps();
+      break;
+    }
+    case ci::RequestType::Move: {
+      MoveSteps();
+      break;
+    }
+    case ci::RequestType::EnablePkg: {
+      EnablePkgSteps();
+      break;
+    }
+    case ci::RequestType::DisablePkg: {
+      DisablePkgSteps();
+      break;
+    }
+    case ci::RequestType::MigrateExtImg: {
+      MigrateExtImgSteps();
+      break;
+    }
+    default: {
+      DefaultSteps();
+    }
+  }
+}
+  void WgtInstaller::InstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       AddStep<wgt::configuration::StepParse>(
@@ -151,9 +232,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
           wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::Update: {
+  }
+
+  void WgtInstaller::UpdateSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       AddStep<wgt::configuration::StepParse>(
@@ -195,9 +276,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::Uninstall: {
+  }
+
+  void WgtInstaller::UninstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::pkgmgr::StepCheckRemovable>();
@@ -221,9 +302,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::security::StepRevokeSecurity>();
       AddStep<ci::pkgmgr::StepRemoveManifest>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::Reinstall: {
+  }
+
+  void WgtInstaller::ReinstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<wgt::configuration::StepCheckRDSManifest>();
       AddStep<wgt::configuration::StepParse>(
@@ -244,9 +325,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::security::StepUpdateSecurity>();
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::Delta: {
+  }
+
+  void WgtInstaller::DeltaSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       AddStep<wgt::configuration::StepParse>(
@@ -292,9 +373,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::Recovery: {
+  }
+
+  void WgtInstaller::RecoverySteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::recovery::StepOpenRecoveryFile>();
       AddStep<ci::configuration::StepParseManifest>(
@@ -311,9 +392,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepRecoverApplication>();
       AddStep<ci::filesystem::StepRecoverChangeOwner>();
       AddStep<ci::security::StepRecoverSecurity>();
-      break;
-    }
-    case ci::RequestType::MountInstall: {
+  }
+
+  void WgtInstaller::MountInstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::mount::StepMountUnpacked>();
       AddStep<wgt::configuration::StepParse>(
@@ -351,9 +432,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
           wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::MountUpdate: {
+  }
+
+  void WgtInstaller::MountUpdateSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::mount::StepMountUnpacked>();
       AddStep<wgt::configuration::StepParse>(
@@ -392,9 +473,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::ManifestDirectInstall: {
+  }
+
+  void WgtInstaller::ManifestDirectInstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
@@ -419,9 +500,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
           wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::ManifestDirectUpdate: {
+  }
+
+  void WgtInstaller::ManifestDirectUpdateSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
@@ -448,9 +529,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::ReadonlyUpdateInstall: {
+  }
+
+  void WgtInstaller::ReadonlyUpdateInstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::filesystem::StepUnzip>();
       AddStep<wgt::configuration::StepParse>(
@@ -489,9 +570,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::ReadonlyUpdateUninstall: {
+  }
+
+  void WgtInstaller::ReadonlyUpdateUninstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::pkgmgr::StepCheckRemovable>();
@@ -514,9 +595,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::security::StepUpdateSecurity>();
       AddStep<ci::pkgmgr::StepRemoveManifest>();
       AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-      break;
-    }
-    case ci::RequestType::ManifestPartialInstall: {
+  }
+
+  void WgtInstaller::ManifestPartialInstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
@@ -531,9 +612,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
           wgt::filesystem::WgtAdditionalSharedDirs);
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::ManifestPartialUpdate: {
+  }
+
+  void WgtInstaller::ManifestPartialUpdateSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
@@ -550,9 +631,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
           ci::Plugin::ActionType::Upgrade);
       AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
-      break;
-    }
-    case ci::RequestType::PartialUninstall: {
+  }
+
+  void WgtInstaller::ManifestPartialUninstallSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::pkgmgr::StepCheckRemovable>();
@@ -568,9 +649,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepUnregisterApplication>();
       AddStep<wgt::encryption::StepRemoveEncryptionData>();
       AddStep<ci::security::StepRevokeSecurity>();
-      break;
-    }
-    case ci::RequestType::Move: {
+  }
+
+  void WgtInstaller::MoveSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -578,9 +659,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::pkgmgr::StepKillApps>();
       AddStep<ci::filesystem::StepMoveInstalledStorage>();
       AddStep<ci::security::StepRegisterSecurity>();
-      break;
-    }
-    case ci::RequestType::EnablePkg: {
+  }
+
+  void WgtInstaller::EnablePkgSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -590,9 +671,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
         ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
         ci::Plugin::ActionType::Uninstall);
-      break;
-    }
-    case ci::RequestType::DisablePkg: {
+  }
+
+  void WgtInstaller::DisablePkgSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
@@ -602,18 +683,16 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
         ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
       AddStep<ci::pkgmgr::StepRunParserPlugin>(
         ci::Plugin::ActionType::Uninstall);
-      break;
-    }
-    case ci::RequestType::MigrateExtImg: {
+  }
+
+  void WgtInstaller::MigrateExtImgSteps() {
       AddStep<ci::configuration::StepConfigure>(pkgmgr_);
       AddStep<ci::security::StepMigrateLegacyExtImage>();
       AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
-      break;
-    }
-    default: {
+  }
+
+  void WgtInstaller::DefaultSteps() {
       AddStep<ci::configuration::StepFail>();
-    }
   }
-}
 
 }  // namespace wgt

diff --git a/src/wgt/wgt_installer.h b/src/wgt/wgt_installer.h
index 7a06a31..0c3a5e9 100644 (file)
--- a/src/wgt/wgt_installer.h
+++ b/src/wgt/wgt_installer.h
@@ -24,6 +24,28 @@ class WgtInstaller : public common_installer::AppInstaller {
    * \param pkgmgr pointer to pkgmgr
    */
   explicit WgtInstaller(common_installer::PkgMgrPtr pkgrmgr);
+
+ private:
+  void InstallSteps();
+  void UpdateSteps();
+  void UninstallSteps();
+  void ReinstallSteps();
+  void DeltaSteps();
+  void RecoverySteps();
+  void MountInstallSteps();
+  void MountUpdateSteps();
+  void ManifestDirectInstallSteps();
+  void ManifestDirectUpdateSteps();
+  void ReadonlyUpdateInstallSteps();
+  void ReadonlyUpdateUninstallSteps();
+  void ManifestPartialInstallSteps();
+  void ManifestPartialUpdateSteps();
+  void ManifestPartialUninstallSteps();
+  void MoveSteps();
+  void EnablePkgSteps();
+  void DisablePkgSteps();
+  void MigrateExtImgSteps();
+  void DefaultSteps();
 };
 
 }  // namespace wgt