From 8e7adc6ee258e82d9c717c1592b4b46f6529b8fa Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 9 Dec 2010 18:01:36 -0800 Subject: [PATCH] Remove unused legacy code --HG-- branch : dev --- .../Drivers/BlogArchivesPartDriver.cs | 2 +- .../Drivers/SearchFormPartDriver.cs | 2 +- .../Modules/Orchard.Search/Placement.info | 1 + .../Drivers/ContentFieldDriver.cs | 16 ++++------------ .../Drivers/ContentPartDriver.cs | 19 +++++-------------- .../Drivers/ContentShapeResult.cs | 11 ----------- 6 files changed, 12 insertions(+), 39 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs index 047e22687..0c0406ea7 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs @@ -24,7 +24,7 @@ namespace Orchard.Blogs.Drivers { return null; return shapeHelper.Parts_Blogs_BlogArchives(ContentItem: part.ContentItem, Blog: blog, Archives: _blogPostService.GetArchives(blog)); - }).Location("Content"); + }); } protected override DriverResult Editor(BlogArchivesPart part, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs index aa09a6fc5..1400a1873 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs @@ -7,7 +7,7 @@ namespace Orchard.Search.Drivers { protected override DriverResult Display(SearchFormPart part, string displayType, dynamic shapeHelper) { var model = new SearchViewModel(); - return ContentShape("Parts_Search_SearchForm", "Content:1", + return ContentShape("Parts_Search_SearchForm", () => { var shape = shapeHelper.Parts_Search_SearchForm(); shape.ContentPart = part; diff --git a/src/Orchard.Web/Modules/Orchard.Search/Placement.info b/src/Orchard.Web/Modules/Orchard.Search/Placement.info index c43801cdd..cbe277fdc 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Placement.info +++ b/src/Orchard.Web/Modules/Orchard.Search/Placement.info @@ -1,3 +1,4 @@  + diff --git a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs index 17cbcded1..57a5d8fd4 100644 --- a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs +++ b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs @@ -49,23 +49,15 @@ namespace Orchard.ContentManagement.Drivers { protected virtual DriverResult Editor(ContentPart part, TField field, IUpdateModel updater, dynamic shapeHelper) { return null; } public ContentShapeResult ContentShape(string shapeType, Func factory) { - return ContentShapeImplementation(shapeType, null, ctx => factory()); - } - - public ContentShapeResult ContentShape(string shapeType, string defaultLocation, Func factory) { - return ContentShapeImplementation(shapeType, defaultLocation, ctx => factory()); + return ContentShapeImplementation(shapeType, ctx => factory()); } public ContentShapeResult ContentShape(string shapeType, Func factory) { - return ContentShapeImplementation(shapeType, null, ctx=>factory(CreateShape(ctx, shapeType))); + return ContentShapeImplementation(shapeType, ctx=>factory(CreateShape(ctx, shapeType))); } - public ContentShapeResult ContentShape(string shapeType, string defaultLocation, Func factory) { - return ContentShapeImplementation(shapeType, defaultLocation, factory); - } - - private ContentShapeResult ContentShapeImplementation(string shapeType, string defaultLocation, Func shapeBuilder) { - return new ContentShapeResult(shapeType, Prefix, shapeBuilder).Location(defaultLocation); + private ContentShapeResult ContentShapeImplementation(string shapeType, Func shapeBuilder) { + return new ContentShapeResult(shapeType, Prefix, shapeBuilder); } private object CreateShape(BuildShapeContext context, string shapeType) { diff --git a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs index 6e274ef20..f4dbe1692 100644 --- a/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs +++ b/src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs @@ -7,7 +7,6 @@ using Orchard.DisplayManagement; namespace Orchard.ContentManagement.Drivers { public abstract class ContentPartDriver : IContentPartDriver where TContent : ContentPart, new() { protected virtual string Prefix { get { return ""; } } - protected virtual string Zone { get { return "Content"; } } DriverResult IContentPartDriver.BuildDisplay(BuildDisplayContext context) { var part = context.ContentItem.As(); @@ -30,27 +29,19 @@ namespace Orchard.ContentManagement.Drivers { [Obsolete("Provided while transitioning to factory variations")] public ContentShapeResult ContentShape(IShape shape) { - return ContentShapeImplementation(shape.Metadata.Type, Zone, ctx => shape); + return ContentShapeImplementation(shape.Metadata.Type, ctx => shape).Location("Content"); } public ContentShapeResult ContentShape(string shapeType, Func factory) { - return ContentShapeImplementation(shapeType, null, ctx => factory()); - } - - public ContentShapeResult ContentShape(string shapeType, string defaultLocation, Func factory) { - return ContentShapeImplementation(shapeType, defaultLocation, ctx => factory()); + return ContentShapeImplementation(shapeType, ctx => factory()); } public ContentShapeResult ContentShape(string shapeType, Func factory) { - return ContentShapeImplementation(shapeType, null, ctx => factory(CreateShape(ctx, shapeType))); + return ContentShapeImplementation(shapeType, ctx => factory(CreateShape(ctx, shapeType))); } - public ContentShapeResult ContentShape(string shapeType, string defaultLocation, Func factory) { - return ContentShapeImplementation(shapeType, defaultLocation, ctx => factory(CreateShape(ctx, shapeType))); - } - - private ContentShapeResult ContentShapeImplementation(string shapeType, string defaultLocation, Func shapeBuilder) { - return new ContentShapeResult(shapeType, Prefix, shapeBuilder).Location(defaultLocation); + private ContentShapeResult ContentShapeImplementation(string shapeType, Func shapeBuilder) { + return new ContentShapeResult(shapeType, Prefix, shapeBuilder); } private object CreateShape(BuildShapeContext context, string shapeType) { diff --git a/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs b/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs index 8095ebe2d..be6451e12 100644 --- a/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs +++ b/src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs @@ -49,16 +49,5 @@ namespace Orchard.ContentManagement.Drivers { _defaultLocation = zone; return this; } - - public ContentShapeResult Location(string zone, string position) { - _defaultLocation = zone + ":" + position; - return this; - } - - public ContentShapeResult Location(ContentLocation location) { - return location.Position == null - ? Location(location.Zone) - : Location(location.Zone, location.Position); - } } } \ No newline at end of file