diff --git a/src/Orchard.Web/Modules/Lucene/Services/LuceneSearchBuilder.cs b/src/Orchard.Web/Modules/Lucene/Services/LuceneSearchBuilder.cs index 51b5fe799..b3ac6738a 100644 --- a/src/Orchard.Web/Modules/Lucene/Services/LuceneSearchBuilder.cs +++ b/src/Orchard.Web/Modules/Lucene/Services/LuceneSearchBuilder.cs @@ -314,12 +314,7 @@ namespace Lucene.Services { try { var hits = searcher.Search(query, 1); Logger.Information("Search results: {0}", hits.scoreDocs.Length); - if ( hits.scoreDocs.Length > 0 ) { - return new LuceneSearchHit(searcher.Doc(hits.scoreDocs[0].doc), hits.scoreDocs[0].score); - } - else { - return null; - } + return hits.scoreDocs.Length > 0 ? new LuceneSearchHit(searcher.Doc(hits.scoreDocs[0].doc), hits.scoreDocs[0].score) : null; } finally { searcher.Close(); diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs index cd5ed2a52..1b2dd6a91 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs @@ -37,9 +37,8 @@ namespace Orchard.ArchiveLater.Drivers { } protected override DriverResult Editor(ArchiveLaterPart part, dynamic shapeHelper) { - var model = new ArchiveLaterViewModel(part); + var model = new ArchiveLaterViewModel(part) {ScheduledArchiveUtc = part.ScheduledArchiveUtc.Value}; - model.ScheduledArchiveUtc = part.ScheduledArchiveUtc.Value; model.ArchiveLater = model.ScheduledArchiveUtc.HasValue; model.ScheduledArchiveDate = model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value.ToLocalTime().ToString(DatePattern, CultureInfo.InvariantCulture) : String.Empty; model.ScheduledArchiveTime = model.ScheduledArchiveUtc.HasValue ? model.ScheduledArchiveUtc.Value.ToLocalTime().ToString(TimePattern, CultureInfo.InvariantCulture) : String.Empty; @@ -54,7 +53,7 @@ namespace Orchard.ArchiveLater.Drivers { if (updater.TryUpdateModel(model, Prefix, null, null) ) { if ( model.ArchiveLater ) { DateTime scheduled; - string parseDateTime = String.Concat(model.ScheduledArchiveDate, " ", model.ScheduledArchiveTime); + var parseDateTime = String.Concat(model.ScheduledArchiveDate, " ", model.ScheduledArchiveTime); // use an english culture as it is the one used by jQuery.datepicker by default if (DateTime.TryParse(parseDateTime, CultureInfo.GetCultureInfo("en-US"), DateTimeStyles.AssumeLocal, out scheduled)) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs index 8c0a1c8cb..0940393d8 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs @@ -107,7 +107,7 @@ namespace Orchard.Blogs.Commands { foreach ( var item in doc.Descendants("item") ) { if (item != null) { - string postName = item.Element("title").Value; + var postName = item.Element("title").Value; Context.Output.WriteLine("Adding post: {0}...", postName.Substring(0, Math.Min(postName.Length, 40))); var post = _contentManager.New("BlogPost"); diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs index 77c1a3ba1..36552a120 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs @@ -143,10 +143,9 @@ namespace Orchard.Localization.Controllers { } var metadata = _contentManager.GetItemMetadata(model.Content); - if (metadata.EditorRouteValues == null) - return null; //todo: (heskew) redirect to somewhere better than nowhere - return RedirectToRoute(metadata.EditorRouteValues); + //todo: (heskew) if null, redirect to somewhere better than nowhere + return metadata.EditorRouteValues == null ? null : RedirectToRoute(metadata.EditorRouteValues); } bool IUpdateModel.TryUpdateModel(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) { diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Services/FileBaseProjectSystem.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/FileBaseProjectSystem.cs index cec9c4d45..7a4bfe750 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Services/FileBaseProjectSystem.cs +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/FileBaseProjectSystem.cs @@ -43,12 +43,7 @@ namespace Orchard.Packaging.Services { } public virtual FrameworkName TargetFramework { - get { - if (_targetFramework == null) { - _targetFramework = new FrameworkName(NetFrameworkIdentifier, typeof(string).Assembly.GetNameSafe().Version); - } - return _targetFramework; - } + get { return _targetFramework ?? (_targetFramework = new FrameworkName(NetFrameworkIdentifier, typeof (string).Assembly.GetNameSafe().Version)); } } public string GetFullPath(string path) { @@ -114,11 +109,7 @@ namespace Orchard.Packaging.Services { } // Return empty string for the root namespace of this project. - if (propertyName.Equals("RootNamespace", StringComparison.OrdinalIgnoreCase)) { - return String.Empty; - } - - return null; + return propertyName.Equals("RootNamespace", StringComparison.OrdinalIgnoreCase) ? String.Empty : null; } public IEnumerable GetFiles(string path) { @@ -164,10 +155,7 @@ namespace Orchard.Packaging.Services { } public DateTimeOffset GetLastModified(string path) { - if (DirectoryExists(path)) { - return new DirectoryInfo(GetFullPath(path)).LastWriteTimeUtc; - } - return new FileInfo(GetFullPath(path)).LastWriteTimeUtc; + return DirectoryExists(path) ? new DirectoryInfo(GetFullPath(path)).LastWriteTimeUtc : new FileInfo(GetFullPath(path)).LastWriteTimeUtc; } public bool FileExists(string path) { diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs b/src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs index fe9b94ca8..980bbdd47 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs @@ -153,9 +153,7 @@ namespace Orchard.Roles.Services { IEnumerable GetPermissionsForRoleByNameInner(string name) { var roleRecord = GetRoleByName(name); - if (roleRecord == null) - return Enumerable.Empty(); - return GetPermissionsForRole(roleRecord.Id); + return roleRecord == null ? Enumerable.Empty() : GetPermissionsForRole(roleRecord.Id); } diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/EvaluationResult.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/EvaluationResult.cs index af0b82c64..a7428bb7e 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/EvaluationResult.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/EvaluationResult.cs @@ -33,10 +33,7 @@ namespace Orchard.Scripting.Compiler { public string StringValue { get { return (string)Value; } } public override string ToString() { - if (IsNull) - return ""; - - return Value.ToString(); + return IsNull ? "" : Value.ToString(); } } diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs index a297541aa..f1a6ef50f 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs @@ -92,7 +92,7 @@ namespace Orchard.Scripting.Compiler { return Error(node.Message); } - private EvaluationResult EvaluateEquality(EvaluationResult left, EvaluationResult right, Func operation) { + private static EvaluationResult EvaluateEquality(EvaluationResult left, EvaluationResult right, Func operation) { var type = PrimitiveType.InstanceFor(left.Value); var result = type.EqualityOperator(left, right); if (result.IsBool) @@ -100,7 +100,7 @@ namespace Orchard.Scripting.Compiler { return result; } - private EvaluationResult EvaluateComparison(EvaluationResult left, EvaluationResult right, Func operation) { + private static EvaluationResult EvaluateComparison(EvaluationResult left, EvaluationResult right, Func operation) { var type = PrimitiveType.InstanceFor(left.Value); var result = type.ComparisonOperator(left, right); if (result.IsInt32) diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs index 6fed5987f..39184c5fa 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs @@ -7,10 +7,7 @@ namespace Orchard.Scripting.Compiler { public object Value { get; set; } public override string ToString() { - if (Value == null) - return String.Format("Token {0} at position {1}", Kind, Position); - else - return String.Format("Token {0} ({1}) at position {2}", Kind, Value, Position); + return Value == null ? String.Format("Token {0} at position {1}", Kind, Position) : String.Format("Token {0} ({1}) at position {2}", Kind, Value, Position); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs index c77c6e8c7..2acd53175 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs @@ -199,15 +199,17 @@ namespace Orchard.Scripting.Compiler { if (Eof()) return CreateToken(TokenKind.Invalid, "Unterminated string literal"); - if (Character() == '\\') { - _stringBuilder.Append('\\'); - } - else if (Character() == '\'') { - _stringBuilder.Append('\''); - } - else { - _stringBuilder.Append('\\'); - _stringBuilder.Append(Character()); + switch (Character()) { + case '\\': + _stringBuilder.Append('\\'); + break; + case '\'': + _stringBuilder.Append('\''); + break; + default: + _stringBuilder.Append('\\'); + _stringBuilder.Append(Character()); + break; } } // Regular character in string diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeSelector.cs b/src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeSelector.cs index 0a81bcb8d..04d5db2f4 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeSelector.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeSelector.cs @@ -10,10 +10,7 @@ namespace Orchard.Themes.Preview { public ThemeSelectorResult GetTheme(RequestContext context) { var previewThemeName = _previewTheme.GetPreviewTheme(); - if (string.IsNullOrEmpty(previewThemeName)) - return null; - - return new ThemeSelectorResult { Priority = 90, ThemeName = previewThemeName }; + return string.IsNullOrEmpty(previewThemeName) ? null : new ThemeSelectorResult { Priority = 90, ThemeName = previewThemeName }; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs b/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs index 69153b545..3b3369e87 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs @@ -16,11 +16,7 @@ namespace Orchard.Themes.Services { public ThemeSelectorResult GetTheme(RequestContext context) { string currentThemeName = _orchardServices.WorkContext.CurrentSite.As().Record.CurrentThemeName; - if (String.IsNullOrEmpty(currentThemeName)) { - return null; - } - - return new ThemeSelectorResult { Priority = -5, ThemeName = currentThemeName }; + return String.IsNullOrEmpty(currentThemeName) ? null : new ThemeSelectorResult { Priority = -5, ThemeName = currentThemeName }; } } diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeService.cs b/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeService.cs index 625d8e4a1..877db83a0 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeService.cs +++ b/src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeService.cs @@ -28,10 +28,7 @@ namespace Orchard.Themes.Services { var site = _workContextAccessor.GetContext().CurrentSite; string currentThemeName = site.As().CurrentThemeName; - if (string.IsNullOrEmpty(currentThemeName)) { - return null; - } - return _extensionManager.GetExtension(currentThemeName); + return string.IsNullOrEmpty(currentThemeName) ? null : _extensionManager.GetExtension(currentThemeName); } public void SetSiteTheme(string themeName) {