AppliStation-GUI,PackageListViewForm.csのリファクタリング

 - SelectedPackage{,s}をGetSelectedPackage{,s}に変更

diff --git a/AppliStation/PackageListViewForm.cs b/AppliStation/PackageListViewForm.cs
index 46da5ef..3870284 100644 (file)
--- a/AppliStation/PackageListViewForm.cs
+++ b/AppliStation/PackageListViewForm.cs
@@ -78,7 +78,7 @@ namespace AppliStation
                        uint uninstallPkgCount = 0;\r
                        bool installBtnEnabled, uninstallBtnEnabled;\r
                        \r
                        uint uninstallPkgCount = 0;\r
                        bool installBtnEnabled, uninstallBtnEnabled;\r
                        \r

-                       Package[] selectedPkgs = NaGet.Utils.IEnumerable2Array<Package>(SelectedPackages<Package>());\r
+                       Package[] selectedPkgs = NaGet.Utils.IEnumerable2Array<Package>(GetSelectedPackages<Package>());\r

                        foreach (Package pkg in selectedPkgs) {\r
                                if (pkg is InstalledPackage) {\r
                                        uninstallPkgCount ++;\r
                        foreach (Package pkg in selectedPkgs) {\r
                                if (pkg is InstalledPackage) {\r
                                        uninstallPkgCount ++;\r


@@ -389,7 +389,7 @@ namespace AppliStation
                {\r
                        InstallationConfirmForm confirm = new InstallationConfirmForm();\r
                        confirm.PkgListsManager = pkgListsMan;\r
                {\r
                        InstallationConfirmForm confirm = new InstallationConfirmForm();\r
                        confirm.PkgListsManager = pkgListsMan;\r

-                       confirm.Installations = Installation.ConvertInstallations( NaGet.Utils.IEnumerable2Array(SelectedPackages<Package>()) );\r
+                       confirm.Installations = Installation.ConvertInstallations( NaGet.Utils.IEnumerable2Array(GetSelectedPackages<Package>()) );\r

                        confirm.UseRunas = confirm.GetShouldUseRunas();\r
                        DialogResult result = confirm.ShowDialog(this);\r
                        \r
                        confirm.UseRunas = confirm.GetShouldUseRunas();\r
                        DialogResult result = confirm.ShowDialog(this);\r
                        \r


@@ -496,7 +496,7 @@ namespace AppliStation
                void UninstallToolStripButtonClick(object sender, EventArgs e)\r
                {\r
                        PackageUninstallConfirmForm confirm = new PackageUninstallConfirmForm();\r
                void UninstallToolStripButtonClick(object sender, EventArgs e)\r
                {\r
                        PackageUninstallConfirmForm confirm = new PackageUninstallConfirmForm();\r

-                       foreach (InstalledPackage pkg in SelectedPackages<InstalledPackage>()) {\r
+                       foreach (InstalledPackage pkg in GetSelectedPackages<InstalledPackage>()) {\r

                                confirm.UninstallPackage = pkg;\r
                                break;\r
                        }\r
                                confirm.UninstallPackage = pkg;\r
                                break;\r
                        }\r


@@ -519,7 +519,7 @@ namespace AppliStation
                \r
                void WebOfficialToolStripMenuItemClick(object sender, EventArgs e)\r
                {\r
                \r
                void WebOfficialToolStripMenuItemClick(object sender, EventArgs e)\r
                {\r

-                       foreach (Package pkg in SelectedPackages<Package>()) {\r
+                       foreach (Package pkg in GetSelectedPackages<Package>()) {\r

                                string linkURL = pkg.Url.Href;\r
                                \r
                                if (! (pkg == null || string.IsNullOrEmpty(linkURL))) {\r
                                string linkURL = pkg.Url.Href;\r
                                \r
                                if (! (pkg == null || string.IsNullOrEmpty(linkURL))) {\r


@@ -535,7 +535,7 @@ namespace AppliStation
                \r
                void WebGoogleSearchToolStripMenuItemClick(object sender, EventArgs e)\r
                {\r
                \r
                void WebGoogleSearchToolStripMenuItemClick(object sender, EventArgs e)\r
                {\r

-                       foreach (Package pkg in SelectedPackages<Package>()) {\r
+                       foreach (Package pkg in GetSelectedPackages<Package>()) {\r

                                string q = System.Web.HttpUtility.UrlEncode(pkg.Name, System.Text.Encoding.UTF8);\r
                                string googleURL = @"http://www.google.co.jp/search?q="+q;\r
                                \r
                                string q = System.Web.HttpUtility.UrlEncode(pkg.Name, System.Text.Encoding.UTF8);\r
                                string googleURL = @"http://www.google.co.jp/search?q="+q;\r
                                \r


@@ -551,7 +551,7 @@ namespace AppliStation
                \r
                void OpenInstalledDirectoryStripMenuItemClick(object sender, EventArgs e)\r
                {\r
                \r
                void OpenInstalledDirectoryStripMenuItemClick(object sender, EventArgs e)\r
                {\r

-                       foreach (InstalledPackage pkg in SelectedPackages<InstalledPackage>()) {\r
+                       foreach (InstalledPackage pkg in GetSelectedPackages<InstalledPackage>()) {\r

                                if (pkg.Type == InstallerType.ARCHIVE) {\r
                                        System.Diagnostics.Process.Start(Path.Combine(NaGet.Env.ArchiveProgramFiles, pkg.Name));\r
                                } else if (Directory.Exists(pkg.discoverInstalledLocation())) {\r
                                if (pkg.Type == InstallerType.ARCHIVE) {\r
                                        System.Diagnostics.Process.Start(Path.Combine(NaGet.Env.ArchiveProgramFiles, pkg.Name));\r
                                } else if (Directory.Exists(pkg.discoverInstalledLocation())) {\r


@@ -565,7 +565,7 @@ namespace AppliStation
                \r
                void PropertiesToolStripMenuItemClick(object sender, EventArgs e)\r
                {\r
                \r
                void PropertiesToolStripMenuItemClick(object sender, EventArgs e)\r
                {\r

-                       foreach (Package pkg in SelectedPackages<Package>()) {\r
+                       foreach (Package pkg in GetSelectedPackages<Package>()) {\r

                                PackageInfoForm form = new PackageInfoForm();\r
                                form.SelectedObject = pkg;\r
                                form.Text = string.Format("{0}({1})のプロパティ", pkg.Name, pkg.Version);\r
                                PackageInfoForm form = new PackageInfoForm();\r
                                form.SelectedObject = pkg;\r
                                form.Text = string.Format("{0}({1})のプロパティ", pkg.Name, pkg.Version);\r


@@ -593,7 +593,7 @@ namespace AppliStation
                        // 選択パッケージが1つのとき\r
                        bool selectionIsOnlyOne = packageListView.SelectedItems.Count == 1;\r
                        if (selectionIsOnlyOne) {\r
                        // 選択パッケージが1つのとき\r
                        bool selectionIsOnlyOne = packageListView.SelectedItems.Count == 1;\r
                        if (selectionIsOnlyOne) {\r

-                               Package pkg = SelectedPackage<Package>();\r
+                               Package pkg = GetSelectedPackage<Package>();\r

                                bool isInstalledPackage = pkg is InstalledPackage;\r
                                \r
                                webResourcesToolStripMenuItem.Text = string.Format(\r
                                bool isInstalledPackage = pkg is InstalledPackage;\r
                                \r
                                webResourcesToolStripMenuItem.Text = string.Format(\r


@@ -674,21 +674,18 @@ namespace AppliStation
                /// <summary>\r
                /// インストールするよう選択されたパッケージの配列\r
                /// </summary>\r
                /// <summary>\r
                /// インストールするよう選択されたパッケージの配列\r
                /// </summary>\r

-               public IEnumerable<TPackage> SelectedPackages<TPackage>() where TPackage : Package\r
+               public IEnumerable<TPackage> GetSelectedPackages<TPackage>() where TPackage : Package\r

                {\r
                {\r

-                       List<TPackage> pkgs = new List<TPackage>();\r

                        foreach (ListViewItem item in packageListView.SelectedItems) {\r
                        foreach (ListViewItem item in packageListView.SelectedItems) {\r

-                               pkgs.Add((TPackage) item.Tag);\r
+                               yield return (TPackage) item.Tag;\r

                        }\r
                        }\r

-                       \r
-                       return pkgs;\r

                }\r
                \r
                /// <summary>\r
                /// インストールするよう選択されたパッケージをひとつ返す。\r
                /// </summary>\r
                /// <returns>選択されたパッケージ(選択されていないときはnull)</returns>\r
                }\r
                \r
                /// <summary>\r
                /// インストールするよう選択されたパッケージをひとつ返す。\r
                /// </summary>\r
                /// <returns>選択されたパッケージ(選択されていないときはnull)</returns>\r

-               public TPackage SelectedPackage<TPackage>() where TPackage : Package\r
+               public TPackage GetSelectedPackage<TPackage>() where TPackage : Package\r

                {\r
                        foreach (ListViewItem item in packageListView.SelectedItems) {\r
                                return (TPackage) item.Tag;\r
                {\r
                        foreach (ListViewItem item in packageListView.SelectedItems) {\r
                                return (TPackage) item.Tag;\r