AppliStation-All,リファクタリング。動作変更なし

diff --git a/AppliStation/PackageListViewForm.cs b/AppliStation/PackageListViewForm.cs
index 3c01042..b479a20 100644 (file)
--- a/AppliStation/PackageListViewForm.cs
+++ b/AppliStation/PackageListViewForm.cs
@@ -466,8 +466,8 @@ namespace AppliStation
                        if (pkg != null) {\r
                                if (pkg.Type == InstallerType.ARCHIVE || pkg.Type == InstallerType.ITSELF) {\r
                                        System.Diagnostics.Process.Start(Path.Combine(NaGet.Env.ArchiveProgramFiles, pkg.Name));\r
                        if (pkg != null) {\r
                                if (pkg.Type == InstallerType.ARCHIVE || pkg.Type == InstallerType.ITSELF) {\r
                                        System.Diagnostics.Process.Start(Path.Combine(NaGet.Env.ArchiveProgramFiles, pkg.Name));\r

-                               } else if (Directory.Exists(pkg.discoverInstalledLocation())) {\r
-                                       System.Diagnostics.Process.Start(pkg.discoverInstalledLocation());\r
+                               } else if (Directory.Exists(pkg.DiscoverInstalledLocation())) {\r
+                                       System.Diagnostics.Process.Start(pkg.DiscoverInstalledLocation());\r

                                }\r
                        }\r
                }\r
                                }\r
                        }\r
                }\r


@@ -504,11 +504,11 @@ namespace AppliStation
                                        bool launcherMenuItemVisible = \r
                                                (pkg.Type == InstallerType.ARCHIVE) ||\r
                                                (pkg.Type == InstallerType.ITSELF) ||\r
                                        bool launcherMenuItemVisible = \r
                                                (pkg.Type == InstallerType.ARCHIVE) ||\r
                                                (pkg.Type == InstallerType.ITSELF) ||\r

-                                               Directory.Exists(iPkg.discoverInstalledLocation());\r
+                                               Directory.Exists(iPkg.DiscoverInstalledLocation());\r

                                        \r
                                        launcherMenuItem.Visible = launcherMenuItemVisible;\r
                                        if (launcherMenuItemVisible) {\r
                                        \r
                                        launcherMenuItem.Visible = launcherMenuItemVisible;\r
                                        if (launcherMenuItemVisible) {\r

-                                               launcherMenuItem.BaseFolderPath = iPkg.discoverInstalledLocation();\r
+                                               launcherMenuItem.BaseFolderPath = iPkg.DiscoverInstalledLocation();\r

                                        }\r
                                } else {\r
                                        launcherMenuItem.Visible = false;\r
                                        }\r
                                } else {\r
                                        launcherMenuItem.Visible = false;\r

diff --git a/na-get-lib/NaGet.Packages.Install/InstalledPackage.cs b/na-get-lib/NaGet.Packages.Install/InstalledPackage.cs
index c5fac9f..3eda1cf 100644 (file)
--- a/na-get-lib/NaGet.Packages.Install/InstalledPackage.cs
+++ b/na-get-lib/NaGet.Packages.Install/InstalledPackage.cs
@@ -20,7 +20,7 @@ namespace NaGet.Packages.Install
                /// 解決を試みる。\r
                /// </summary>\r
                /// <returns>インストール先フォルダー。見つからなかったら<code>null</code></returns>\r
                /// 解決を試みる。\r
                /// </summary>\r
                /// <returns>インストール先フォルダー。見つからなかったら<code>null</code></returns>\r

-               public string discoverInstalledLocation()\r
+               public string DiscoverInstalledLocation()\r

                {\r
                        if (string.IsNullOrEmpty(UninstallInfo.InstallLocation)) {\r
                                // ○○/名前を探す\r
                {\r
                        if (string.IsNullOrEmpty(UninstallInfo.InstallLocation)) {\r
                                // ○○/名前を探す\r

diff --git a/na-get-lib/NaGet.Packages/PackageListsManager.cs b/na-get-lib/NaGet.Packages/PackageListsManager.cs
index 62c5aba..880d3e7 100644 (file)
--- a/na-get-lib/NaGet.Packages/PackageListsManager.cs
+++ b/na-get-lib/NaGet.Packages/PackageListsManager.cs
@@ -211,7 +211,7 @@ namespace NaGet.Packages
                /// インストールログのリストを作って返す。\r
                /// </summary>\r
                /// <returns>インストールログのリスト</returns>\r
                /// インストールログのリストを作って返す。\r
                /// </summary>\r
                /// <returns>インストールログのリスト</returns>\r

-               private List<InstallationLog> getSystemInstallerLog()\r
+               private static List<InstallationLog> getSystemInstallerLog()\r

                {\r
                        List<InstallationLog> systemInstalledLogList;\r
                        \r
                {\r
                        List<InstallationLog> systemInstalledLogList;\r
                        \r


@@ -228,7 +228,7 @@ namespace NaGet.Packages
                /// インストールログを保存する。\r
                /// </summary>\r
                /// <param name="systemInstalledLogList">インストールログデータ</param>\r
                /// インストールログを保存する。\r
                /// </summary>\r
                /// <param name="systemInstalledLogList">インストールログデータ</param>\r

-               private void setSystemInstallerLog(List<InstallationLog> systemInstalledLogList)\r
+               private static void setSystemInstallerLog(List<InstallationLog> systemInstalledLogList)\r

                {\r
                        NaGet.Utils.PutSerializeObject(NaGet.Env.SystemInstalledPackageLogFile, systemInstalledLogList);\r
                }\r
                {\r
                        NaGet.Utils.PutSerializeObject(NaGet.Env.SystemInstalledPackageLogFile, systemInstalledLogList);\r
                }\r