From 731f4b6e1eb57f6e9986ab6c38558c2831f1546a Mon Sep 17 00:00:00 2001 From: ttp Date: Sat, 31 Oct 2009 12:30:04 +0900 Subject: [PATCH] =?utf8?q?AppliStation-GUI,na-get-lib,ListView=E8=A1=A8?= =?utf8?q?=E7=A4=BA=E9=AB=98=E9=80=9F=E5=8C=96=E3=81=AA=E3=81=A9=E3=81=AE?= =?utf8?q?=E3=83=91=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=B3=E3=82=B9?= =?utf8?q?=E5=90=91=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- AppliStation/PackageListView.cs | 3 +++ AppliStation/UserPrefForm.cs | 2 +- na-get-lib/NaGet.Packages/PackageList.cs | 6 +++++- na-get-lib/NaGet.SubCommands/NaGetUpdate.cs | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/AppliStation/PackageListView.cs b/AppliStation/PackageListView.cs index bfc7d25..481ed74 100644 --- a/AppliStation/PackageListView.cs +++ b/AppliStation/PackageListView.cs @@ -142,6 +142,7 @@ namespace AppliStation string ImageKeySystem = ImageCategory_ToString(ImageCategory.System); string keyword = filteringKeyword ?? string.Empty; + this.BeginUpdate(); this.Items.Clear(); // ソフトリストの中身のパッケージ @@ -177,6 +178,8 @@ namespace AppliStation } } + this.EndUpdate(); + this.Refresh(); } diff --git a/AppliStation/UserPrefForm.cs b/AppliStation/UserPrefForm.cs index d9b7baf..b9c3ba2 100644 --- a/AppliStation/UserPrefForm.cs +++ b/AppliStation/UserPrefForm.cs @@ -312,7 +312,7 @@ namespace AppliStation /// 指定された設定オブジェクトをファイルとして保存する /// /// 設定ファイル - private void commitNaGetLibPref(NaGet.NaGetLibPref pref) + private static void commitNaGetLibPref(NaGet.NaGetLibPref pref) { // ファイルに書き込む string path = NaGet.Env.PrefPath; diff --git a/na-get-lib/NaGet.Packages/PackageList.cs b/na-get-lib/NaGet.Packages/PackageList.cs index cc27f11..e8f76fe 100644 --- a/na-get-lib/NaGet.Packages/PackageList.cs +++ b/na-get-lib/NaGet.Packages/PackageList.cs @@ -173,7 +173,11 @@ namespace NaGet.Packages /// マッチしたパッケージのイテレータ public IEnumerable Search(string key) { - return Search(GetPredicateForSearch(key)); + if (string.IsNullOrEmpty(key)) { + return packageArrayList.AsReadOnly(); + } else { + return Search(GetPredicateForSearch(key)); + } } /// diff --git a/na-get-lib/NaGet.SubCommands/NaGetUpdate.cs b/na-get-lib/NaGet.SubCommands/NaGetUpdate.cs index 6198921..f105971 100644 --- a/na-get-lib/NaGet.SubCommands/NaGetUpdate.cs +++ b/na-get-lib/NaGet.SubCommands/NaGetUpdate.cs @@ -129,7 +129,7 @@ namespace NaGet.SubCommands // RepositoryReferenceの名前を読み込む // TODO RepositoryReferenceの名前を読み込む処理はここでいいのか? repo.Name = (string.IsNullOrEmpty(pkgList.Name))? repo.Name : pkgList.Name; - avaiablePackageList.AddPackages(pkgList.Packages); + avaiablePackageList.AddPackages(pkgList); } catch (InvalidOperationException) { RaiseTaskSetEvent(NaGetTaskSetEventType.ERROR, string.Format("Repository {0} does not have a AppliStation Native XML softlist.", repo.Name ?? repo.Url.Href)); } -- 2.11.0