na-get-lib,設定ファイルpref.xmlの導入。

[applistation/AppliStation.git] / na-get-lib / NaGet.Net / Downloader.cs

diff --git a/na-get-lib/NaGet.Net/Downloader.cs b/na-get-lib/NaGet.Net/Downloader.cs
index 17dc4de..e5ebdee 100644 (file)
--- a/na-get-lib/NaGet.Net/Downloader.cs
+++ b/na-get-lib/NaGet.Net/Downloader.cs
@@ -63,15 +63,7 @@ public enum DownloadEventType {
 /// </summary>\r
 public class Downloader : NaGetTask\r
 {\r
-       /// <summary>\r
-       /// デフォルトで使うプロキシ\r
-       /// </summary>\r
-       public static IWebProxy DefaultProxy = WebRequest.GetSystemWebProxy();\r
-       \r
-       /// <summary>\r
-       /// 通信に使うプロキシ\r
-       /// </summary>\r
-       public IWebProxy Proxy;\r
+       public IWebProxy proxy;\r
        \r
        /// <summary>\r
        /// イベントハンドラ\r
@@ -113,6 +105,14 @@ public class Downloader : NaGetTask
        private string downloadedFileName = null;\r
        \r
        /// <summary>\r
+       /// ウェブアクセスに使うプロキシ\r
+       /// </summary>\r
+       public IWebProxy Proxy {\r
+               get { return proxy ?? NaGet.Env.WebProxy; }\r
+               set { proxy = value; }\r
+       }\r
+       \r
+       /// <summary>\r
        /// ダウンロード時にHTTPヘッダなどから取得した本来のファイル名\r
        /// </summary>\r
        public string DownloadedFileName {\r
@@ -153,7 +153,7 @@ public class Downloader : NaGetTask
                \r
                try {\r
                        request = WebRequest.Create(url);\r
-                       request.Proxy = (Proxy == null)? DefaultProxy : Proxy;\r
+                       request.Proxy = this.Proxy;\r
                        request.CachePolicy = new System.Net.Cache.RequestCachePolicy(CacheLevel);\r
                        \r
                        if (cancelCalled) {\r