From c793c322bdf0fec4bdd02fb63f14440c129e6385 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Tue, 7 Dec 2010 18:10:29 -0800 Subject: [PATCH] Refactoring --HG-- branch : dev --- .../Commands/CodeGenerationCommands.cs | 2 +- .../Modules/Orchard.Experimental/ContainerSpy.cs | 9 +++------ .../Extensions/Compilers/DefaultProjectFileParser.cs | 10 ++++------ .../Extensions/Loaders/CoreExtensionLoader.cs | 10 +++++----- src/Orchard/Environment/IAssemblyLoader.cs | 2 +- src/Orchard/Environment/ViewsBackgroundCompilation.cs | 2 +- .../Dependencies/DynamicModuleVirtualPathProvider.cs | 4 ++-- .../WebFormsExtensionsVirtualPathProvider.cs | 6 +++--- src/Orchard/UI/Navigation/NavigationManager.cs | 7 ++----- 9 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs index 7ed5b5880..2a43f4c05 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs @@ -358,7 +358,7 @@ namespace Orchard.CodeGeneration.Commands { } } - private string CreateProjectItemGroup(string relativeFromPath, HashSet content, HashSet folders) { + private static string CreateProjectItemGroup(string relativeFromPath, HashSet content, HashSet folders) { var contentInclude = ""; if (relativeFromPath != null && !relativeFromPath.EndsWith("\\", StringComparison.OrdinalIgnoreCase)) { relativeFromPath += "\\"; diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/ContainerSpy.cs b/src/Orchard.Web/Modules/Orchard.Experimental/ContainerSpy.cs index 1dc981610..0b711c2ef 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/ContainerSpy.cs +++ b/src/Orchard.Web/Modules/Orchard.Experimental/ContainerSpy.cs @@ -132,10 +132,7 @@ namespace Orchard.Experimental { public void AddTime(long time) { _time += time; } public override string ToString() { - if (_component == null) - return "root"; - - return _component.ToString(); + return _component == null ? "root" : _component.ToString(); } @@ -232,7 +229,7 @@ namespace Orchard.Experimental { } private class TotalVisitor { - public Node _totals = new Node(null); + public readonly Node _totals = new Node(null); public void Visit(Node source) { foreach (var child in source._children) { @@ -272,7 +269,7 @@ namespace Orchard.Experimental { return target; } - private XElement Write(Node node) { + private static XElement Write(Node node) { var elt = new XElement( "Component", new XAttribute("services", node._component != null ? string.Join(",", node._component.Services) : "root"), diff --git a/src/Orchard/Environment/Extensions/Compilers/DefaultProjectFileParser.cs b/src/Orchard/Environment/Extensions/Compilers/DefaultProjectFileParser.cs index 53ab98ea3..321ed56ce 100644 --- a/src/Orchard/Environment/Extensions/Compilers/DefaultProjectFileParser.cs +++ b/src/Orchard/Environment/Extensions/Compilers/DefaultProjectFileParser.cs @@ -16,7 +16,7 @@ namespace Orchard.Environment.Extensions.Compilers { }; } - private string GetAssemblyName(XDocument document) { + private static string GetAssemblyName(XDocument document) { return document .Elements(ns("Project")) .Elements(ns("PropertyGroup")) @@ -25,7 +25,7 @@ namespace Orchard.Environment.Extensions.Compilers { .Value; } - private IEnumerable GetSourceFilenames(XDocument document) { + private static IEnumerable GetSourceFilenames(XDocument document) { return document .Elements(ns("Project")) .Elements(ns("ItemGroup")) @@ -34,7 +34,7 @@ namespace Orchard.Environment.Extensions.Compilers { .Select(c => c.Value); } - private IEnumerable GetReferences(XDocument document) { + private static IEnumerable GetReferences(XDocument document) { var assemblyReferences = document .Elements(ns("Project")) .Elements(ns("ItemGroup")) @@ -54,9 +54,7 @@ namespace Orchard.Environment.Extensions.Compilers { private static string ExtractAssemblyName(string value) { int index = value.IndexOf(','); - if (index < 0) - return value; - return value.Substring(0, index); + return index < 0 ? value : value.Substring(0, index); } private static XName ns(string name) { diff --git a/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs index 760b7846c..f94ba962c 100644 --- a/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/CoreExtensionLoader.cs @@ -9,7 +9,7 @@ namespace Orchard.Environment.Extensions.Loaders { /// Load an extension by looking into specific namespaces of the "Orchard.Core" assembly /// public class CoreExtensionLoader : ExtensionLoaderBase { - private readonly string _coreAssemblyName = "Orchard.Core"; + private const string CoreAssemblyName = "Orchard.Core"; private readonly IAssemblyLoader _assemblyLoader; public CoreExtensionLoader(IDependenciesFolder dependenciesFolder, IAssemblyLoader assemblyLoader) @@ -38,9 +38,9 @@ namespace Orchard.Environment.Extensions.Loaders { protected override ExtensionEntry LoadWorker(ExtensionDescriptor descriptor) { //Logger.Information("Loading extension \"{0}\"", descriptor.Name); - var assembly = _assemblyLoader.Load(_coreAssemblyName); + var assembly = _assemblyLoader.Load(CoreAssemblyName); if (assembly == null) { - Logger.Error("Core modules cannot be activated because assembly '{0}' could not be loaded", _coreAssemblyName); + Logger.Error("Core modules cannot be activated because assembly '{0}' could not be loaded", CoreAssemblyName); return null; } @@ -51,8 +51,8 @@ namespace Orchard.Environment.Extensions.Loaders { }; } - private bool IsTypeFromModule(Type type, ExtensionDescriptor descriptor) { - return (type.Namespace + ".").StartsWith(_coreAssemblyName + "." + descriptor.Id + "."); + private static bool IsTypeFromModule(Type type, ExtensionDescriptor descriptor) { + return (type.Namespace + ".").StartsWith(CoreAssemblyName + "." + descriptor.Id + "."); } } } \ No newline at end of file diff --git a/src/Orchard/Environment/IAssemblyLoader.cs b/src/Orchard/Environment/IAssemblyLoader.cs index 1362e829c..cd079c67c 100644 --- a/src/Orchard/Environment/IAssemblyLoader.cs +++ b/src/Orchard/Environment/IAssemblyLoader.cs @@ -48,7 +48,7 @@ namespace Orchard.Environment { return Assembly.Load(fullName); } - private Assembly LookupFusion(string fullName) { + private static Assembly LookupFusion(string fullName) { try { return Assembly.Load(fullName); } diff --git a/src/Orchard/Environment/ViewsBackgroundCompilation.cs b/src/Orchard/Environment/ViewsBackgroundCompilation.cs index be5060292..c4083084b 100644 --- a/src/Orchard/Environment/ViewsBackgroundCompilation.cs +++ b/src/Orchard/Environment/ViewsBackgroundCompilation.cs @@ -152,7 +152,7 @@ namespace Orchard.Environment { return result; } - private void GetViewDirectories(IVirtualPathProvider vpp, string directory, IEnumerable extensions, ICollection files) { + private static void GetViewDirectories(IVirtualPathProvider vpp, string directory, IEnumerable extensions, ICollection files) { if (vpp.ListFiles(directory).Where(f => extensions.Any(e => f.EndsWith(e, StringComparison.OrdinalIgnoreCase))).Any()) { files.Add(directory); } diff --git a/src/Orchard/FileSystems/Dependencies/DynamicModuleVirtualPathProvider.cs b/src/Orchard/FileSystems/Dependencies/DynamicModuleVirtualPathProvider.cs index 07127f60b..f2ad9531e 100644 --- a/src/Orchard/FileSystems/Dependencies/DynamicModuleVirtualPathProvider.cs +++ b/src/Orchard/FileSystems/Dependencies/DynamicModuleVirtualPathProvider.cs @@ -83,7 +83,7 @@ namespace Orchard.FileSystems.Dependencies { return _dependenciesFolder.GetDescriptor(moduleName); } - private string ModuleMatch(string virtualPath, string prefix) { + private static string ModuleMatch(string virtualPath, string prefix) { var index = virtualPath.IndexOf('/', prefix.Length, virtualPath.Length - prefix.Length); if (index < 0) return null; @@ -92,7 +92,7 @@ namespace Orchard.FileSystems.Dependencies { return (string.IsNullOrEmpty(moduleName) ? null : moduleName); } - private string PrefixMatch(string virtualPath, params string[] prefixes) { + private static string PrefixMatch(string virtualPath, params string[] prefixes) { return prefixes .FirstOrDefault(p => virtualPath.StartsWith(p, StringComparison.OrdinalIgnoreCase)); } diff --git a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs index 6ab6bab57..07df8a1c3 100644 --- a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs +++ b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs @@ -160,7 +160,7 @@ namespace Orchard.FileSystems.Dependencies { }; } - private string ModuleMatch(string virtualPath, string prefix) { + private static string ModuleMatch(string virtualPath, string prefix) { var index = virtualPath.IndexOf('/', prefix.Length, virtualPath.Length - prefix.Length); if (index < 0) return null; @@ -169,12 +169,12 @@ namespace Orchard.FileSystems.Dependencies { return (string.IsNullOrEmpty(moduleName) ? null : moduleName); } - private string ExtensionMatch(string virtualPath, params string[] extensions) { + private static string ExtensionMatch(string virtualPath, params string[] extensions) { return extensions .FirstOrDefault(e => virtualPath.EndsWith(e, StringComparison.OrdinalIgnoreCase)); } - private string PrefixMatch(string virtualPath, params string[] prefixes) { + private static string PrefixMatch(string virtualPath, params string[] prefixes) { return prefixes .FirstOrDefault(p => virtualPath.StartsWith(p, StringComparison.OrdinalIgnoreCase)); } diff --git a/src/Orchard/UI/Navigation/NavigationManager.cs b/src/Orchard/UI/Navigation/NavigationManager.cs index 0914df1f0..03fcccf90 100644 --- a/src/Orchard/UI/Navigation/NavigationManager.cs +++ b/src/Orchard/UI/Navigation/NavigationManager.cs @@ -53,11 +53,8 @@ namespace Orchard.UI.Navigation { return url; } - private IEnumerable Crop(IEnumerable items) { - foreach(var item in items) { - if (item.Items.Any() || item.RouteValues != null) - yield return item; - } + private static IEnumerable Crop(IEnumerable items) { + return items.Where(item => item.Items.Any() || item.RouteValues != null); } private IEnumerable Reduce(IEnumerable items) {