From b29a71f2790fe510377b55e4e6117a82d894d64c Mon Sep 17 00:00:00 2001 From: Stefan Forsberg Date: Tue, 6 Aug 2013 18:00:27 +0200 Subject: [PATCH] Removed page events --- .../InMemoryContentRepository.cs | 162 ++---------------- 1 file changed, 15 insertions(+), 147 deletions(-) diff --git a/src/WhiteMagic.Tests/InMemoryContentRepository.cs b/src/WhiteMagic.Tests/InMemoryContentRepository.cs index faf1c98..8023da1 100644 --- a/src/WhiteMagic.Tests/InMemoryContentRepository.cs +++ b/src/WhiteMagic.Tests/InMemoryContentRepository.cs @@ -8,7 +8,6 @@ using EPiServer.Security; using EPiServer.SpecializedProperties; using EPiServer.Web; -using StructureMap; namespace WhiteMagic.Tests { @@ -137,27 +136,16 @@ public void DeleteChildren(ContentReference contentLink, bool forceDelete, Acces public void Delete(ContentReference pageLink, bool forceDelete, AccessLevel access) { - PageEventArgs args = new PageEventArgs(pageLink); - RaisePageEvent(DeletingPage, args); - RaisePageEvent(DeletedPage, args); - throw new NotImplementedException(); } public void DeleteLanguageBranch(ContentReference pageLink, string languageBranch, AccessLevel access) { - PageEventArgs args = new PageEventArgs(pageLink); - RaisePageEvent(DeletingPageLanguage, args); - RaisePageEvent(DeletedPageLanguage, args); - throw new NotImplementedException(); } public void Move(ContentReference pageLink, ContentReference destinationLink, AccessLevel requiredSourceAccess, AccessLevel requiredDestinationAccess) { - PageEventArgs pageArgs = new PageEventArgs(pageLink, destinationLink); - RaisePageEvent(MovingPage, pageArgs); - var page = GetPage(pageLink.ToPageReference()).CreateWritableClone(); _structure[page.ParentLink].Remove(pageLink.ToPageReference()); @@ -173,8 +161,6 @@ public void Move(ContentReference pageLink, ContentReference destinationLink, Ac { _structure[destinationLink.ToPageReference()].Add(page.PageLink); } - - RaisePageEvent(MovedPage, pageArgs); ; } public void MoveToWastebasket(ContentReference contentLink, string deletedBy) @@ -206,8 +192,6 @@ private PageDataCollection GetChildren(PageReference pageLink, int startIndex, i ChildrenEventArgs args = new ChildrenEventArgs(pageLink, children); try { - - RaiseChildrenEvent(LoadingChildren, args); List childrenRefs; if (_structure.TryGetValue(pageLink, out childrenRefs)) { @@ -219,12 +203,9 @@ private PageDataCollection GetChildren(PageReference pageLink, int startIndex, i } catch { - RaiseChildrenEvent(FailedLoadingChildren, args); - throw; + } - - RaiseChildrenEvent(LoadedChildren, args); - RaiseChildrenEvent(FinishedLoadingChildren, args); + return new PageDataCollection(children); } @@ -236,52 +217,31 @@ private PageData GetDefaultPageData(PageReference parentPageLink, int pageTypeID public TPageData GetDefaultPageData(PageReference parentPageLink) where TPageData : IContentData { - PageEventArgs args = new PageEventArgs(parentPageLink); - RaisePageEvent(LoadingDefaultPageData, args); - - var emptyPage = ConstructContentData(String.Empty, parentPageLink); - - RaisePageEvent(LoadedDefaultPageData, new PageEventArgs(emptyPage as PageData)); - - return emptyPage; + return ConstructContentData(String.Empty, parentPageLink); } private PageDataCollection GetLanguageBranches(PageReference pageLink) { - PageDataCollection languages = new PageDataCollection(); + var languages = new PageDataCollection(); languages.Add(GetPage(pageLink)); return languages; } private PageData GetPage(PageReference pageLink, ILanguageSelector selector) { - RaisePageEvent(LoadingPage, new PageEventArgs(pageLink)); - PageData page = null; - try + List pages; + if (!_pages.TryGetValue(pageLink, out pages)) { - List pages; - if (!_pages.TryGetValue(pageLink, out pages)) - { - throw new PageNotFoundException(pageLink); - } - page = pages.Last(); - LanguageSelector ls = selector as LanguageSelector; - if (ls != null && !String.IsNullOrEmpty(ls.LanguageBranch)) - { - page = pages.Find(p => p.LanguageBranch == ls.LanguageBranch); - } + throw new PageNotFoundException(pageLink); } - catch + page = pages.Last(); + LanguageSelector ls = selector as LanguageSelector; + if (ls != null && !String.IsNullOrEmpty(ls.LanguageBranch)) { - RaisePageEvent(FailedLoadingPage, new PageEventArgs(pageLink)); - throw; + page = pages.Find(p => p.LanguageBranch == ls.LanguageBranch); } - - PageEventArgs pageArgs = new PageEventArgs(page); - RaisePageEvent(LoadedPage, pageArgs); - RaisePageEvent(FinishedLoadingPage, pageArgs); - + return page; } @@ -305,61 +265,38 @@ public PageReference Save(PageData page, SaveAction action, AccessLevel access) page.PageGuid = Guid.NewGuid(); } - PageEventArgs pageArgs = new PageEventArgs(page); - RaisePageEvent(SavingPage, pageArgs); - - if (!_pages.ContainsKey(page.PageLink)) - { - RaisePageEvent(CreatingPage, pageArgs); - } - + if ((action & SaveAction.CheckIn) == SaveAction.CheckIn) { - RaisePageEvent(CheckingInPage, pageArgs); - page["PagePendingPublish"] = true; - - RaisePageEvent(CheckedInPage, pageArgs); } if ((action & SaveAction.Publish) == SaveAction.Publish) { - RaisePageEvent(PublishingPage, pageArgs); - page["PagePendingPublish"] = false; page["PageWorkStatus"] = VersionStatus.Published; page.Changed = DateTime.Now; - - RaisePageEvent(PublishedPage, pageArgs); } if ((action & SaveAction.ForceCurrentVersion) == SaveAction.ForceCurrentVersion) { - RaisePageEvent(PublishingPage, pageArgs); - page["PagePendingPublish"] = false; page["PageWorkStatus"] = VersionStatus.Published; page.Changed = DateTime.Now; - - RaisePageEvent(PublishedPage, pageArgs); } if ((action & SaveAction.ForceNewVersion) == SaveAction.ForceNewVersion) { - RaisePageEvent(PublishingPage, pageArgs); - page["PagePendingPublish"] = false; page["PageWorkStatus"] = VersionStatus.Published; page.Changed = DateTime.Now; - - RaisePageEvent(PublishedPage, pageArgs); } try { if (String.IsNullOrEmpty(page.LinkURL)) { - page.LinkURL = "/templates/Page.aspx?id=" + page.PageLink.ToString(); + page.LinkURL = "/templates/Page.aspx?id=" + page.PageLink; } } catch @@ -370,12 +307,10 @@ public PageReference Save(PageData page, SaveAction action, AccessLevel access) if (!_pages.ContainsKey(page.PageLink)) { _pages[page.PageLink] = new List(); - RaisePageEvent(CreatedPage, pageArgs); } _pages[page.PageLink].Add(page); - RaisePageEvent(SavedPage, pageArgs); if (!PageReference.IsNullOrEmpty(page.ParentLink)) { @@ -407,22 +342,6 @@ private PageData GetPage(PageReference pageLink) return pages.Last().Copy(); } - private void RaisePageEvent(PageEventHandler pageEvent, PageEventArgs e) - { - if (pageEvent != null) - { - pageEvent(this, e); - } - } - - private void RaiseChildrenEvent(ChildrenEventHandler childrenEvent, ChildrenEventArgs e) - { - if (childrenEvent != null) - { - childrenEvent(this, e); - } - } - private TPageData ConstructContentData(string pageName, PageReference parentLink) where TPageData : IContentData { @@ -497,61 +416,10 @@ private void InitBlocks(object page) } } - #region Events - public event PageEventHandler LoadingPage; - - public event PageEventHandler LoadedPage; - - public event PageEventHandler FinishedLoadingPage; - - public event PageEventHandler FailedLoadingPage; - - public event PageEventHandler LoadingDefaultPageData; - - public event PageEventHandler LoadedDefaultPageData; - - public event PageEventHandler PublishingPage; - - public event PageEventHandler PublishedPage; - - public event PageEventHandler CheckingInPage; - - public event PageEventHandler CheckedInPage; - - public event PageEventHandler DeletingPage; - - public event PageEventHandler DeletedPage; - - public event PageEventHandler DeletingPageLanguage; - - public event PageEventHandler DeletedPageLanguage; - - public event PageEventHandler MovingPage; - - public event PageEventHandler MovedPage; - - public event PageEventHandler CreatingPage; - - public event PageEventHandler CreatedPage; - - public event PageEventHandler SavingPage; - - public event PageEventHandler SavedPage; - - public event ChildrenEventHandler LoadingChildren; - - public event ChildrenEventHandler LoadedChildren; - - public event ChildrenEventHandler FinishedLoadingChildren; - - public event ChildrenEventHandler FailedLoadingChildren; - - #endregion - //Helper method to cast from PageData to T (if possible else null) private T EnsureTOrNull(PageData page) { - return new PageData[] { page }.OfType().FirstOrDefault(); + return new[] { page }.OfType().FirstOrDefault(); } }