From b5ed08edea20611416810f74e1c29bea29bcea61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <> Date: Fri, 3 Sep 2010 17:52:53 -0700 Subject: [PATCH] Removed IEvents interface - Replaced by IEventHandler and IEventBus --HG-- branch : dev --- src/Orchard.Tests/EventsTests.cs | 4 +--- src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs | 2 +- .../Coordinators/ContentItemDriverCoordinator.cs | 1 + .../ContentManagement/Drivers/IContentFieldDriver.cs | 2 +- .../ContentManagement/Drivers/IContentItemDriver.cs | 2 +- .../ContentManagement/Drivers/IContentPartDriver.cs | 2 +- .../ContentManagement/Handlers/IContentHandler.cs | 2 +- src/Orchard/Events/IEventBusHandler.cs | 2 +- src/Orchard/Indexing/IIndexNotifierHandler.cs | 6 ++++-- src/Orchard/{IEvents.cs => InvokeExtensions.cs} | 10 ++++++---- src/Orchard/Orchard.Framework.csproj | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) rename src/Orchard/{IEvents.cs => InvokeExtensions.cs} (83%) diff --git a/src/Orchard.Tests/EventsTests.cs b/src/Orchard.Tests/EventsTests.cs index fe2846508..49a7136ad 100644 --- a/src/Orchard.Tests/EventsTests.cs +++ b/src/Orchard.Tests/EventsTests.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using NUnit.Framework; using Orchard.Logging; @@ -48,7 +46,7 @@ namespace Orchard.Tests { public object[] LogArgs { get; set; } } - private interface ITestEvents : IEvents { + private interface ITestEvents : IDependency { void Hello(string name); } diff --git a/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs b/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs index 6320c5c62..cfe813c18 100644 --- a/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs +++ b/src/Orchard.Web/Core/Feeds/IFeedQueryProvider.cs @@ -1,7 +1,7 @@ using Orchard.Core.Feeds.Models; namespace Orchard.Core.Feeds { - public interface IFeedQueryProvider : IEvents { + public interface IFeedQueryProvider : IDependency { FeedQueryMatch Match(FeedContext context); } diff --git a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentItemDriverCoordinator.cs b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentItemDriverCoordinator.cs index 52fe45307..fcca74706 100644 --- a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentItemDriverCoordinator.cs +++ b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentItemDriverCoordinator.cs @@ -2,6 +2,7 @@ using JetBrains.Annotations; using Orchard.ContentManagement.Handlers; using Orchard.Logging; +using Orchard.Utility.Extensions; namespace Orchard.ContentManagement.Drivers.Coordinators { [UsedImplicitly] diff --git a/src/Orchard/ContentManagement/Drivers/IContentFieldDriver.cs b/src/Orchard/ContentManagement/Drivers/IContentFieldDriver.cs index a62493aac..50c132b76 100644 --- a/src/Orchard/ContentManagement/Drivers/IContentFieldDriver.cs +++ b/src/Orchard/ContentManagement/Drivers/IContentFieldDriver.cs @@ -3,7 +3,7 @@ using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.MetaData; namespace Orchard.ContentManagement.Drivers { - public interface IContentFieldDriver : IEvents { + public interface IContentFieldDriver : IDependency { DriverResult BuildDisplayModel(BuildDisplayModelContext context); DriverResult BuildEditorModel(BuildEditorModelContext context); DriverResult UpdateEditorModel(UpdateEditorModelContext context); diff --git a/src/Orchard/ContentManagement/Drivers/IContentItemDriver.cs b/src/Orchard/ContentManagement/Drivers/IContentItemDriver.cs index 182c776e4..891fafa5f 100644 --- a/src/Orchard/ContentManagement/Drivers/IContentItemDriver.cs +++ b/src/Orchard/ContentManagement/Drivers/IContentItemDriver.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Orchard.ContentManagement.Handlers; namespace Orchard.ContentManagement.Drivers { - public interface IContentItemDriver : IEvents { + public interface IContentItemDriver : IDependency { IEnumerable GetContentTypes(); void GetContentItemMetadata(GetContentItemMetadataContext context); diff --git a/src/Orchard/ContentManagement/Drivers/IContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/IContentPartDriver.cs index 3db5084e6..e6c7923d3 100644 --- a/src/Orchard/ContentManagement/Drivers/IContentPartDriver.cs +++ b/src/Orchard/ContentManagement/Drivers/IContentPartDriver.cs @@ -3,7 +3,7 @@ using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.MetaData; namespace Orchard.ContentManagement.Drivers { - public interface IContentPartDriver : IEvents { + public interface IContentPartDriver : IDependency { DriverResult BuildDisplayModel(BuildDisplayModelContext context); DriverResult BuildEditorModel(BuildEditorModelContext context); DriverResult UpdateEditorModel(UpdateEditorModelContext context); diff --git a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs index cac4cb0fb..ef46b3594 100644 --- a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; namespace Orchard.ContentManagement.Handlers { - public interface IContentHandler : IEvents { + public interface IContentHandler : IDependency { IEnumerable GetContentTypes(); void Activating(ActivatingContentContext context); diff --git a/src/Orchard/Events/IEventBusHandler.cs b/src/Orchard/Events/IEventBusHandler.cs index dc1dc821a..3cb6e12be 100644 --- a/src/Orchard/Events/IEventBusHandler.cs +++ b/src/Orchard/Events/IEventBusHandler.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; namespace Orchard.Events { - public interface IEventBusHandler : IEvents { + public interface IEventBusHandler : IDependency { void Process(string messageName, IDictionary eventData); } } diff --git a/src/Orchard/Indexing/IIndexNotifierHandler.cs b/src/Orchard/Indexing/IIndexNotifierHandler.cs index f115544d9..e9e60d055 100644 --- a/src/Orchard/Indexing/IIndexNotifierHandler.cs +++ b/src/Orchard/Indexing/IIndexNotifierHandler.cs @@ -1,5 +1,7 @@ -namespace Orchard.Indexing { - public interface IIndexNotifierHandler : IEvents { +using Orchard.Events; + +namespace Orchard.Indexing { + public interface IIndexNotifierHandler : IEventHandler { void UpdateIndex(string indexName); } } diff --git a/src/Orchard/IEvents.cs b/src/Orchard/InvokeExtensions.cs similarity index 83% rename from src/Orchard/IEvents.cs rename to src/Orchard/InvokeExtensions.cs index d14356ac8..1819ba086 100644 --- a/src/Orchard/IEvents.cs +++ b/src/Orchard/InvokeExtensions.cs @@ -7,11 +7,13 @@ using Orchard.Logging; using Orchard.Security; namespace Orchard { - public interface IEvents : IDependency { - } - public static class EventsExtensions { - public static void Invoke(this IEnumerable events, Action dispatch, ILogger logger) where TEvents : IEvents { + public static class InvokeExtensions { + + /// + /// Safely invoke methods by catching non fatal exceptions and logging them + /// + public static void Invoke(this IEnumerable events, Action dispatch, ILogger logger) { foreach (var sink in events) { try { dispatch(sink); diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 267db2924..d5c6d08a2 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -649,7 +649,7 @@ - +