Convert all url usages to use the Uri class instead of raw strings.

[pithos-ms-client] / trunk / Pithos.Core / Agents / FileAgent.cs

diff --git a/trunk/Pithos.Core/Agents/FileAgent.cs b/trunk/Pithos.Core/Agents/FileAgent.cs
index e1db414..bfa14ef 100644 (file)
--- a/trunk/Pithos.Core/Agents/FileAgent.cs
+++ b/trunk/Pithos.Core/Agents/FileAgent.cs
@@ -45,7 +45,6 @@ using System.Diagnostics.Contracts;
 using System.IO;\r
 using System.Linq;\r
 using System.Reflection;\r
-using System.Threading.Tasks;\r
 using Pithos.Interfaces;\r
 using Pithos.Network;\r
 using log4net;\r
@@ -360,7 +359,7 @@ namespace Pithos.Core.Agents
             return monitoredFiles;\r
         }                \r
 \r
-        public IEnumerable<string> EnumerateFilesAsRelativeUrls(string searchPattern="*")\r
+        public IEnumerable<Uri> EnumerateFilesAsRelativeUrls(string searchPattern="*")\r
         {\r
             var rootDir = new DirectoryInfo(RootPath);\r
             var monitoredFiles = from file in rootDir.EnumerateFiles(searchPattern, SearchOption.AllDirectories)\r
@@ -370,7 +369,7 @@ namespace Pithos.Core.Agents
             return monitoredFiles;\r
         }                \r
 \r
-        public IEnumerable<string> EnumerateFilesSystemInfosAsRelativeUrls(string searchPattern="*")\r
+        public IEnumerable<Uri> EnumerateFilesSystemInfosAsRelativeUrls(string searchPattern="*")\r
         {\r
             var rootDir = new DirectoryInfo(RootPath);\r
             var monitoredFiles = from file in rootDir.EnumerateFileSystemInfos(searchPattern, SearchOption.AllDirectories)\r
@@ -524,7 +523,7 @@ namespace Pithos.Core.Agents
 \r
 \r
 \r
-        private Dictionary<WatcherChangeTypes, FileStatus> _statusDict = new Dictionary<WatcherChangeTypes, FileStatus>\r
+        private readonly Dictionary<WatcherChangeTypes, FileStatus> _statusDict = new Dictionary<WatcherChangeTypes, FileStatus>\r
                                                                              {\r
             {WatcherChangeTypes.Created,FileStatus.Created},\r
             {WatcherChangeTypes.Changed,FileStatus.Modified},\r
@@ -532,7 +531,7 @@ namespace Pithos.Core.Agents
             {WatcherChangeTypes.Renamed,FileStatus.Renamed}\r
         };\r
 \r
-        private Dictionary<string, string> _ignoreFiles=new Dictionary<string, string>();\r
+        private readonly Dictionary<string, string> _ignoreFiles=new Dictionary<string, string>();\r
 \r
         private WorkflowState UpdateFileStatus(WorkflowState state)\r
         {\r