From d6c4d648a6a248e2336a9eab8f7b683098294a0f Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Tue, 13 Oct 2015 21:29:19 +0200 Subject: [PATCH] Refactored content handler invocations using Invoke. --- .../DefaultContentManager.cs | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs index 192f60161..13de12062 100644 --- a/src/Orchard/ContentManagement/DefaultContentManager.cs +++ b/src/Orchard/ContentManagement/DefaultContentManager.cs @@ -764,13 +764,9 @@ namespace Orchard.ContentManagement { } var context = new ImportContentContext(item, element, importContentSession); - foreach (var contentHandler in Handlers) { - contentHandler.Importing(context); - } - foreach (var contentHandler in Handlers) { - contentHandler.Imported(context); - } + Handlers.Invoke(contentHandler => contentHandler.Importing(context), Logger); + Handlers.Invoke(contentHandler => contentHandler.Imported(context), Logger); var savedItem = Get(item.Id, VersionOptions.Latest); @@ -804,22 +800,15 @@ namespace Orchard.ContentManagement { var item = importContentSession.Get(identity, VersionOptions.Latest, XmlConvert.DecodeName(element.Name.LocalName)); var context = new ImportContentContext(item, element, importContentSession); - foreach (var handler in _handlers.Value) { - handler.ImportCompleted(context); - } + Handlers.Invoke(contentHandler => contentHandler.ImportCompleted(context), Logger); } public XElement Export(ContentItem contentItem) { var context = new ExportContentContext(contentItem, new XElement(XmlConvert.EncodeLocalName(contentItem.ContentType))); - foreach (var contentHandler in Handlers) { - contentHandler.Exporting(context); - } - - foreach (var contentHandler in Handlers) { - contentHandler.Exported(context); - } - + Handlers.Invoke(contentHandler => contentHandler.Exporting(context), Logger); + Handlers.Invoke(contentHandler => contentHandler.Exported(context), Logger); + if (context.Exclude) { return null; }