Skip to content

Commit 76e836c

Browse files
author
ThisWillDoIt
committed
introduced nameof operator for ArgumentNullException strings
1 parent 80d347b commit 76e836c

22 files changed

+44
-44
lines changed

BlogEngine/BlogEngine.Core/Helpers/Utils.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ public static Uri ConvertToAbsolute(string relativeUri)
514514
{
515515
if (String.IsNullOrEmpty(relativeUri))
516516
{
517-
throw new ArgumentNullException("relativeUri");
517+
throw new ArgumentNullException(nameof(relativeUri));
518518
}
519519

520520
var absolute = AbsoluteWebRoot.ToString();
@@ -1031,7 +1031,7 @@ public static string RenderControl(System.Web.UI.Control control)
10311031
{
10321032
if (control == null)
10331033
{
1034-
throw new ArgumentNullException("control");
1034+
throw new ArgumentNullException(nameof(control));
10351035
}
10361036

10371037
using (var sWriter = new System.IO.StringWriter())
@@ -1108,7 +1108,7 @@ public static string SendMailMessage(MailMessage message, string smtpServer = ""
11081108
int intPort = BlogSettings.Instance.SmtpServerPort;
11091109

11101110
if (message == null)
1111-
throw new ArgumentNullException("message");
1111+
throw new ArgumentNullException(nameof(message));
11121112

11131113
try
11141114
{

BlogEngine/BlogEngine.Core/Providers/BlogProviderCollection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public override void Add(ProviderBase provider)
3636
{
3737
if (provider == null)
3838
{
39-
throw new ArgumentNullException("provider");
39+
throw new ArgumentNullException(nameof(provider));
4040
}
4141

4242
if (!(provider is BlogProvider))
4343
{
44-
throw new ArgumentException("Invalid provider type", "provider");
44+
throw new ArgumentException("Invalid provider type", nameof(provider));
4545
}
4646

4747
base.Add(provider);

BlogEngine/BlogEngine.Core/Providers/DbProvider/DbBlogProvider.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public override void Initialize(string name, NameValueCollection config)
5252
{
5353
if (config == null)
5454
{
55-
throw new ArgumentNullException("config");
55+
throw new ArgumentNullException(nameof(config));
5656
}
5757

5858
if (String.IsNullOrEmpty(name))
@@ -1989,7 +1989,7 @@ public override void SavePingServices(StringCollection services)
19891989
{
19901990
if (services == null)
19911991
{
1992-
throw new ArgumentNullException("services");
1992+
throw new ArgumentNullException(nameof(services));
19931993
}
19941994

19951995
using (var conn = this.CreateConnection())
@@ -2075,7 +2075,7 @@ public override void SaveToDataStore(ExtensionType extensionType, string extensi
20752075
{
20762076
if (settings == null)
20772077
{
2078-
throw new ArgumentNullException("settings");
2078+
throw new ArgumentNullException(nameof(settings));
20792079
}
20802080

20812081
// Save
@@ -2195,7 +2195,7 @@ public override void SaveSettings(StringDictionary settings)
21952195
{
21962196
if (settings == null)
21972197
{
2198-
throw new ArgumentNullException("settings");
2198+
throw new ArgumentNullException(nameof(settings));
21992199
}
22002200

22012201
using (var conn = this.CreateConnection())
@@ -2288,7 +2288,7 @@ public override void SaveRights(IEnumerable<Right> rights)
22882288
{
22892289
if (rights == null)
22902290
{
2291-
throw new ArgumentNullException("rights");
2291+
throw new ArgumentNullException(nameof(rights));
22922292
}
22932293

22942294
using (var conn = this.CreateConnection())

BlogEngine/BlogEngine.Core/Providers/DbProvider/DbMembershipProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public override string GetUserNameByEmail(string email)
509509
{
510510
if (email == null)
511511
{
512-
throw new ArgumentNullException("email");
512+
throw new ArgumentNullException(nameof(email));
513513
}
514514

515515
string userName = null;
@@ -550,7 +550,7 @@ public override void Initialize(string name, NameValueCollection config)
550550
{
551551
if (config == null)
552552
{
553-
throw new ArgumentNullException("config");
553+
throw new ArgumentNullException(nameof(config));
554554
}
555555

556556
if (string.IsNullOrEmpty(name))

BlogEngine/BlogEngine.Core/Providers/DbProvider/DbRoleProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ public override void Initialize(string name, NameValueCollection config)
357357
{
358358
if (config == null)
359359
{
360-
throw new ArgumentNullException("config");
360+
throw new ArgumentNullException(nameof(config));
361361
}
362362

363363
if (String.IsNullOrEmpty(name))

BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/BlogFileSystemProviderCollection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public override void Add(ProviderBase provider)
3636
{
3737
if (provider == null)
3838
{
39-
throw new ArgumentNullException("provider");
39+
throw new ArgumentNullException(nameof(provider));
4040
}
4141

4242
if (!(provider is BlogFileSystemProvider))
4343
{
44-
throw new ArgumentException("Invalid provider type", "provider");
44+
throw new ArgumentException("Invalid provider type", nameof(provider));
4545
}
4646

4747
base.Add(provider);

BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/DbFileSystemProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public override void Initialize(string name, NameValueCollection config)
3838
{
3939
if (config == null)
4040
{
41-
throw new ArgumentNullException("config");
41+
throw new ArgumentNullException(nameof(config));
4242
}
4343

4444
if (String.IsNullOrEmpty(name))

BlogEngine/BlogEngine.Core/Providers/FileSystemProviders/UNCFileSystemProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override void Initialize(string name, System.Collections.Specialized.Name
2727
{
2828
if (config == null)
2929
{
30-
throw new ArgumentNullException("config");
30+
throw new ArgumentNullException(nameof(config));
3131
}
3232

3333
if (String.IsNullOrEmpty(name))

BlogEngine/BlogEngine.Core/Providers/XmlProvider/PingServices.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public override void SavePingServices(StringCollection services)
5353
{
5454
if (services == null)
5555
{
56-
throw new ArgumentNullException("services");
56+
throw new ArgumentNullException(nameof(services));
5757
}
5858

5959
var fileName = this.Folder + "pingservices.xml";

BlogEngine/BlogEngine.Core/Providers/XmlProvider/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public override void SaveSettings(StringDictionary settings)
5353
{
5454
if (settings == null)
5555
{
56-
throw new ArgumentNullException("settings");
56+
throw new ArgumentNullException(nameof(settings));
5757
}
5858

5959
var filename = $"{Folder}settings.xml";

BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlMembershipProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ public override MembershipUser GetUser(object providerUserKey, bool userIsOnline
537537
{
538538
if (providerUserKey == null)
539539
{
540-
throw new ArgumentNullException("providerUserKey");
540+
throw new ArgumentNullException(nameof(providerUserKey));
541541
}
542542

543543
var doc = new XmlDocument();
@@ -565,7 +565,7 @@ public override string GetUserNameByEmail(string email)
565565
{
566566
if (email == null)
567567
{
568-
throw new ArgumentNullException("email");
568+
throw new ArgumentNullException(nameof(email));
569569
}
570570

571571
var doc = new XmlDocument();
@@ -594,7 +594,7 @@ public override void Initialize(string name, NameValueCollection config)
594594
{
595595
if (config == null)
596596
{
597-
throw new ArgumentNullException("config");
597+
throw new ArgumentNullException(nameof(config));
598598
}
599599

600600
if (string.IsNullOrEmpty(name))

BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlRoleProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public override void Initialize(string name, NameValueCollection config)
272272
{
273273
if (config == null)
274274
{
275-
throw new ArgumentNullException("config");
275+
throw new ArgumentNullException(nameof(config));
276276
}
277277

278278
if (string.IsNullOrEmpty(name))
@@ -413,7 +413,7 @@ public override bool RoleExists(string roleName)
413413
{
414414
if (String.IsNullOrWhiteSpace(roleName))
415415
{
416-
throw new ArgumentNullException("roleName");
416+
throw new ArgumentNullException(nameof(roleName));
417417
}
418418
else
419419
{

BlogEngine/BlogEngine.Core/RemoteFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ internal RemoteFile(Uri filePath, bool ignoreRemoteDownloadSettings)
3838
{
3939
if (filePath == null)
4040
{
41-
throw new ArgumentNullException("filePath");
41+
throw new ArgumentNullException(nameof(filePath));
4242
}
4343

4444
this.url = filePath;

BlogEngine/BlogEngine.Core/Role.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public Role(string name, List<string> userNames)
4545
{
4646
if (userNames == null)
4747
{
48-
throw new System.ArgumentNullException("userNames");
48+
throw new System.ArgumentNullException(nameof(userNames));
4949
}
5050
else
5151
{

BlogEngine/BlogEngine.Core/Services/Compilation/LinqLengthExpressionBuilder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static string AfterLast(string value, string last)
7272
{
7373
if (value == null)
7474
{
75-
throw new ArgumentNullException("value");
75+
throw new ArgumentNullException(nameof(value));
7676
}
7777

7878
return value.Substring(value.LastIndexOf(last) + last.Length);
@@ -94,12 +94,12 @@ private static string BeforeLast(string value, string last)
9494
{
9595
if (value == null)
9696
{
97-
throw new ArgumentNullException("value");
97+
throw new ArgumentNullException(nameof(value));
9898
}
9999

100100
if (last == null)
101101
{
102-
throw new ArgumentNullException("last");
102+
throw new ArgumentNullException(nameof(last));
103103
}
104104

105105
return value.Substring(0, value.LastIndexOf(last));
@@ -124,7 +124,7 @@ private static string BetweenFirst(string value, string startText, string endTex
124124
{
125125
if (value == null)
126126
{
127-
throw new ArgumentNullException("value");
127+
throw new ArgumentNullException(nameof(value));
128128
}
129129

130130
var start = value.IndexOf(startText, StringComparison.OrdinalIgnoreCase) + startText.Length;

BlogEngine/BlogEngine.Core/Services/Messaging/Ping/Trackback.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static bool Send(TrackbackMessage message)
4242

4343
if (message == null)
4444
{
45-
throw new ArgumentNullException("message");
45+
throw new ArgumentNullException(nameof(message));
4646
}
4747

4848
OnSending(message.UrlToNotifyTrackback);

BlogEngine/BlogEngine.Core/Services/Messaging/Ping/TrackbackMessage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public TrackbackMessage(IPublishable item, Uri urlToNotifyTrackback, Uri itemUrl
2626
{
2727
if (item == null)
2828
{
29-
throw new ArgumentNullException("item");
29+
throw new ArgumentNullException(nameof(item));
3030
}
3131

3232
this.Title = item.Title;

BlogEngine/BlogEngine.Core/Services/Security/CustomIdentity.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ public CustomIdentity(string username, bool isAuthenticated)
5959
public CustomIdentity(string username, string password)
6060
{
6161
if (String.IsNullOrWhiteSpace(username))
62-
throw new ArgumentNullException("username");
62+
throw new ArgumentNullException(nameof(username));
6363

6464
if (String.IsNullOrWhiteSpace(password))
65-
throw new ArgumentNullException("password");
65+
throw new ArgumentNullException(nameof(password));
6666

6767
if (!Membership.ValidateUser(username, password)) { return; }
6868

BlogEngine/BlogEngine.Core/Services/Security/Right.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ private static string PrepareRoleName(string roleName)
349349
{
350350
if (String.IsNullOrWhiteSpace(roleName))
351351
{
352-
throw new ArgumentNullException("roleName");
352+
throw new ArgumentNullException(nameof(roleName));
353353
}
354354
else
355355
{
@@ -375,7 +375,7 @@ public static Right GetRightByName(string rightName)
375375
{
376376
if (String.IsNullOrWhiteSpace(rightName))
377377
{
378-
throw new ArgumentNullException("rightName");
378+
throw new ArgumentNullException(nameof(rightName));
379379
}
380380
else
381381
{
@@ -439,7 +439,7 @@ public static IEnumerable<Right> GetRights(IEnumerable<string> roles)
439439
{
440440
if (roles == null)
441441
{
442-
throw new ArgumentNullException("roles");
442+
throw new ArgumentNullException(nameof(roles));
443443
}
444444
else if (!roles.Any())
445445
{
@@ -473,7 +473,7 @@ public static bool HasRight(Rights right, IEnumerable<string> roles)
473473
{
474474
if (roles == null)
475475
{
476-
throw new ArgumentNullException("roles");
476+
throw new ArgumentNullException(nameof(roles));
477477
}
478478
else if (!roles.Any())
479479
{

BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ public SyndicationGenerator(BlogSettings settings, List<Category> categories)
8484
{
8585
if (settings == null)
8686
{
87-
throw new ArgumentNullException("settings");
87+
throw new ArgumentNullException(nameof(settings));
8888
}
8989

9090
if (categories == null)
9191
{
92-
throw new ArgumentNullException("categories");
92+
throw new ArgumentNullException(nameof(categories));
9393
}
9494

9595
// ------------------------------------------------------------
@@ -243,12 +243,12 @@ public void WriteFeed(SyndicationFormat format, Stream stream, List<IPublishable
243243
{
244244
if (stream == null)
245245
{
246-
throw new ArgumentNullException("stream");
246+
throw new ArgumentNullException(nameof(stream));
247247
}
248248

249249
if (publishables == null)
250250
{
251-
throw new ArgumentNullException("publishables");
251+
throw new ArgumentNullException(nameof(publishables));
252252
}
253253

254254
if (!stream.CanWrite)

BlogEngine/BlogEngine.Core/Web/BlogCulture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public BlogCulture(CultureInfo cultureInfo, ResourceType resourceType)
3232
{
3333
if (cultureInfo == null)
3434
{
35-
throw new ArgumentNullException("cultureInfo");
35+
throw new ArgumentNullException(nameof(cultureInfo));
3636
}
3737
this.cultureInfo = cultureInfo;
3838

BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ static void RegisterDiContainer()
242242
static void AddDefaultIgnorePatterns(IgnoreList ignoreList)
243243
{
244244
if (ignoreList == null)
245-
throw new ArgumentNullException("ignoreList");
245+
throw new ArgumentNullException(nameof(ignoreList));
246246

247247
ignoreList.Ignore("*.intellisense.js");
248248
ignoreList.Ignore("*-vsdoc.js");

0 commit comments

Comments
 (0)