Cleanup & Refactoring

--HG--
branch : dev

src/Orchard.Web/Core/Common/Permissions.cs

@@ -9,7 +9,7 @@ namespace Orchard.Core.Common {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 ChangeOwner,
             };
         }

src/Orchard.Web/Core/Settings/Permissions.cs

@@ -10,7 +10,7 @@ namespace Orchard.Core.Settings {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                  ManageSettings,
                  ChangeSuperuser,
              };

src/Orchard.Web/Modules/Orchard.Blogs/Permissions.cs

@@ -19,7 +19,7 @@ namespace Orchard.Blogs {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 ManageBlogs,
                 EditBlogPost,
                 EditOthersBlogPost,

src/Orchard.Web/Modules/Orchard.Comments/Permissions.cs

@@ -14,7 +14,7 @@ namespace Orchard.Comments {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 AddComment,
                 EnableComment,
                 CloseComment,

src/Orchard.Web/Modules/Orchard.Experimental/Permissions.cs

@@ -10,7 +10,7 @@ namespace Orchard.Experimental {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 DebugShowAllMenuItems,
             };
         }

src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs

@@ -99,7 +99,7 @@ namespace Orchard.Localization.Controllers {
             var model = new AddLocalizationViewModel();
             TryUpdateModel(model);
 
-            ContentItem contentItemTranslation = null;
+            ContentItem contentItemTranslation;
             var existingTranslation = _localizationService.GetLocalizedContentItem(contentItem, model.SelectedCulture);
             if (existingTranslation != null) {
                 // edit existing

src/Orchard.Web/Modules/Orchard.Media/Permissions.cs

@@ -10,7 +10,7 @@ namespace Orchard.Media {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 ManageMediaFiles,
                 UploadMediaFiles,
             };

src/Orchard.Web/Modules/Orchard.Roles/Permissions.cs

@@ -12,7 +12,7 @@ namespace Orchard.Roles {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 ManageRoles,
                 ApplyRoles,
             };

src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs

@@ -59,10 +59,10 @@ namespace Orchard.Scripting.Compiler {
                 if (IsDigitCharacter(ch)) {
                     return LexInteger();
                 }
-                else if (IsIdentifierCharacter(ch)) {
+                if (IsIdentifierCharacter(ch)) {
                     return LexIdentifierOrKeyword();
                 }
-                else if (IsWhitespaceCharacter(ch)) {
+                if (IsWhitespaceCharacter(ch)) {
                     NextCharacter();
                     continue;
                 }
@@ -163,18 +163,18 @@ namespace Orchard.Scripting.Compiler {
             }
         }
 
-        private bool IsWhitespaceCharacter(char character) {
+        private static bool IsWhitespaceCharacter(char character) {
             return char.IsWhiteSpace(character);
         }
 
-        private bool IsIdentifierCharacter(char ch) {
+        private static bool IsIdentifierCharacter(char ch) {
             return
                 (ch >= 'a' && ch <= 'z') ||
                 (ch >= 'A' && ch <= 'Z') ||
                 (ch == '_');
         }
 
-        private bool IsDigitCharacter(char ch) {
+        private static bool IsDigitCharacter(char ch) {
             return ch >= '0' && ch <= '9';
         }
 
@@ -193,7 +193,7 @@ namespace Orchard.Scripting.Compiler {
                     return CreateToken(TokenKind.SingleQuotedStringLiteral, _stringBuilder.ToString());
                 }
                 // backslash notation
-                else if (Character() == '\\') {
+                if (Character() == '\\') {
                     NextCharacter();
 
                     if (Eof())
@@ -210,7 +210,7 @@ namespace Orchard.Scripting.Compiler {
                         _stringBuilder.Append(Character());
                     }
                 }
-                // Regular character in string
+                    // Regular character in string
                 else {
                     _stringBuilder.Append(Character());
                 }
@@ -232,7 +232,7 @@ namespace Orchard.Scripting.Compiler {
                     return CreateToken(TokenKind.StringLiteral, _stringBuilder.ToString());
                 }
                 // backslash notation
-                else if (Character() == '\\') {
+                if (Character() == '\\') {
                     NextCharacter();
 
                     if (Eof())
@@ -240,7 +240,7 @@ namespace Orchard.Scripting.Compiler {
 
                     _stringBuilder.Append(Character());
                 }
-                // Regular character in string
+                    // Regular character in string
                 else {
                     _stringBuilder.Append(Character());
                 }

src/Orchard.Web/Modules/Orchard.Tags/Permissions.cs

@@ -11,7 +11,7 @@ namespace Orchard.Tags {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 ManageTags,
                 CreateTag,
                 ApplyTag,

src/Orchard.Web/Modules/Orchard.Themes/Permissions.cs

@@ -10,7 +10,7 @@ namespace Orchard.Themes {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                                         ManageThemes,
                                         ApplyTheme,
                                     };

src/Orchard.Web/Modules/Orchard.Users/Commands/UserCommands.cs

@@ -1,5 +1,4 @@
 using Orchard.Commands;
-using Orchard.ContentManagement;
 using Orchard.Security;
 using Orchard.Users.Services;
 
@@ -9,7 +8,6 @@ namespace Orchard.Users.Commands {
         private readonly IUserService _userService;
 
         public UserCommands(
-            IContentManager contentManager,
             IMembershipService membershipService,
             IUserService userService) {
             _membershipService = membershipService;
@@ -43,8 +41,8 @@ namespace Orchard.Users.Commands {
             var user = _membershipService.CreateUser(new CreateUserParams(UserName, Password, Email, null, null, true));
             if (user != null)
                 return T("User created successfully").ToString();
-            else
+            
-                return T("The authentication provider returned an error").ToString();
+            return T("The authentication provider returned an error").ToString();
         }
 
         int MinPasswordLength {

src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs

@@ -132,9 +132,8 @@ namespace Orchard.Users.Controllers {
                     _authenticationService.SignIn(user, false /* createPersistentCookie */);
                     return Redirect("~/");
                 }
-                else {
+                
-                    ModelState.AddModelError("_FORM", T(ErrorCodeToString(/*createStatus*/MembershipCreateStatus.ProviderError)));
+                ModelState.AddModelError("_FORM", T(ErrorCodeToString(/*createStatus*/MembershipCreateStatus.ProviderError)));
-                }
             }
 
             // If we got this far, something failed, redisplay form
@@ -196,11 +195,10 @@ namespace Orchard.Users.Controllers {
                     _membershipService.SetPassword(validated, newPassword);
                     return RedirectToAction("ChangePasswordSuccess");
                 }
-                else {
+                
-                    ModelState.AddModelError("_FORM",
+                ModelState.AddModelError("_FORM",
-                                             T("The current password is incorrect or the new password is invalid."));
+                                         T("The current password is incorrect or the new password is invalid."));
-                    return ChangePassword();
+                return ChangePassword();
-                }
             }
             catch {
                 ModelState.AddModelError("_FORM", T("The current password is incorrect or the new password is invalid."));

src/Orchard.Web/Modules/Orchard.Users/Permissions.cs

@@ -11,7 +11,7 @@ namespace Orchard.Users {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 ManageUsers,
             };
         }

src/Orchard.Web/Modules/Orchard.Widgets/Permissions.cs

@@ -9,7 +9,7 @@ namespace Orchard.Widgets {
         public virtual Feature Feature { get; set; }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 ManageWidgets,
             };
         }

src/Orchard/Commands/DefaultCommandManager.cs

@@ -33,10 +33,8 @@ namespace Orchard.Commands {
                     throw new OrchardCoreException(T("Multiple commands found matching arguments \"{0}\". Commands available: {1}.",
                                                              commandMatch, commandList));
                 }
-                else {
+                throw new OrchardCoreException(T("No command found matching arguments \"{0}\". Commands available: {1}.",
-                    throw new OrchardCoreException(T("No command found matching arguments \"{0}\". Commands available: {1}.",
+                                                 commandMatch, commandList));
-                                                             commandMatch, commandList));
-                }
             }
         }
 

src/Orchard/Data/Migration/DataMigrationManager.cs

@@ -166,7 +166,7 @@ namespace Orchard.Data.Migration {
                     .ToList();
 
             foreach (var migration in migrations.OfType<DataMigrationImpl>()) {
-                migration.SchemaBuilder = new SchemaBuilder(_interpreter, migration.Feature.Descriptor.Id, (s) => s.Replace(".", "_") + "_");
+                migration.SchemaBuilder = new SchemaBuilder(_interpreter, migration.Feature.Descriptor.Id, s => s.Replace(".", "_") + "_");
                 migration.ContentDefinitionManager = _contentDefinitionManager;
             }
 

src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs

@@ -107,7 +107,7 @@ namespace Orchard.Data.Migration.Generator {
 
                             
                             if ( columnCopy.IsLengthDefined() 
-                                && new DbType[] { DbType.StringFixedLength, DbType.String, DbType.AnsiString, DbType.AnsiStringFixedLength }.Contains(sqlType.DbType)
+                                && new[] { DbType.StringFixedLength, DbType.String, DbType.AnsiString, DbType.AnsiStringFixedLength }.Contains(sqlType.DbType)
                                 && columnCopy.Length != Column.DefaultLength) {
                                 action.WithLength(columnCopy.Length);
                             }

src/Orchard/Data/Migration/Schema/SchemaUtils.cs

@@ -6,7 +6,7 @@ namespace Orchard.Data.Migration.Schema {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", MessageId = "System.Enum.TryParse<System.Data.DbType>(System.String,System.Boolean,System.Data.DbType@)")]
         public static DbType ToDbType(Type type) {
             DbType dbType;
-            switch ( System.Type.GetTypeCode(type) ) {
+            switch ( Type.GetTypeCode(type) ) {
                 case TypeCode.String:
                     dbType = DbType.String;
                     break;

src/Orchard/Data/Providers/SqlServerDataServicesProvider.cs

@@ -20,9 +20,7 @@ namespace Orchard.Data.Providers {
             if (string.IsNullOrEmpty(_connectionString)) {
                 throw new NotImplementedException();
             }
-            else {
+            persistence = persistence.ConnectionString(_connectionString);
-                persistence = persistence.ConnectionString(_connectionString);
-            }
             return persistence;
         }
     }

src/Orchard/Localization/LocalizedString.cs

@@ -22,8 +22,7 @@ namespace Orchard.Localization {
         public static LocalizedString TextOrDefault(string text, LocalizedString defaultValue) {
             if (string.IsNullOrEmpty(text))
                 return defaultValue;
-            else
+            return new LocalizedString(text);
-                return new LocalizedString(text);
         }
 
         public string Scope {

src/Orchard/Mvc/Html/HtmlHelperExtensions.cs

@@ -295,7 +295,7 @@ namespace Orchard.Mvc.Html {
             try {
                 return htmlHelper.AntiForgeryToken(siteSalt);
             }
-            catch(System.Web.Mvc.HttpAntiForgeryException) {
+            catch(HttpAntiForgeryException) {
                 // Work-around an issue in MVC 2:  If the browser sends a cookie that is not
                 // coming from this server (this can happen if the user didn't close their browser
                 // while the application server configuration changed), clear it up

src/Orchard/Mvc/OrchardControllerFactory.cs

@@ -45,7 +45,7 @@ namespace Orchard.Mvc {
             return null;
         }
 
-        protected override IController GetControllerInstance(RequestContext requestContext, System.Type controllerType) {
+        protected override IController GetControllerInstance(RequestContext requestContext, Type controllerType) {
             IController controller;
             var workContext = requestContext.GetWorkContext();
             if (TryResolve(workContext, controllerType, out controller)) {

src/Orchard/Security/StandardPermissions.cs

@@ -28,7 +28,7 @@ namespace Orchard.Security {
         }
 
         public IEnumerable<Permission> GetPermissions() {
-            return new Permission[] {
+            return new[] {
                 AccessAdminPanel,
                 AccessFrontEnd,
             };

src/Orchard/WorkContextExtensions.cs

@@ -52,7 +52,7 @@ namespace Orchard {
             if (controllerContext == null)
                 return null;
 
-            return WorkContextExtensions.GetWorkContext(controllerContext.RequestContext);
+            return GetWorkContext(controllerContext.RequestContext);
         }
 
         public static IWorkContextScope CreateWorkContextScope(this ILifetimeScope lifetimeScope, HttpContextBase httpContext) {