lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Removed unused parameter

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-06-18 18:35:19 -07:00
parent a7841bd919
commit 253126957d
8 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
View File

@@ -64,11 +64,11 @@ namespace Orchard.Tests.Environment.Extensions {
return new ExtensionEntry { Descriptor = descriptor, ExportedTypes = new[] { typeof(Alpha), typeof(Beta), typeof(Phi) } }; return new ExtensionEntry { Descriptor = descriptor, ExportedTypes = new[] { typeof(Alpha), typeof(Beta), typeof(Phi) } };
} }
public void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
throw new NotImplementedException(); throw new NotImplementedException();
} }

4
src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
View File

@@ -63,11 +63,11 @@ namespace Orchard.Tests.Environment.Extensions {
return new ExtensionEntry { Descriptor = descriptor, ExportedTypes = new[] { typeof(Alpha), typeof(Beta), typeof(Phi) } }; return new ExtensionEntry { Descriptor = descriptor, ExportedTypes = new[] { typeof(Alpha), typeof(Beta), typeof(Phi) } };
} }
public void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
throw new NotImplementedException(); throw new NotImplementedException();
} }

16
src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
View File

@@ -58,8 +58,7 @@ namespace Orchard.Environment.Extensions {
// load that extension. // load that extension.
var newDependencies = new List<DependencyDescriptor>(); var newDependencies = new List<DependencyDescriptor>();
foreach (var extension in extensions) { foreach (var extension in extensions) {
bool isNewExtension = newExtensions.Any(e => e.Name == extension.Name); ProcessExtension(ctx, extension, existingDependencies, newDependencies);
ProcessExtension(ctx, extension, isNewExtension, existingDependencies, newDependencies);
} }
// Execute all the work need by "ctx" // Execute all the work need by "ctx"
@@ -71,9 +70,8 @@ namespace Orchard.Environment.Extensions {
} }
private void ProcessExtension( private void ProcessExtension(
ExtensionLoadingContext ctx, ExtensionLoadingContext loadingContext,
ExtensionDescriptor extension, ExtensionDescriptor extension,
bool isNewExtension,
IEnumerable<DependencyDescriptor> existingDependencies, IEnumerable<DependencyDescriptor> existingDependencies,
List<DependencyDescriptor> newDependencies) { List<DependencyDescriptor> newDependencies) {
@@ -98,17 +96,17 @@ namespace Orchard.Environment.Extensions {
var previousDependency = existingDependencies.Where(d => d.Name == extension.Name).FirstOrDefault(); var previousDependency = existingDependencies.Where(d => d.Name == extension.Name).FirstOrDefault();
if (activatedExtension == null) { if (activatedExtension == null) {
Logger.Warning("No loader found for extension {0}!", extension.Name); Logger.Warning("No loader found for extension \"{0}\"!", extension.Name);
} }
foreach (var loader in _loaders) { foreach (var loader in _loaders) {
if (activatedExtension != null && activatedExtension.Loader.Name == loader.Name) { if (activatedExtension != null && activatedExtension.Loader.Name == loader.Name) {
Logger.Information("Activating extension \"{0}\" with loader \"{1}\"", activatedExtension.Descriptor.Name, loader.Name); Logger.Information("Activating extension \"{0}\" with loader \"{1}\"", activatedExtension.Descriptor.Name, loader.Name);
loader.ExtensionActivated(ctx, isNewExtension, extension); loader.ExtensionActivated(loadingContext, extension);
} }
else if (previousDependency != null && previousDependency.LoaderName == loader.Name) { else if (previousDependency != null && previousDependency.LoaderName == loader.Name) {
Logger.Information("Deactivating extension \"{0}\" from loader \"{1}\"", previousDependency.Name, loader.Name); Logger.Information("Deactivating extension \"{0}\" from loader \"{1}\"", previousDependency.Name, loader.Name);
loader.ExtensionDeactivated(ctx, isNewExtension, extension); loader.ExtensionDeactivated(loadingContext, extension);
} }
} }
@@ -132,12 +130,12 @@ namespace Orchard.Environment.Extensions {
} }
if (ctx.RestartAppDomain) { if (ctx.RestartAppDomain) {
Logger.Information("AppDomain restart required."); Logger.Information("AppDomain restart required.");
_hostEnvironment.RestartAppDomain(); _hostEnvironment.RestartAppDomain();
} }
if (ctx.ResetSiteCompilation) { if (ctx.ResetSiteCompilation) {
Logger.Information("Reset site compilation state required."); Logger.Information("Reset site compilation state required.");
_hostEnvironment.ResetSiteCompilation(); _hostEnvironment.ResetSiteCompilation();
} }
} }

4
src/Orchard/Environment/Extensions/Loaders/ExtensionLoaderBase.cs
View File

@@ -26,8 +26,8 @@ namespace Orchard.Environment.Extensions.Loaders {
return null; return null;
} }
public virtual void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { } public virtual void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { }
public virtual void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { } public virtual void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) { }
public virtual void ExtensionRemoved(ExtensionLoadingContext ctx, DependencyDescriptor dependency) { } public virtual void ExtensionRemoved(ExtensionLoadingContext ctx, DependencyDescriptor dependency) { }
public virtual void Monitor(ExtensionDescriptor extension, Action<IVolatileToken> monitor) { } public virtual void Monitor(ExtensionDescriptor extension, Action<IVolatileToken> monitor) { }

4
src/Orchard/Environment/Extensions/Loaders/IExtensionLoader.cs
View File

@@ -19,8 +19,8 @@ namespace Orchard.Environment.Extensions.Loaders {
ExtensionProbeEntry Probe(ExtensionDescriptor descriptor); ExtensionProbeEntry Probe(ExtensionDescriptor descriptor);
ExtensionEntry Load(ExtensionDescriptor descriptor); ExtensionEntry Load(ExtensionDescriptor descriptor);
void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension); void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension);
void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension); void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension);
void ExtensionRemoved(ExtensionLoadingContext ctx, DependencyDescriptor dependency); void ExtensionRemoved(ExtensionLoadingContext ctx, DependencyDescriptor dependency);
void Monitor(ExtensionDescriptor extension, Action<IVolatileToken> monitor); void Monitor(ExtensionDescriptor extension, Action<IVolatileToken> monitor);

4
src/Orchard/Environment/Extensions/Loaders/PrecompiledExtensionLoader.cs
View File

@@ -55,7 +55,7 @@ namespace Orchard.Environment.Extensions.Loaders {
} }
} }
public override void ExtensionActivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public override void ExtensionActivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
string sourceFileName = _virtualPathProvider.MapPath(GetAssemblyPath(extension)); string sourceFileName = _virtualPathProvider.MapPath(GetAssemblyPath(extension));
// Copy the assembly if it doesn't exist or if it is older than the source file. // Copy the assembly if it doesn't exist or if it is older than the source file.
@@ -73,7 +73,7 @@ namespace Orchard.Environment.Extensions.Loaders {
} }
} }
public override void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public override void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
if (_assemblyProbingFolder.AssemblyExists(extension.Name)) { if (_assemblyProbingFolder.AssemblyExists(extension.Name)) {
ctx.DeleteActions.Add(() => _assemblyProbingFolder.DeleteAssembly(extension.Name)); ctx.DeleteActions.Add(() => _assemblyProbingFolder.DeleteAssembly(extension.Name));

2
src/Orchard/Environment/Extensions/Loaders/ProbingExtensionLoader.cs
View File

@@ -45,7 +45,7 @@ namespace Orchard.Environment.Extensions.Loaders {
} }
} }
public override void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public override void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
if (_assemblyProbingFolder.AssemblyExists(extension.Name)) { if (_assemblyProbingFolder.AssemblyExists(extension.Name)) {
ctx.DeleteActions.Add(() => _assemblyProbingFolder.DeleteAssembly(extension.Name)); ctx.DeleteActions.Add(() => _assemblyProbingFolder.DeleteAssembly(extension.Name));

2
src/Orchard/Environment/Extensions/Loaders/ReferencedExtensionLoader.cs
View File

@@ -28,7 +28,7 @@ namespace Orchard.Environment.Extensions.Loaders {
public override int Order { get { return 20; } } public override int Order { get { return 20; } }
public override void ExtensionDeactivated(ExtensionLoadingContext ctx, bool isNewExtension, ExtensionDescriptor extension) { public override void ExtensionDeactivated(ExtensionLoadingContext ctx, ExtensionDescriptor extension) {
var assemblyPath = _virtualPathProvider.Combine("~/bin", extension.Name + ".dll"); var assemblyPath = _virtualPathProvider.Combine("~/bin", extension.Name + ".dll");
if (_virtualPathProvider.FileExists(assemblyPath)) { if (_virtualPathProvider.FileExists(assemblyPath)) {
ctx.DeleteActions.Add(() => File.Delete(_virtualPathProvider.MapPath(assemblyPath))); ctx.DeleteActions.Add(() => File.Delete(_virtualPathProvider.MapPath(assemblyPath)));