From 4d351ad8aee89ca819a7dae0a2456128886c0908 Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Mon, 26 Nov 2012 07:06:18 -0100 Subject: [PATCH] Making all Macro related classes internal, as the new macro stuff won't be utilized in 6.0. --- src/Umbraco.Core/Macros/PropertyTypes/ContentAll.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/ContentPicker.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/ContentRandom.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/ContentStubs.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/ContentTree.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/ContentType.cs | 2 +- .../Macros/PropertyTypes/ContentTypeMultiple.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/MediaCurrent.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/Number.cs | 2 +- .../Macros/PropertyTypes/PropertyTypePicker.cs | 2 +- .../Macros/PropertyTypes/PropertyTypePickerMultiple.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/TabPicker.cs | 2 +- .../Macros/PropertyTypes/TabPickerMultiple.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/Text.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/TextMultiLine.cs | 2 +- src/Umbraco.Core/Macros/PropertyTypes/YesNoBool.cs | 2 +- src/Umbraco.Core/Models/IMacro.cs | 2 +- src/Umbraco.Core/Models/IMacroProperty.cs | 2 +- src/Umbraco.Core/Models/IMacroPropertyType.cs | 2 +- src/Umbraco.Core/Models/Macro.cs | 2 +- src/Umbraco.Core/Models/MacroProperty.cs | 2 +- src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs | 5 ++++- src/Umbraco.Core/Models/MacroTypes.cs | 8 +++++++- .../Repositories/Interfaces/IMacroRepository.cs | 2 +- src/Umbraco.Core/Services/MacroService.cs | 9 ++++++++- 25 files changed, 41 insertions(+), 25 deletions(-) diff --git a/src/Umbraco.Core/Macros/PropertyTypes/ContentAll.cs b/src/Umbraco.Core/Macros/PropertyTypes/ContentAll.cs index a10742aef9..602f069e6f 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/ContentAll.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/ContentAll.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class ContentAll : IMacroPropertyType + internal class ContentAll : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/ContentPicker.cs b/src/Umbraco.Core/Macros/PropertyTypes/ContentPicker.cs index d3526314d0..10c6eaa0a3 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/ContentPicker.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/ContentPicker.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class ContentPicker : IMacroPropertyType + internal class ContentPicker : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/ContentRandom.cs b/src/Umbraco.Core/Macros/PropertyTypes/ContentRandom.cs index c6aa7a46d5..c243dc9835 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/ContentRandom.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/ContentRandom.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class ContentRandom : IMacroPropertyType + internal class ContentRandom : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/ContentStubs.cs b/src/Umbraco.Core/Macros/PropertyTypes/ContentStubs.cs index 2c5889a6f0..22e8d23ad7 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/ContentStubs.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/ContentStubs.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class ContentStubs : IMacroPropertyType + internal class ContentStubs : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/ContentTree.cs b/src/Umbraco.Core/Macros/PropertyTypes/ContentTree.cs index 19be18ebe5..f104db1a1f 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/ContentTree.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/ContentTree.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class ContentTree : IMacroPropertyType + internal class ContentTree : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/ContentType.cs b/src/Umbraco.Core/Macros/PropertyTypes/ContentType.cs index 7ebd8862a3..09bf497248 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/ContentType.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/ContentType.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class ContentType : IMacroPropertyType + internal class ContentType : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/ContentTypeMultiple.cs b/src/Umbraco.Core/Macros/PropertyTypes/ContentTypeMultiple.cs index 451d3918de..f78003396c 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/ContentTypeMultiple.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/ContentTypeMultiple.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class ContentTypeMultiple : IMacroPropertyType + internal class ContentTypeMultiple : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/MediaCurrent.cs b/src/Umbraco.Core/Macros/PropertyTypes/MediaCurrent.cs index 7850ee072a..cfbe37ec65 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/MediaCurrent.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/MediaCurrent.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class MediaCurrent : IMacroPropertyType + internal class MediaCurrent : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/Number.cs b/src/Umbraco.Core/Macros/PropertyTypes/Number.cs index eab4bf60db..4f5713e24a 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/Number.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/Number.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class Number : IMacroPropertyType + internal class Number : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePicker.cs b/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePicker.cs index e1ff10369f..ca32b44038 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePicker.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePicker.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class PropertyTypePicker : IMacroPropertyType + internal class PropertyTypePicker : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePickerMultiple.cs b/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePickerMultiple.cs index 7199faabbd..3d6596d055 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePickerMultiple.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/PropertyTypePickerMultiple.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class PropertyTypePickerMultiple : IMacroPropertyType + internal class PropertyTypePickerMultiple : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/TabPicker.cs b/src/Umbraco.Core/Macros/PropertyTypes/TabPicker.cs index 7c8e1d3e45..8b5dd9cf6c 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/TabPicker.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/TabPicker.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class TabPicker : IMacroPropertyType + internal class TabPicker : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/TabPickerMultiple.cs b/src/Umbraco.Core/Macros/PropertyTypes/TabPickerMultiple.cs index 7681fccd4f..791331fc69 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/TabPickerMultiple.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/TabPickerMultiple.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class TabPickerMultiple : IMacroPropertyType + internal class TabPickerMultiple : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/Text.cs b/src/Umbraco.Core/Macros/PropertyTypes/Text.cs index ddc7fca1a3..5aa67bb017 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/Text.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/Text.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class Text : IMacroPropertyType + internal class Text : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/TextMultiLine.cs b/src/Umbraco.Core/Macros/PropertyTypes/TextMultiLine.cs index d5eb7cddf8..29ccb43230 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/TextMultiLine.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/TextMultiLine.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class TextMultiLine : IMacroPropertyType + internal class TextMultiLine : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Macros/PropertyTypes/YesNoBool.cs b/src/Umbraco.Core/Macros/PropertyTypes/YesNoBool.cs index 793c3d3659..91c71fd49a 100644 --- a/src/Umbraco.Core/Macros/PropertyTypes/YesNoBool.cs +++ b/src/Umbraco.Core/Macros/PropertyTypes/YesNoBool.cs @@ -2,7 +2,7 @@ namespace Umbraco.Core.Macros.PropertyTypes { - public class YesNoBool : IMacroPropertyType + internal class YesNoBool : IMacroPropertyType { public string Alias { diff --git a/src/Umbraco.Core/Models/IMacro.cs b/src/Umbraco.Core/Models/IMacro.cs index a35784aa8b..78b67cd769 100644 --- a/src/Umbraco.Core/Models/IMacro.cs +++ b/src/Umbraco.Core/Models/IMacro.cs @@ -7,7 +7,7 @@ namespace Umbraco.Core.Models /// /// Defines a Macro /// - public interface IMacro : IAggregateRoot + internal interface IMacro : IAggregateRoot { /// /// Gets or sets the alias of the Macro diff --git a/src/Umbraco.Core/Models/IMacroProperty.cs b/src/Umbraco.Core/Models/IMacroProperty.cs index 91e80716dc..40935fc117 100644 --- a/src/Umbraco.Core/Models/IMacroProperty.cs +++ b/src/Umbraco.Core/Models/IMacroProperty.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.Models /// /// Defines a Property for a Macro /// - public interface IMacroProperty : IValueObject + internal interface IMacroProperty : IValueObject { /// /// Gets or sets the Alias of the Property diff --git a/src/Umbraco.Core/Models/IMacroPropertyType.cs b/src/Umbraco.Core/Models/IMacroPropertyType.cs index acbc9ec6ef..7c4bc0057f 100644 --- a/src/Umbraco.Core/Models/IMacroPropertyType.cs +++ b/src/Umbraco.Core/Models/IMacroPropertyType.cs @@ -3,7 +3,7 @@ namespace Umbraco.Core.Models /// /// Defines a PropertyType (plugin) for a Macro /// - public interface IMacroPropertyType + internal interface IMacroPropertyType { /// /// Gets the unique Alias of the Property Type diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs index c5829831ab..904cb05d66 100644 --- a/src/Umbraco.Core/Models/Macro.cs +++ b/src/Umbraco.Core/Models/Macro.cs @@ -10,7 +10,7 @@ namespace Umbraco.Core.Models /// [Serializable] [DataContract(IsReference = true)] - public class Macro : Entity, IMacro + internal class Macro : Entity, IMacro { /// /// Gets or sets the alias of the Macro diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs index bc183fbf7d..f86f1c4aa1 100644 --- a/src/Umbraco.Core/Models/MacroProperty.cs +++ b/src/Umbraco.Core/Models/MacroProperty.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Models /// [Serializable] [DataContract(IsReference = true)] - public class MacroProperty : IMacroProperty + internal class MacroProperty : IMacroProperty { /// /// Gets or sets the Alias of the Property diff --git a/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs b/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs index 27ff5a1bfa..f997e90b57 100644 --- a/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs +++ b/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs @@ -8,10 +8,13 @@ namespace Umbraco.Core.Models /// [Serializable] [DataContract(IsReference = true)] - public enum MacroPropertyTypeBaseTypes + internal enum MacroPropertyTypeBaseTypes { + [EnumMember] Int32, + [EnumMember] Boolean, + [EnumMember] String } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/MacroTypes.cs b/src/Umbraco.Core/Models/MacroTypes.cs index a8f32ebff1..2261152f87 100644 --- a/src/Umbraco.Core/Models/MacroTypes.cs +++ b/src/Umbraco.Core/Models/MacroTypes.cs @@ -8,13 +8,19 @@ namespace Umbraco.Core.Models /// [Serializable] [DataContract(IsReference = true)] - public enum MacroTypes + internal enum MacroTypes { + [EnumMember] Xslt = 1, + [EnumMember] CustomControl = 2, + [EnumMember] UserControl = 3, + [EnumMember] Unknown = 4, + [EnumMember] Python = 5, + [EnumMember] Script = 6 } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMacroRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMacroRepository.cs index 4f028a78a2..0a10344b48 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMacroRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Interfaces/IMacroRepository.cs @@ -6,7 +6,7 @@ namespace Umbraco.Core.Persistence.Repositories /// Defines the Macro Repository, which exposes CRUD operations for /// /// Uses string Alias as the Id type - public interface IMacroRepository : IRepositoryQueryable + internal interface IMacroRepository : IRepositoryQueryable { } diff --git a/src/Umbraco.Core/Services/MacroService.cs b/src/Umbraco.Core/Services/MacroService.cs index 0eee5d7ec4..1c3f4f5aa6 100644 --- a/src/Umbraco.Core/Services/MacroService.cs +++ b/src/Umbraco.Core/Services/MacroService.cs @@ -22,7 +22,14 @@ namespace Umbraco.Core.Services public MacroService(IUnitOfWorkProvider provider) { _unitOfWork = provider.GetUnitOfWork(); - EnsureMacroCache(); + } + + public MacroService(IUnitOfWorkProvider provider, bool ensureCachedMacros) + { + _unitOfWork = provider.GetUnitOfWork(); + + if(ensureCachedMacros) + EnsureMacroCache(); } ///