From 0d91cf30ac88349ec8b5ccc51223ae7d89b19dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= <> Date: Fri, 3 Sep 2010 14:02:37 -0700 Subject: [PATCH] Removing ContentType --HG-- branch : theming --- src/Orchard.Core.Tests/Body/BodyPartTests.cs | 15 ++++++--------- .../DefaultContentManagerTests.cs | 2 +- .../ContentManagement/Models/AlphaHandler.cs | 8 ++------ .../ContentManagement/Models/BetaHandler.cs | 11 +---------- .../ContentManagement/Models/Delta.cs | 9 +-------- .../ContentManagement/Models/Gamma.cs | 4 ---- .../Core/Settings/Models/SiteSettingsPart.cs | 1 - src/Orchard/ContentManagement/ContentType.cs | 6 ------ .../ContentManagement/DefaultContentManager.cs | 7 +++---- .../ContentManagement/Handlers/ContentHandler.cs | 4 ---- .../Handlers/ContentHandlerBase.cs | 9 +-------- .../ContentManagement/Handlers/IContentHandler.cs | 6 +----- src/Orchard/ContentManagement/IContentManager.cs | 3 ++- 13 files changed, 18 insertions(+), 67 deletions(-) delete mode 100644 src/Orchard/ContentManagement/ContentType.cs diff --git a/src/Orchard.Core.Tests/Body/BodyPartTests.cs b/src/Orchard.Core.Tests/Body/BodyPartTests.cs index 725904ebb..e79430e96 100644 --- a/src/Orchard.Core.Tests/Body/BodyPartTests.cs +++ b/src/Orchard.Core.Tests/Body/BodyPartTests.cs @@ -41,7 +41,7 @@ namespace Orchard.Core.Tests.Body { public void BodyCanHandleLongText() { var contentManager = _container.Resolve(); - contentManager.Create(ThingDriver.ContentType.Name, t => { + contentManager.Create(ThingDriver.ContentTypeName, t => { t.As().Record = new BodyPartRecord(); t.Text = new String('x', 10000); }); @@ -69,10 +69,10 @@ namespace Orchard.Core.Tests.Body { [UsedImplicitly] public class ThingHandler : ContentHandler { public ThingHandler() { - Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); - Filters.Add(new ActivatingFilter>(ThingDriver.ContentType.Name)); - Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); - Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); + Filters.Add(new ActivatingFilter(ThingDriver.ContentTypeName)); + Filters.Add(new ActivatingFilter>(ThingDriver.ContentTypeName)); + Filters.Add(new ActivatingFilter(ThingDriver.ContentTypeName)); + Filters.Add(new ActivatingFilter(ThingDriver.ContentTypeName)); } } @@ -87,10 +87,7 @@ namespace Orchard.Core.Tests.Body { } public class ThingDriver : ContentPartDriver { - public readonly static ContentType ContentType = new ContentType { - Name = "thing", - DisplayName = "Thing" - }; + public static readonly string ContentTypeName = "thing"; } } diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs index d644d4db0..b99acd7d0 100644 --- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs +++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs @@ -165,7 +165,7 @@ namespace Orchard.Tests.ContentManagement { [Test] public void GetContentTypesShouldReturnAllTypes() { - var types = _manager.GetContentTypes(); + var types = _manager.GetContentTypeDefinitions(); Assert.That(types.Count(), Is.EqualTo(4)); Assert.That(types, Has.Some.With.Property("Name").EqualTo("alpha")); Assert.That(types, Has.Some.With.Property("Name").EqualTo("beta")); diff --git a/src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs b/src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs index f9f762583..dc035cd53 100644 --- a/src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs +++ b/src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; -using Orchard.ContentManagement; -using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.ViewModels; namespace Orchard.Tests.ContentManagement.Models { @@ -8,9 +6,7 @@ namespace Orchard.Tests.ContentManagement.Models { public AlphaHandler() { OnGetDisplayShape((ctx, part) => ctx.AddDisplay(new TemplateViewModel(part) { Position = "3" })); } - public override IEnumerable GetContentTypes() { - return new[] { new ContentType { Name = "alpha" } }; - } + protected override void Activating(ActivatingContentContext context) { if (context.ContentType == "alpha") { context.Builder.Weld(); diff --git a/src/Orchard.Tests/ContentManagement/Models/BetaHandler.cs b/src/Orchard.Tests/ContentManagement/Models/BetaHandler.cs index 69d6b4ab2..5e03597be 100644 --- a/src/Orchard.Tests/ContentManagement/Models/BetaHandler.cs +++ b/src/Orchard.Tests/ContentManagement/Models/BetaHandler.cs @@ -1,16 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Orchard.ContentManagement; -using Orchard.ContentManagement.Handlers; +using Orchard.ContentManagement.Handlers; namespace Orchard.Tests.ContentManagement.Models { public class BetaHandler : ContentHandler { - public override System.Collections.Generic.IEnumerable GetContentTypes() { - return new[] { new ContentType { Name = "beta" } }; - } - protected override void Activating(ActivatingContentContext context) { if (context.ContentType == "beta") { context.Builder.Weld(); diff --git a/src/Orchard.Tests/ContentManagement/Models/Delta.cs b/src/Orchard.Tests/ContentManagement/Models/Delta.cs index ad3380791..22e0b0c1d 100644 --- a/src/Orchard.Tests/ContentManagement/Models/Delta.cs +++ b/src/Orchard.Tests/ContentManagement/Models/Delta.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Orchard.Data; +using Orchard.Data; using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; using Orchard.Tests.ContentManagement.Records; @@ -13,9 +9,6 @@ namespace Orchard.Tests.ContentManagement.Models { public class DeltaHandler : ContentHandler { - public override System.Collections.Generic.IEnumerable GetContentTypes() { - return new[] { new ContentType { Name = "delta" } }; - } public DeltaHandler(IRepository repository) { Filters.Add(new ActivatingFilter(x => x == "delta")); diff --git a/src/Orchard.Tests/ContentManagement/Models/Gamma.cs b/src/Orchard.Tests/ContentManagement/Models/Gamma.cs index 77c012a97..ec14f4c1e 100644 --- a/src/Orchard.Tests/ContentManagement/Models/Gamma.cs +++ b/src/Orchard.Tests/ContentManagement/Models/Gamma.cs @@ -9,10 +9,6 @@ namespace Orchard.Tests.ContentManagement.Models { public class GammaHandler : ContentHandler { - public override System.Collections.Generic.IEnumerable GetContentTypes() { - return new[] { new ContentType { Name = "gamma" } }; - } - public GammaHandler(IRepository repository) { Filters.Add(new ActivatingFilter(x => x == "gamma")); Filters.Add(StorageFilter.For(repository)); diff --git a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs index 2ef606aac..a0f8b561e 100644 --- a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs +++ b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs @@ -3,7 +3,6 @@ using Orchard.Settings; namespace Orchard.Core.Settings.Models { public sealed class SiteSettingsPart : ContentPart, ISite { - public static readonly ContentType ContentType = new ContentType { Name = "Site", DisplayName = "Site Settings" }; public string PageTitleSeparator { get { return Record.PageTitleSeparator; } diff --git a/src/Orchard/ContentManagement/ContentType.cs b/src/Orchard/ContentManagement/ContentType.cs deleted file mode 100644 index acf310bfd..000000000 --- a/src/Orchard/ContentManagement/ContentType.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Orchard.ContentManagement { - public class ContentType { - public string Name { get; set; } - public string DisplayName { get; set; } - } -} diff --git a/src/Orchard/ContentManagement/DefaultContentManager.cs b/src/Orchard/ContentManagement/DefaultContentManager.cs index 3c7743f56..f64e8fe2e 100644 --- a/src/Orchard/ContentManagement/DefaultContentManager.cs +++ b/src/Orchard/ContentManagement/DefaultContentManager.cs @@ -5,6 +5,7 @@ using Autofac; using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.MetaData; using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.Records; using Orchard.Data; using Orchard.Indexing; @@ -43,10 +44,8 @@ namespace Orchard.ContentManagement { } } - public IEnumerable GetContentTypes() { - return Handlers.Aggregate( - Enumerable.Empty(), - (types, handler) => types.Concat(handler.GetContentTypes())); + public IEnumerable GetContentTypeDefinitions() { + return _contentDefinitionManager.ListTypeDefinitions(); } public virtual ContentItem New(string contentType) { diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs index 50a0bdc76..10df8962b 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandler.cs @@ -181,10 +181,6 @@ namespace Orchard.ContentManagement.Handlers { } } - public virtual IEnumerable GetContentTypes() { - return Enumerable.Empty(); - } - void IContentHandler.Activating(ActivatingContentContext context) { foreach (var filter in Filters.OfType()) filter.Activating(context); diff --git a/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs b/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs index c9a988601..c599163f8 100644 --- a/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs +++ b/src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs @@ -1,12 +1,5 @@ -using System.Collections.Generic; -using System.Linq; - -namespace Orchard.ContentManagement.Handlers { +namespace Orchard.ContentManagement.Handlers { public class ContentHandlerBase : IContentHandler { - public virtual IEnumerable GetContentTypes() { - return Enumerable.Empty(); - } - public virtual void Activating(ActivatingContentContext context) {} public virtual void Activated(ActivatedContentContext context) {} public virtual void Initializing(InitializingContentContext context) {} diff --git a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs index 44440e18f..3a63decad 100644 --- a/src/Orchard/ContentManagement/Handlers/IContentHandler.cs +++ b/src/Orchard/ContentManagement/Handlers/IContentHandler.cs @@ -1,9 +1,5 @@ -using System.Collections.Generic; - -namespace Orchard.ContentManagement.Handlers { +namespace Orchard.ContentManagement.Handlers { public interface IContentHandler : IEvents { - IEnumerable GetContentTypes(); - void Activating(ActivatingContentContext context); void Activated(ActivatedContentContext context); void Initializing(InitializingContentContext context); diff --git a/src/Orchard/ContentManagement/IContentManager.cs b/src/Orchard/ContentManagement/IContentManager.cs index e4a3c964e..f58137302 100644 --- a/src/Orchard/ContentManagement/IContentManager.cs +++ b/src/Orchard/ContentManagement/IContentManager.cs @@ -1,10 +1,11 @@ using System.Collections.Generic; +using Orchard.ContentManagement.MetaData.Models; using Orchard.Indexing; using Orchard.Mvc.ViewModels; namespace Orchard.ContentManagement { public interface IContentManager : IDependency { - IEnumerable GetContentTypes(); + IEnumerable GetContentTypeDefinitions(); ContentItem New(string contentType);