Exception parameters have been added.

VLAD · VLAD · commit 4b642bfc9199 · 2018-04-06T18:42:45.000+03:00
diff --git a/FastSearchLibrary/DirectorySearcher/DirectorySearcher.cs b/FastSearchLibrary/DirectorySearcher/DirectorySearcher.cs
@@ -188,39 +188,39 @@ public DirectorySearcher(string folder, Func<DirectoryInfo, bool> isValid, Cance
         private void CheckFolder(string folder)
         {
             if (folder == null)
-                throw new ArgumentNullException("Argument \"folder\" is null.");
+                throw new ArgumentNullException(nameof(folder), "Argument is null.");
 
             if (folder == String.Empty)
-                throw new ArgumentException("Argument \"folder\" is not valid.");
+                throw new ArgumentException("Argument is not valid.", nameof(folder));
 
             DirectoryInfo dir = new DirectoryInfo(folder);
 
             if (!dir.Exists)
-                throw new ArgumentException("Argument \"folder\" does not represent an existing directory.");
+                throw new ArgumentException("Argument does not represent an existing directory.", nameof(folder));
         }
 
 
         private void CheckPattern(string pattern)
         {
             if (pattern == null)
-                throw new ArgumentNullException("Argument \"pattern\" is null.");
+                throw new ArgumentNullException(nameof(pattern), "Argument is null.");
 
             if (pattern == String.Empty)
-                throw new ArgumentException("Argument \"pattern\" is not valid.");
+                throw new ArgumentException("Argument is not valid.", nameof(pattern));
         }
 
 
         private void CheckDelegate(Func<DirectoryInfo, bool> isValid)
         {
             if (isValid == null)
-                throw new ArgumentNullException("Argument \"isValid\" is null.");
+                throw new ArgumentNullException(nameof(isValid), "Argument is null.");
         }
 
 
         private void CheckTokenSource(CancellationTokenSource tokenSource)
         {
             if (tokenSource == null)
-                throw new ArgumentNullException("Argument \"tokenSource\" is null.");
+                throw new ArgumentNullException(nameof(tokenSource), "Argument \"tokenSource\" is null.");
         }
 
         #endregion
diff --git a/FastSearchLibrary/DirectorySearcher/DirectorySearcherMultiple.cs b/FastSearchLibrary/DirectorySearcher/DirectorySearcherMultiple.cs
@@ -211,42 +211,42 @@ public DirectorySearcherMultiple(List<string> folders, CancellationTokenSource t
             #region Checking methods
 
             private void CheckFolder(string folder)
-                {
-                    if (folder == null)
-                        throw new ArgumentNullException("Argument \"folder\" is null.");
+            {
+                if (folder == null)
+                    throw new ArgumentNullException(nameof(folder), "Argument is null.");
 
-                    if (folder == String.Empty)
-                        throw new ArgumentException("Argument \"folder\" is not valid.");
+                if (folder == String.Empty)
+                    throw new ArgumentException("Argument is not valid.", nameof(folder));
 
-                    DirectoryInfo dir = new DirectoryInfo(folder);
+                DirectoryInfo dir = new DirectoryInfo(folder);
 
-                    if (!dir.Exists)
-                        throw new ArgumentException("Argument \"folder\" does not represent an existing directory.");
-                }
+                if (!dir.Exists)
+                    throw new ArgumentException("Argument does not represent an existing directory.", nameof(folder));
+            }
 
 
-                private void CheckPattern(string pattern)
-                {
-                    if (pattern == null)
-                        throw new ArgumentNullException("Argument \"pattern\" is null.");
+            private void CheckPattern(string pattern)
+            {
+                if (pattern == null)
+                    throw new ArgumentNullException(nameof(pattern), "Argument is null.");
 
-                    if (pattern == String.Empty)
-                        throw new ArgumentException("Argument \"pattern\" is not valid.");
-                }
+                if (pattern == String.Empty)
+                    throw new ArgumentException("Argument is not valid.", nameof(pattern));
+            }
 
 
-                private void CheckDelegate(Func<DirectoryInfo, bool> isValid)
-                {
-                    if (isValid == null)
-                        throw new ArgumentNullException("Argument \"isValid\" is null.");
-                }
+            private void CheckDelegate(Func<DirectoryInfo, bool> isValid)
+            {
+                if (isValid == null)
+                    throw new ArgumentNullException(nameof(isValid), "Argument is null.");
+            }
 
 
-                private void CheckTokenSource(CancellationTokenSource tokenSource)
-                {
-                    if (tokenSource == null)
-                        throw new ArgumentNullException("Argument \"tokenSource\" is null.");
-                }
+            private void CheckTokenSource(CancellationTokenSource tokenSource)
+            {
+                if (tokenSource == null)
+                    throw new ArgumentNullException(nameof(tokenSource), "Argument is null.");
+            }
 
             #endregion
 
diff --git a/FastSearchLibrary/FileSearcher/FileSearcher.cs b/FastSearchLibrary/FileSearcher/FileSearcher.cs
@@ -265,39 +265,39 @@ public FileSearcher(string folder, Func<FileInfo, bool> isValid, CancellationTok
         private void CheckFolder(string folder)
         {
             if (folder == null)
-                throw new ArgumentNullException("Argument \"folder\" is null.");
+                throw new ArgumentNullException(nameof(folder), "Argument is null.");
               
             if (folder == String.Empty)
-                throw new ArgumentException("Argument \"folder\" is not valid.");
+                throw new ArgumentException("Argument is not valid.", nameof(folder));
 
             DirectoryInfo dir = new DirectoryInfo(folder);
 
             if (!dir.Exists)
-                throw new ArgumentException("Argument \"folder\" does not represent an existing directory.");
+                throw new ArgumentException("Argument does not represent an existing directory.", nameof(folder));
         }
 
 
         private void CheckPattern(string pattern)
         {
             if (pattern == null)
-                throw new ArgumentNullException("Argument \"pattern\" is null.");
+                throw new ArgumentNullException(nameof(pattern), "Argument is null.");
 
             if (pattern == String.Empty)
-                throw new ArgumentException("Argument \"pattern\" is not valid.");
+                throw new ArgumentException("Argument is not valid.", nameof(pattern));
         }
 
 
         private void CheckDelegate(Func<FileInfo, bool> isValid)
         {
             if (isValid == null)
-                throw new ArgumentNullException("Argument \"isValid\" is null.");
+                throw new ArgumentNullException(nameof(isValid), "Argument is null.");
         }
 
 
         private void CheckTokenSource(CancellationTokenSource tokenSource)
         {
             if (tokenSource == null)
-                throw new ArgumentNullException("Argument \"tokenSource\" is null.");
+                throw new ArgumentNullException(nameof(tokenSource), "Argument is null.");
         }
  
 
diff --git a/FastSearchLibrary/FileSearcher/FileSearcherMultiple.cs b/FastSearchLibrary/FileSearcher/FileSearcherMultiple.cs
@@ -210,39 +210,39 @@ public FileSearcherMultiple(List<string> folders, CancellationTokenSource tokenS
         private void CheckFolder(string folder)
         {
             if (folder == null)
-                throw new ArgumentNullException("Argument \"folder\" is null.");
+                throw new ArgumentNullException(nameof(folder), "Argument is null.");
 
             if (folder == String.Empty)
-                throw new ArgumentException("Argument \"folder\" is not valid.");
+                throw new ArgumentException("Argument is not valid.", nameof(folder));
 
             DirectoryInfo dir = new DirectoryInfo(folder);
 
             if (!dir.Exists)
-                throw new ArgumentException("Argument \"folder\" does not represent an existing directory.");
+                throw new ArgumentException("Argument does not represent an existing directory.", nameof(folder));
         }
 
 
         private void CheckPattern(string pattern)
         {
             if (pattern == null)
-                throw new ArgumentNullException("Argument \"pattern\" is null.");
+                throw new ArgumentNullException(nameof(pattern), "Argument is null.");
 
             if (pattern == String.Empty)
-                throw new ArgumentException("Argument \"pattern\" is not valid.");
+                throw new ArgumentException("Argument is not valid.", nameof(pattern));
         }
 
 
         private void CheckDelegate(Func<FileInfo, bool> isValid)
         {
             if (isValid == null)
-                throw new ArgumentNullException("Argument \"isValid\" is null.");
+                throw new ArgumentNullException(nameof(isValid), "Argument is null.");
         }
 
 
         private void CheckTokenSource(CancellationTokenSource tokenSource)
         {
             if (tokenSource == null)
-                throw new ArgumentNullException("Argument \"tokenSource\" is null.");
+                throw new ArgumentNullException(nameof(tokenSource), "Argument is null.");
         }
 
 
diff --git a/FastSearchLibrary/Properties/AssemblyInfo.cs b/FastSearchLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.5.1")]
-[assembly: AssemblyFileVersion("1.1.5.1")]
+[assembly: AssemblyVersion("1.1.6.0")]
+[assembly: AssemblyFileVersion("1.1.6.0")]

Original file line number	Diff line number	Diff line change
`@@ -188,39 +188,39 @@ public DirectorySearcher(string folder, Func<DirectoryInfo, bool> isValid, Cance`
`188`	`188`	`private void CheckFolder(string folder)`
`189`	`189`	`{`
`190`	`190`	`if (folder == null)`
`191`		`- throw new ArgumentNullException("Argument \"folder\" is null.");`
	`191`	`+ throw new ArgumentNullException(nameof(folder), "Argument is null.");`
`192`	`192`
`193`	`193`	`if (folder == String.Empty)`
`194`		`- throw new ArgumentException("Argument \"folder\" is not valid.");`
	`194`	`+ throw new ArgumentException("Argument is not valid.", nameof(folder));`
`195`	`195`
`196`	`196`	`DirectoryInfo dir = new DirectoryInfo(folder);`
`197`	`197`
`198`	`198`	`if (!dir.Exists)`
`199`		`- throw new ArgumentException("Argument \"folder\" does not represent an existing directory.");`
	`199`	`+ throw new ArgumentException("Argument does not represent an existing directory.", nameof(folder));`
`200`	`200`	`}`
`201`	`201`
`202`	`202`
`203`	`203`	`private void CheckPattern(string pattern)`
`204`	`204`	`{`
`205`	`205`	`if (pattern == null)`
`206`		`- throw new ArgumentNullException("Argument \"pattern\" is null.");`
	`206`	`+ throw new ArgumentNullException(nameof(pattern), "Argument is null.");`
`207`	`207`
`208`	`208`	`if (pattern == String.Empty)`
`209`		`- throw new ArgumentException("Argument \"pattern\" is not valid.");`
	`209`	`+ throw new ArgumentException("Argument is not valid.", nameof(pattern));`
`210`	`210`	`}`
`211`	`211`
`212`	`212`
`213`	`213`	`private void CheckDelegate(Func<DirectoryInfo, bool> isValid)`
`214`	`214`	`{`
`215`	`215`	`if (isValid == null)`
`216`		`- throw new ArgumentNullException("Argument \"isValid\" is null.");`
	`216`	`+ throw new ArgumentNullException(nameof(isValid), "Argument is null.");`
`217`	`217`	`}`
`218`	`218`
`219`	`219`
`220`	`220`	`private void CheckTokenSource(CancellationTokenSource tokenSource)`
`221`	`221`	`{`
`222`	`222`	`if (tokenSource == null)`
`223`		`- throw new ArgumentNullException("Argument \"tokenSource\" is null.");`
	`223`	`+ throw new ArgumentNullException(nameof(tokenSource), "Argument \"tokenSource\" is null.");`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -265,39 +265,39 @@ public FileSearcher(string folder, Func<FileInfo, bool> isValid, CancellationTok`
`265`	`265`	`private void CheckFolder(string folder)`
`266`	`266`	`{`
`267`	`267`	`if (folder == null)`
`268`		`- throw new ArgumentNullException("Argument \"folder\" is null.");`
	`268`	`+ throw new ArgumentNullException(nameof(folder), "Argument is null.");`
`269`	`269`
`270`	`270`	`if (folder == String.Empty)`
`271`		`- throw new ArgumentException("Argument \"folder\" is not valid.");`
	`271`	`+ throw new ArgumentException("Argument is not valid.", nameof(folder));`
`272`	`272`
`273`	`273`	`DirectoryInfo dir = new DirectoryInfo(folder);`
`274`	`274`
`275`	`275`	`if (!dir.Exists)`
`276`		`- throw new ArgumentException("Argument \"folder\" does not represent an existing directory.");`
	`276`	`+ throw new ArgumentException("Argument does not represent an existing directory.", nameof(folder));`
`277`	`277`	`}`
`278`	`278`
`279`	`279`
`280`	`280`	`private void CheckPattern(string pattern)`
`281`	`281`	`{`
`282`	`282`	`if (pattern == null)`
`283`		`- throw new ArgumentNullException("Argument \"pattern\" is null.");`
	`283`	`+ throw new ArgumentNullException(nameof(pattern), "Argument is null.");`
`284`	`284`
`285`	`285`	`if (pattern == String.Empty)`
`286`		`- throw new ArgumentException("Argument \"pattern\" is not valid.");`
	`286`	`+ throw new ArgumentException("Argument is not valid.", nameof(pattern));`
`287`	`287`	`}`
`288`	`288`
`289`	`289`
`290`	`290`	`private void CheckDelegate(Func<FileInfo, bool> isValid)`
`291`	`291`	`{`
`292`	`292`	`if (isValid == null)`
`293`		`- throw new ArgumentNullException("Argument \"isValid\" is null.");`
	`293`	`+ throw new ArgumentNullException(nameof(isValid), "Argument is null.");`
`294`	`294`	`}`
`295`	`295`
`296`	`296`
`297`	`297`	`private void CheckTokenSource(CancellationTokenSource tokenSource)`
`298`	`298`	`{`
`299`	`299`	`if (tokenSource == null)`
`300`		`- throw new ArgumentNullException("Argument \"tokenSource\" is null.");`
	`300`	`+ throw new ArgumentNullException(nameof(tokenSource), "Argument is null.");`
`301`	`301`	`}`
`302`	`302`
`303`	`303`
Original file line number	Diff line number	Diff line change
`@@ -210,39 +210,39 @@ public FileSearcherMultiple(List<string> folders, CancellationTokenSource tokenS`
`210`	`210`	`private void CheckFolder(string folder)`
`211`	`211`	`{`
`212`	`212`	`if (folder == null)`
`213`		`- throw new ArgumentNullException("Argument \"folder\" is null.");`
	`213`	`+ throw new ArgumentNullException(nameof(folder), "Argument is null.");`
`214`	`214`
`215`	`215`	`if (folder == String.Empty)`
`216`		`- throw new ArgumentException("Argument \"folder\" is not valid.");`
	`216`	`+ throw new ArgumentException("Argument is not valid.", nameof(folder));`
`217`	`217`
`218`	`218`	`DirectoryInfo dir = new DirectoryInfo(folder);`
`219`	`219`
`220`	`220`	`if (!dir.Exists)`
`221`		`- throw new ArgumentException("Argument \"folder\" does not represent an existing directory.");`
	`221`	`+ throw new ArgumentException("Argument does not represent an existing directory.", nameof(folder));`
`222`	`222`	`}`
`223`	`223`
`224`	`224`
`225`	`225`	`private void CheckPattern(string pattern)`
`226`	`226`	`{`
`227`	`227`	`if (pattern == null)`
`228`		`- throw new ArgumentNullException("Argument \"pattern\" is null.");`
	`228`	`+ throw new ArgumentNullException(nameof(pattern), "Argument is null.");`
`229`	`229`
`230`	`230`	`if (pattern == String.Empty)`
`231`		`- throw new ArgumentException("Argument \"pattern\" is not valid.");`
	`231`	`+ throw new ArgumentException("Argument is not valid.", nameof(pattern));`
`232`	`232`	`}`
`233`	`233`
`234`	`234`
`235`	`235`	`private void CheckDelegate(Func<FileInfo, bool> isValid)`
`236`	`236`	`{`
`237`	`237`	`if (isValid == null)`
`238`		`- throw new ArgumentNullException("Argument \"isValid\" is null.");`
	`238`	`+ throw new ArgumentNullException(nameof(isValid), "Argument is null.");`
`239`	`239`	`}`
`240`	`240`
`241`	`241`
`242`	`242`	`private void CheckTokenSource(CancellationTokenSource tokenSource)`
`243`	`243`	`{`
`244`	`244`	`if (tokenSource == null)`
`245`		`- throw new ArgumentNullException("Argument \"tokenSource\" is null.");`
	`245`	`+ throw new ArgumentNullException(nameof(tokenSource), "Argument is null.");`
`246`	`246`	`}`
`247`	`247`
`248`	`248`