diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs index 353e073a8..3984d495b 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs @@ -29,14 +29,6 @@ namespace Orchard.ContentManagement.Handlers { Filters.Add(new InlineStorageFilter { OnCreated = handler }); } - protected void OnSaving(Action handler) where TPart : class, IContent { - Filters.Add(new InlineStorageFilter { OnSaving = handler }); - } - - protected void OnSaved(Action handler) where TPart : class, IContent { - Filters.Add(new InlineStorageFilter { OnSaved = handler }); - } - protected void OnLoading(Action handler) where TPart : class, IContent { Filters.Add(new InlineStorageFilter { OnLoading = handler }); } @@ -97,8 +89,6 @@ namespace Orchard.ContentManagement.Handlers { public Action OnInitializing { get; set; } public Action OnCreating { get; set; } public Action OnCreated { get; set; } - public Action OnSaving { get; set; } - public Action OnSaved { get; set; } public Action OnLoading { get; set; } public Action OnLoaded { get; set; } public Action OnVersioning { get; set; } @@ -121,12 +111,6 @@ namespace Orchard.ContentManagement.Handlers { protected override void Created(CreateContentContext context, TPart instance) { if (OnCreated != null) OnCreated(context, instance); } - protected override void Saving(SaveContentContext context, TPart instance) { - if (OnSaving != null) OnSaving(context, instance); - } - protected override void Saved(SaveContentContext context, TPart instance) { - if (OnSaved != null) OnSaved(context, instance); - } protected override void Loading(LoadContentContext context, TPart instance) { if (OnLoading != null) OnLoading(context, instance); } @@ -211,18 +195,6 @@ namespace Orchard.ContentManagement.Handlers { Created(context); } - void IContentHandler.Saving(SaveContentContext context) { - foreach (var filter in Filters.OfType()) - filter.Saving(context); - Saving(context); - } - - void IContentHandler.Saved(SaveContentContext context) { - foreach (var filter in Filters.OfType()) - filter.Saved(context); - Saved(context); - } - void IContentHandler.Loading(LoadContentContext context) { foreach (var filter in Filters.OfType()) filter.Loading(context); @@ -312,9 +284,6 @@ namespace Orchard.ContentManagement.Handlers { protected virtual void Creating(CreateContentContext context) { } protected virtual void Created(CreateContentContext context) { } - protected virtual void Saving(SaveContentContext context) { } - protected virtual void Saved(SaveContentContext context) { } - protected virtual void Loading(LoadContentContext context) { } protected virtual void Loaded(LoadContentContext context) { } diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs b/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs index 6c25377ed..968d974fa 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs @@ -5,8 +5,6 @@ public virtual void Initializing(InitializingContentContext context) {} public virtual void Creating(CreateContentContext context) {} public virtual void Created(CreateContentContext context) {} - public virtual void Saving(SaveContentContext context) {} - public virtual void Saved(SaveContentContext context) {} public virtual void Loading(LoadContentContext context) {} public virtual void Loaded(LoadContentContext context) {} public virtual void Versioning(VersionContentContext context) {} diff --git a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs index 3750ae345..4d794a05b 100644 --- a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs @@ -5,8 +5,6 @@ void Initializing(InitializingContentContext context); void Creating(CreateContentContext context); void Created(CreateContentContext context); - void Saving(SaveContentContext context); - void Saved(SaveContentContext context); void Loading(LoadContentContext context); void Loaded(LoadContentContext context); void Versioning(VersionContentContext context); diff --git a/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs b/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs index 299a19047..cdfe9f99b 100644 --- a/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs +++ b/src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs @@ -4,8 +4,6 @@ namespace Orchard.ContentManagement.Handlers { void Initializing(InitializingContentContext context); void Creating(CreateContentContext context); void Created(CreateContentContext context); - void Saving(SaveContentContext context); - void Saved(SaveContentContext context); void Loading(LoadContentContext context); void Loaded(LoadContentContext context); void Versioning(VersionContentContext context); diff --git a/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs b/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs index 57675921f..aed0ac0da 100644 --- a/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs +++ b/src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs @@ -5,8 +5,6 @@ namespace Orchard.ContentManagement.Handlers { protected virtual void Initializing(InitializingContentContext context, TPart instance) { } protected virtual void Creating(CreateContentContext context, TPart instance) { } protected virtual void Created(CreateContentContext context, TPart instance) { } - protected virtual void Saving(SaveContentContext context, TPart instance) { } - protected virtual void Saved(SaveContentContext context, TPart instance) { } protected virtual void Loading(LoadContentContext context, TPart instance) { } protected virtual void Loaded(LoadContentContext context, TPart instance) { } protected virtual void Versioning(VersionContentContext context, TPart existing, TPart building) { } @@ -39,16 +37,6 @@ namespace Orchard.ContentManagement.Handlers { Created(context, context.ContentItem.As()); } - void IContentStorageFilter.Saving(SaveContentContext context) { - if (context.ContentItem.Is()) - Saving(context, context.ContentItem.As()); - } - - void IContentStorageFilter.Saved(SaveContentContext context) { - if (context.ContentItem.Is()) - Saved(context, context.ContentItem.As()); - } - void IContentStorageFilter.Loading(LoadContentContext context) { if (context.ContentItem.Is()) Loading(context, context.ContentItem.As()); diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index b54a863e2..bb0d57e39 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -309,7 +309,6 @@ Code - Code