From ee271abff2deb4323f8998193e425839db6b9e5e Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Wed, 8 Dec 2010 18:32:59 -0800
Subject: [PATCH] Rename method

--HG--
branch : dev
---
 src/Orchard/Environment/IAssemblyLoader.cs       | 8 ++++----
 src/Orchard/Environment/IAssemblyNameResolver.cs | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Orchard/Environment/IAssemblyLoader.cs b/src/Orchard/Environment/IAssemblyLoader.cs
index cd079c67c..60705a46d 100644
--- a/src/Orchard/Environment/IAssemblyLoader.cs
+++ b/src/Orchard/Environment/IAssemblyLoader.cs
@@ -23,7 +23,7 @@ namespace Orchard.Environment {
 
         public Assembly Load(string assemblyName) {
             try {
-                return _loadedAssemblies.GetOrAdd(this.ExtractAssemblyName(assemblyName), shortName => LoadWorker(shortName, assemblyName));
+                return _loadedAssemblies.GetOrAdd(this.ExtractAssemblyShortName(assemblyName), shortName => LoadWorker(shortName, assemblyName));
             }
             catch (Exception e) {
                 Logger.Warning(e, "Error loading assembly '{0}'", assemblyName);
@@ -59,11 +59,11 @@ namespace Orchard.Environment {
     }
 
     public static class AssemblyLoaderExtensions {
-        public static string ExtractAssemblyName(this IAssemblyLoader assemblyLoader, string fullName) {
-            return ExtractAssemblyName(fullName);
+        public static string ExtractAssemblyShortName(this IAssemblyLoader assemblyLoader, string fullName) {
+            return ExtractAssemblyShortName(fullName);
         }
 
-        public static string ExtractAssemblyName(string fullName) {
+        public static string ExtractAssemblyShortName(string fullName) {
             int index = fullName.IndexOf(',');
             if (index < 0)
                 return fullName;
diff --git a/src/Orchard/Environment/IAssemblyNameResolver.cs b/src/Orchard/Environment/IAssemblyNameResolver.cs
index 7f36b115a..f97631719 100644
--- a/src/Orchard/Environment/IAssemblyNameResolver.cs
+++ b/src/Orchard/Environment/IAssemblyNameResolver.cs
@@ -19,7 +19,7 @@ namespace Orchard.Environment {
         public string Resolve(string shortName) {
             return AppDomain.CurrentDomain
                 .GetAssemblies()
-                .Where(a => StringComparer.OrdinalIgnoreCase.Equals(shortName, AssemblyLoaderExtensions.ExtractAssemblyName(a.FullName)))
+                .Where(a => StringComparer.OrdinalIgnoreCase.Equals(shortName, AssemblyLoaderExtensions.ExtractAssemblyShortName(a.FullName)))
                 .Select(a => a.FullName)
                 .SingleOrDefault();
         }
@@ -40,7 +40,7 @@ namespace Orchard.Environment {
             var orchardFrameworkReferences = _cacheManager.Get(typeof(IAssemblyLoader), ctx =>
                             ctx.Key.Assembly
                             .GetReferencedAssemblies()
-                            .GroupBy(n => AssemblyLoaderExtensions.ExtractAssemblyName(n.FullName), StringComparer.OrdinalIgnoreCase)
+                            .GroupBy(n => AssemblyLoaderExtensions.ExtractAssemblyShortName(n.FullName), StringComparer.OrdinalIgnoreCase)
                             .ToDictionary(n => n.Key /*short assembly name*/, g => g.OrderBy(n => n.Version).Last() /* highest assembly version */, StringComparer.OrdinalIgnoreCase));
 
             AssemblyName assemblyName;
@@ -73,7 +73,7 @@ namespace Orchard.Environment {
                 .Select(s => TrimProcessorArchitecture(s))
                 .Where(s => !string.IsNullOrWhiteSpace(s))
                 .Distinct(StringComparer.OrdinalIgnoreCase)
-                .ToDictionary(s => AssemblyLoaderExtensions.ExtractAssemblyName(s), StringComparer.OrdinalIgnoreCase));
+                .ToDictionary(s => AssemblyLoaderExtensions.ExtractAssemblyShortName(s), StringComparer.OrdinalIgnoreCase));
 
             string fullName;
             if (lookup.TryGetValue(shortName, out fullName)) {