From afc5979c1060c76f242c03e08884e026e72c33d9 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Wed, 30 Jun 2010 20:01:44 -0700 Subject: [PATCH] Rename ReferenceDescriptor to DependencyReferenceDescriptor --HG-- branch : dev --- .../Extensions/ExtensionLoaderCoordinatorTests.cs | 2 +- .../Environment/Extensions/ExtensionManagerTests.cs | 2 +- .../Extensions/ExtensionLoaderCoordinator.cs | 12 ++++++------ .../Extensions/Loaders/DynamicExtensionLoader.cs | 3 +-- .../Extensions/Loaders/ExtensionLoaderBase.cs | 2 +- .../Extensions/Loaders/IExtensionLoader.cs | 2 +- .../Extensions/Loaders/PrecompiledExtensionLoader.cs | 2 +- .../Dependencies/DefaultDependenciesFolder.cs | 8 ++++---- .../FileSystems/Dependencies/IDependenciesFolder.cs | 6 +++--- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs index bffa41b90..1b156343c 100644 --- a/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs +++ b/src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs @@ -57,7 +57,7 @@ namespace Orchard.Tests.Environment.Extensions { get { return this.GetType().Name; } } - public Assembly LoadReference(ReferenceDescriptor reference) { + public Assembly LoadReference(DependencyReferenceDescriptor reference) { throw new NotImplementedException(); } diff --git a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs index 5023852a7..c112257fe 100644 --- a/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs +++ b/src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs @@ -56,7 +56,7 @@ namespace Orchard.Tests.Environment.Extensions { get { throw new NotImplementedException(); } } - public Assembly LoadReference(ReferenceDescriptor reference) { + public Assembly LoadReference(DependencyReferenceDescriptor reference) { throw new NotImplementedException(); } diff --git a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs index 3cb5802c8..332465f21 100644 --- a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs +++ b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs @@ -153,9 +153,9 @@ namespace Orchard.Environment.Extensions { } } - IEnumerable ProcessExtensionReferences(ExtensionLoadingContext context, ExtensionProbeEntry activatedExtension) { + IEnumerable ProcessExtensionReferences(ExtensionLoadingContext context, ExtensionProbeEntry activatedExtension) { if (activatedExtension == null) - return Enumerable.Empty(); + return Enumerable.Empty(); var referenceNames = (context.ReferencesByModule.ContainsKey(activatedExtension.Descriptor.Name) ? context.ReferencesByModule[activatedExtension.Descriptor.Name] : @@ -163,7 +163,7 @@ namespace Orchard.Environment.Extensions { .Select(r => r.Name) .Distinct(StringComparer.OrdinalIgnoreCase); - var referencesDecriptors = new List(); + var referencesDecriptors = new List(); foreach (var referenceName in referenceNames) { ProcessExtensionReference(context, activatedExtension, referenceName, referencesDecriptors); } @@ -174,7 +174,7 @@ namespace Orchard.Environment.Extensions { private void ProcessExtensionReference(ExtensionLoadingContext context, ExtensionProbeEntry activatedExtension, string referenceName, - IList activatedReferences) { + IList activatedReferences) { // Assemblies loaded by the BuildManager are ignored, since // we don't want to update them and they are automatically @@ -213,7 +213,7 @@ namespace Orchard.Environment.Extensions { context.ProcessedReferences.Add(bestBinaryReference.Entry.Name); bestBinaryReference.Entry.Loader.ReferenceActivated(context, bestBinaryReference.Entry); } - activatedReferences.Add(new ReferenceDescriptor { + activatedReferences.Add(new DependencyReferenceDescriptor { LoaderName = bestBinaryReference.Entry.Loader.Name, Name = bestBinaryReference.Entry.Name, VirtualPath = bestBinaryReference.Entry.VirtualPath @@ -224,7 +224,7 @@ namespace Orchard.Environment.Extensions { // Activated the module ref if (bestProbe != null) { - activatedReferences.Add(new ReferenceDescriptor { + activatedReferences.Add(new DependencyReferenceDescriptor { LoaderName = bestProbe.Loader.Name, Name = referenceName, VirtualPath = bestProbe.VirtualPath diff --git a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs index e867200ec..e6514b195 100644 --- a/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs @@ -9,7 +9,6 @@ using Orchard.Environment.Extensions.Models; using Orchard.FileSystems.Dependencies; using Orchard.FileSystems.VirtualPath; using Orchard.Logging; -using ReferenceDescriptor = Orchard.FileSystems.Dependencies.ReferenceDescriptor; namespace Orchard.Environment.Extensions.Loaders { public class DynamicExtensionLoader : ExtensionLoaderBase { @@ -97,7 +96,7 @@ namespace Orchard.Environment.Extensions.Loaders { } } - public override Assembly LoadReference(ReferenceDescriptor reference) { + public override Assembly LoadReference(DependencyReferenceDescriptor reference) { return _buildManager.GetCompiledAssembly(reference.VirtualPath); } diff --git a/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs b/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs index cae0ce53d..632a80695 100644 --- a/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs +++ b/src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs @@ -21,7 +21,7 @@ namespace Orchard.Environment.Extensions.Loaders { return Enumerable.Empty(); } - public virtual Assembly LoadReference(ReferenceDescriptor reference) { + public virtual Assembly LoadReference(DependencyReferenceDescriptor reference) { return null; } diff --git a/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs index 138e01dcc..b26a26278 100644 --- a/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs @@ -25,7 +25,7 @@ namespace Orchard.Environment.Extensions.Loaders { string Name { get; } IEnumerable ProbeReferences(ExtensionDescriptor extensionDescriptor); - Assembly LoadReference(ReferenceDescriptor reference); + Assembly LoadReference(DependencyReferenceDescriptor reference); void ReferenceActivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry); void ReferenceDeactivated(ExtensionLoadingContext context, ExtensionReferenceEntry referenceEntry); diff --git a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs index dd726cd0f..779edfca2 100644 --- a/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs +++ b/src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs @@ -155,7 +155,7 @@ namespace Orchard.Environment.Extensions.Loaders { }; } - public override Assembly LoadReference(ReferenceDescriptor reference) { + public override Assembly LoadReference(DependencyReferenceDescriptor reference) { return _assemblyProbingFolder.LoadAssembly(reference.Name); } diff --git a/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs b/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs index 08a26a328..fa9838869 100644 --- a/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs +++ b/src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs @@ -70,7 +70,7 @@ namespace Orchard.FileSystems.Dependencies { Name = elem(e, "ModuleName"), VirtualPath = elem(e, "VirtualPath"), LoaderName = elem(e, "LoaderName"), - References = e.Elements(ns("References")).Elements(ns("Reference")).Select(r => new ReferenceDescriptor { + References = e.Elements(ns("References")).Elements(ns("Reference")).Select(r => new DependencyReferenceDescriptor { Name = elem(r, "Name"), LoaderName = elem(r, "LoaderName"), VirtualPath = elem(r, "VirtualPath") @@ -127,8 +127,8 @@ namespace Orchard.FileSystems.Dependencies { } } - private class ReferenceDescriptorComparer : EqualityComparer { - public override bool Equals(ReferenceDescriptor x, ReferenceDescriptor y) { + private class ReferenceDescriptorComparer : EqualityComparer { + public override bool Equals(DependencyReferenceDescriptor x, DependencyReferenceDescriptor y) { return StringComparer.OrdinalIgnoreCase.Equals(x.Name, y.Name) && StringComparer.OrdinalIgnoreCase.Equals(x.LoaderName, y.LoaderName) && @@ -136,7 +136,7 @@ namespace Orchard.FileSystems.Dependencies { } - public override int GetHashCode(ReferenceDescriptor obj) { + public override int GetHashCode(DependencyReferenceDescriptor obj) { return StringComparer.OrdinalIgnoreCase.GetHashCode(obj.Name) ^ StringComparer.OrdinalIgnoreCase.GetHashCode(obj.LoaderName) ^ diff --git a/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs index b7aca2073..5468cab95 100644 --- a/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs +++ b/src/Orchard/FileSystems/Dependencies/IDependenciesFolder.cs @@ -5,15 +5,15 @@ using Orchard.Caching; namespace Orchard.FileSystems.Dependencies { public class DependencyDescriptor { public DependencyDescriptor() { - References = Enumerable.Empty(); + References = Enumerable.Empty(); } public string Name { get; set; } public string LoaderName { get; set; } public string VirtualPath { get; set; } - public IEnumerable References { get; set; } + public IEnumerable References { get; set; } } - public class ReferenceDescriptor { + public class DependencyReferenceDescriptor { public string Name { get; set; } public string LoaderName { get; set; } public string VirtualPath { get; set; }