diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs index 3a372296f0..c6f5f39e23 100644 --- a/src/Umbraco.Core/Models/ContentBase.cs +++ b/src/Umbraco.Core/Models/ContentBase.cs @@ -69,7 +69,7 @@ namespace Umbraco.Core.Models [IgnoreDataMember] public ISimpleContentType ContentType { get; private set; } - protected void ChangeContentType(ISimpleContentType contentType) + internal void ChangeContentType(ISimpleContentType contentType) { ContentType = contentType; ContentTypeId = contentType.Id; diff --git a/src/Umbraco.Core/Models/IMedia.cs b/src/Umbraco.Core/Models/IMedia.cs index 3e2d11fb71..3ad4f87aa8 100644 --- a/src/Umbraco.Core/Models/IMedia.cs +++ b/src/Umbraco.Core/Models/IMedia.cs @@ -4,19 +4,6 @@ namespace Umbraco.Core.Models { public interface IMedia : IContentBase { - /// - /// Changes the for the current content object - /// - /// New ContentType for this content - /// Leaves PropertyTypes intact after change - void ChangeContentType(IMediaType contentType); - - /// - /// Changes the for the current content object and removes PropertyTypes, - /// which are not part of the new ContentType. - /// - /// New ContentType for this content - /// Boolean indicating whether to clear PropertyTypes upon change - void ChangeContentType(IMediaType contentType, bool clearProperties); + } } diff --git a/src/Umbraco.Core/Models/Media.cs b/src/Umbraco.Core/Models/Media.cs index bf5f5cf948..d281f8f267 100644 --- a/src/Umbraco.Core/Models/Media.cs +++ b/src/Umbraco.Core/Models/Media.cs @@ -57,7 +57,7 @@ namespace Umbraco.Core.Models /// /// New MediaType for this Media /// Leaves PropertyTypes intact after change - public void ChangeContentType(IMediaType contentType) + internal void ChangeContentType(IMediaType contentType) { ChangeContentType(contentType, false); } @@ -68,7 +68,7 @@ namespace Umbraco.Core.Models /// /// New MediaType for this Media /// Boolean indicating whether to clear PropertyTypes upon change - public void ChangeContentType(IMediaType contentType, bool clearProperties) + internal void ChangeContentType(IMediaType contentType, bool clearProperties) { ChangeContentType(new SimpleContentType(contentType)); @@ -81,16 +81,5 @@ namespace Umbraco.Core.Models Properties.CollectionChanged += PropertiesChanged; } - /// - /// Changes the Trashed state of the content object - /// - /// Boolean indicating whether content is trashed (true) or not trashed (false) - /// - public void ChangeTrashedState(bool isTrashed, int parentId = -20) - { - Trashed = isTrashed; - //The Media Recycle Bin Id is -21 so we correct that here - ParentId = parentId == -20 ? -21 : parentId; - } } }