diff --git a/src/Umbraco.Core/Services/IRelationService.cs b/src/Umbraco.Core/Services/IRelationService.cs index 3383a02212..a629dc331d 100644 --- a/src/Umbraco.Core/Services/IRelationService.cs +++ b/src/Umbraco.Core/Services/IRelationService.cs @@ -5,7 +5,7 @@ using Umbraco.Core.Models.EntityBase; namespace Umbraco.Core.Services { - public interface IRelationService + public interface IRelationService : IService { /// /// Gets a by its Id diff --git a/src/Umbraco.Core/Services/RelationService.cs b/src/Umbraco.Core/Services/RelationService.cs index 756401383c..869fe8ab4d 100644 --- a/src/Umbraco.Core/Services/RelationService.cs +++ b/src/Umbraco.Core/Services/RelationService.cs @@ -327,7 +327,7 @@ namespace Umbraco.Core.Services Save(relationType); var relation = new Relation(parent.Id, child.Id, relationType); - if (Saving.IsRaisedEventCancelled(new SaveEventArgs(relation), this)) + if (SavingRelation.IsRaisedEventCancelled(new SaveEventArgs(relation), this)) return relation; var uow = _uowProvider.GetUnitOfWork(); @@ -337,7 +337,7 @@ namespace Umbraco.Core.Services uow.Commit(); } - Saved.RaiseEvent(new SaveEventArgs(relation, false), this); + RelationSaved.RaiseEvent(new SaveEventArgs(relation, false), this); return relation; } @@ -355,7 +355,7 @@ namespace Umbraco.Core.Services throw new ArgumentNullException(string.Format("No RelationType with Alias '{0}' exists.", relationTypeAlias)); var relation = new Relation(parent.Id, child.Id, relationType); - if (Saving.IsRaisedEventCancelled(new SaveEventArgs(relation), this)) + if (SavingRelation.IsRaisedEventCancelled(new SaveEventArgs(relation), this)) return relation; var uow = _uowProvider.GetUnitOfWork(); @@ -365,7 +365,7 @@ namespace Umbraco.Core.Services uow.Commit(); } - Saved.RaiseEvent(new SaveEventArgs(relation, false), this); + RelationSaved.RaiseEvent(new SaveEventArgs(relation, false), this); return relation; } @@ -403,7 +403,7 @@ namespace Umbraco.Core.Services /// Relation to save public void Save(IRelation relation) { - if (Saving.IsRaisedEventCancelled(new SaveEventArgs(relation), this)) + if (SavingRelation.IsRaisedEventCancelled(new SaveEventArgs(relation), this)) return; var uow = _uowProvider.GetUnitOfWork(); @@ -413,7 +413,7 @@ namespace Umbraco.Core.Services uow.Commit(); } - Saved.RaiseEvent(new SaveEventArgs(relation, false), this); + RelationSaved.RaiseEvent(new SaveEventArgs(relation, false), this); } /// @@ -441,7 +441,7 @@ namespace Umbraco.Core.Services /// Relation to Delete public void Delete(IRelation relation) { - if (Deleting.IsRaisedEventCancelled(new DeleteEventArgs(relation), this)) + if (DeletingRelation.IsRaisedEventCancelled(new DeleteEventArgs(relation), this)) return; var uow = _uowProvider.GetUnitOfWork(); @@ -451,7 +451,7 @@ namespace Umbraco.Core.Services uow.Commit(); } - Deleted.RaiseEvent(new DeleteEventArgs(relation, false), this); + RelationDeleted.RaiseEvent(new DeleteEventArgs(relation, false), this); } /// @@ -493,7 +493,7 @@ namespace Umbraco.Core.Services uow.Commit(); } - Deleted.RaiseEvent(new DeleteEventArgs(relations, false), this); + RelationDeleted.RaiseEvent(new DeleteEventArgs(relations, false), this); } #region Private Methods @@ -517,22 +517,22 @@ namespace Umbraco.Core.Services /// /// Occurs before Deleting a Relation /// - public static event TypedEventHandler> Deleting; + public static event TypedEventHandler> DeletingRelation; /// /// Occurs after a Relation is Deleted /// - public static event TypedEventHandler> Deleted; + public static event TypedEventHandler> RelationDeleted; /// /// Occurs before Saving a Relation /// - public static event TypedEventHandler> Saving; + public static event TypedEventHandler> SavingRelation; /// /// Occurs after a Relation is Saved /// - public static event TypedEventHandler> Saved; + public static event TypedEventHandler> RelationSaved; /// /// Occurs before Deleting a RelationType