OSDN Git Service

na-get-lib,RepositoriesListからObsoleteプロパティのUrlsを削除。その他コメント修正
authorttp <ttp@users.sourceforge.jp>
Fri, 8 May 2009 17:19:53 +0000 (02:19 +0900)
committerttp <ttp@users.sourceforge.jp>
Fri, 8 May 2009 17:19:53 +0000 (02:19 +0900)
na-get-lib/NaGet.Net/Downloader.cs
na-get-lib/NaGet.Packages/Platform.cs
na-get-lib/NaGet.Packages/RepositoriesList.cs
na-get-lib/NaGet.SubCommands/NaGetUpdate.cs

index e5ebdee..f4c3670 100644 (file)
@@ -139,14 +139,23 @@ public class Downloader : NaGetTask
                }\r
        }\r
        \r
+       /// <summary>\r
+       /// 処理が終了したか否かのフラグ\r
+       /// </summary>\r
        public override bool Done {\r
                get { return done; }\r
        }\r
        \r
+       /// <summary>\r
+       /// 現在ダウンロード処理実行中であるかのフラグ\r
+       /// </summary>\r
        public override bool Running {\r
                get { return request != null && (!done); }\r
        }\r
 \r
+       /// <summary>\r
+       /// ダウンロード処理を実行する\r
+       /// </summary>\r
        public override void Run()\r
        {\r
                RaiseDownloadEvent(DownloadEventType.INITED, 0, -1);\r
@@ -292,10 +301,17 @@ public class Downloader : NaGetTask
                }\r
        }\r
        \r
+       /// <summary>\r
+       /// キャンセル可能かを返す\r
+       /// </summary>\r
        public override bool Cancelable {\r
                get { return !(this.Done || cancelCalled); }\r
        }\r
        \r
+       /// <summary>\r
+       /// ダウンロード処理をキャンセルする\r
+       /// </summary>\r
+       /// <returns>キャンセルに成功したときtrue</returns>\r
        public override bool Cancel()\r
        {\r
                if (this.Done || cancelCalled) {\r
index 769c094..2139d30 100644 (file)
@@ -122,9 +122,9 @@ namespace NaGet.Packages
                }\r
                \r
                /// <summary>\r
-               /// ç\8f¾å\9c¨ã\81®ã\83\9eã\82·ã\83³ã\81®ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£ã\82\92å¾\97ã\82\8b\r
+               /// ç\8f¾å\9c¨ã\81®ã\83\9eã\82·ã\83³ã\81§å\8b\95ã\81\8fã\81\8bã\82\92è¿\94ã\81\99\r
                /// </summary>\r
-               /// <returns>ç\8f¾å\9c¨ã\81®ã\83\9eã\82·ã\83³ã\81®ã\82¢ã\83¼ã\82­ã\83\86ã\82¯ã\83\81ã\83£</returns>\r
+               /// <returns>ç\8f¾å\9c¨ã\81®ã\83\9eã\82·ã\83³ã\81§å\8b\95ã\81\8fã\81\8b</returns>\r
                public bool IsRunnableOS()\r
                {\r
                        if (OsType == null || OsType.Length <= 0) {\r
index 8835115..d21ad5e 100644 (file)
@@ -5,23 +5,34 @@ using System.Collections.Generic;
 namespace NaGet.Packages\r
 {\r
        /// <summary>\r
-       /// Description of RepositoriesList.\r
+       /// レポジトリのリストを表現するクラス\r
        /// </summary>\r
        public class RepositoriesList\r
        {\r
-               public RepositoryReference[] Repositories;\r
+               /// <summary>\r
+               /// レポジトリの配列\r
+               /// </summary>\r
+               public RepositoryInfo[] Repositories = null;\r
                \r
+               /// <summary>\r
+               /// デフォルトコンストラクタ\r
+               /// </summary>\r
                public RepositoriesList()\r
                {\r
                }\r
                \r
+               /// <summary>\r
+               /// provider.list.txtから変換してRepositoriesListとして返す\r
+               /// </summary>\r
+               /// <param name="path">変換もとのprovider.list.txtのパス</param>\r
+               /// <returns>変換されたRepositoriesList</returns>\r
                public static RepositoriesList MigrateFromProviderListTxt(string path)\r
                {\r
-                       List<RepositoryReference> repos = new List<RepositoryReference>();\r
+                       List<RepositoryInfo> repos = new List<RepositoryInfo>();\r
                        using(System.IO.StreamReader reader = new System.IO.StreamReader(path)) {\r
                                string line;\r
                                while ((line = reader.ReadLine()) != null) {\r
-                                       RepositoryReference repo = new RepositoryReference();\r
+                                       RepositoryInfo repo = new RepositoryInfo();\r
                                        repo.Enabled = true;\r
                                        repo.Url = new LocationEntry(line);\r
                                        repo.Name = string.Empty;\r
@@ -33,31 +44,27 @@ namespace NaGet.Packages
                        repolist.Repositories = repos.ToArray();\r
                        return repolist;\r
                }\r
-               \r
-               /// <summary>\r
-               /// urls of repositories.\r
-               /// </summary>\r
-               [XmlIgnore]\r
-               [Obsolete]\r
-               public string[] Urls\r
-               {\r
-                       get {\r
-                               string[] urls = new string[Repositories.Length];\r
-                               for (int i = 0; i < urls.Length; i++) {\r
-                                       urls[i] = Repositories[i].Url.Href;\r
-                               }\r
-                               return urls;\r
-                       }\r
-               }\r
        }\r
        \r
-       public sealed class RepositoryReference\r
+       /// <summary>\r
+       /// パッケージリストを提供するレポジトリの参照情報を格納するクラス\r
+       /// </summary>\r
+       public sealed class RepositoryInfo\r
        {\r
+               /// <summary>\r
+               /// レポジトリの提供するソフトリストの名称\r
+               /// </summary>\r
                [XmlAttribute]\r
                public string Name;\r
                \r
+               /// <summary>\r
+               /// ソフトリストの取得先URL\r
+               /// </summary>\r
                public LocationEntry Url;\r
                \r
+               /// <summary>\r
+               /// ソフトリストを読み取るか否か(無視するか否か)のフラグ。\r
+               /// </summary>\r
                [XmlAttribute]\r
                public bool Enabled = true;\r
        }\r
index 56efa21..f1533de 100644 (file)
@@ -65,7 +65,7 @@ namespace NaGet.SubCommands
                                        repoList = NaGet.Utils.GetDeserializedObject<RepositoriesList>(NaGet.Env.RepositoriesListFile);\r
                                }\r
                                \r
-                               foreach (RepositoryReference repo in repoList.Repositories) {\r
+                               foreach (RepositoryInfo repo in repoList.Repositories) {\r
                                        taskSetNames.Add(string.Format("リスト取得: {0}", repo.Url.Href));\r
                                }\r
                                taskSetNames.Add(string.Format("リスト更新: {0}", NaGet.Env.PackageListFile));\r
@@ -113,7 +113,7 @@ namespace NaGet.SubCommands
                private void runDownloadPackages()\r
                {\r
                        PackageList<Package> avaiablePackageList = new PackageList<Package>();\r
-                       foreach(RepositoryReference repo in repoList.Repositories) {\r
+                       foreach(RepositoryInfo repo in repoList.Repositories) {\r
                                RaiseTaskSetEvent(NaGetTaskSetEventType.STARTED_TASKSET, TaskSetNames[currentTaskSetIndex]);\r
                                \r
                                string tmpfileName = Path.GetTempFileName();\r