Making all Macro related classes internal, as the new macro stuff won't be utilized in 6.0.

2012-11-26 07:06:18 -01:00
parent ce12bfa80e
commit 4d351ad8ae
25 changed files with 41 additions and 25 deletions
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- 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
        {
--- a/src/Umbraco.Core/Models/IMacro.cs
+++ b/src/Umbraco.Core/Models/IMacro.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Core.Models
    /// <summary>
    /// Defines a Macro
    /// </summary>
-    public interface IMacro : IAggregateRoot
+    internal interface IMacro : IAggregateRoot
    {
        /// <summary>
        /// Gets or sets the alias of the Macro
--- a/src/Umbraco.Core/Models/IMacroProperty.cs
+++ b/src/Umbraco.Core/Models/IMacroProperty.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Models
    /// <summary>
    /// Defines a Property for a Macro
    /// </summary>
-    public interface IMacroProperty : IValueObject
+    internal interface IMacroProperty : IValueObject
    {
        /// <summary>
        /// Gets or sets the Alias of the Property
--- a/src/Umbraco.Core/Models/IMacroPropertyType.cs
+++ b/src/Umbraco.Core/Models/IMacroPropertyType.cs
@@ -3,7 +3,7 @@ namespace Umbraco.Core.Models
    /// <summary>
    /// Defines a PropertyType (plugin) for a Macro
    /// </summary>
-    public interface IMacroPropertyType
+    internal interface IMacroPropertyType
    {
        /// <summary>
        /// Gets the unique Alias of the Property Type
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Models
    /// </summary>
    [Serializable]
    [DataContract(IsReference = true)]
-    public class Macro : Entity, IMacro
+    internal class Macro : Entity, IMacro
    {
        /// <summary>
        /// Gets or sets the alias of the Macro
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Models
    /// </summary>
    [Serializable]
    [DataContract(IsReference = true)]
-    public class MacroProperty : IMacroProperty
+    internal class MacroProperty : IMacroProperty
    {
        /// <summary>
        /// Gets or sets the Alias of the Property
--- a/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs
+++ b/src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs
@@ -8,10 +8,13 @@ namespace Umbraco.Core.Models
    /// </summary>
    [Serializable]
    [DataContract(IsReference = true)]
-    public enum MacroPropertyTypeBaseTypes
+    internal enum MacroPropertyTypeBaseTypes
    {
+        [EnumMember]
        Int32,
+        [EnumMember]
        Boolean,
+        [EnumMember]
        String
    }
 }
--- a/src/Umbraco.Core/Models/MacroTypes.cs
+++ b/src/Umbraco.Core/Models/MacroTypes.cs
@@ -8,13 +8,19 @@ namespace Umbraco.Core.Models
    /// </summary>
    [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
    }
 }
--- 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 <see cref="IMacro"/>
    /// </summary>
    /// <remarks>Uses string Alias as the Id type</remarks>
-    public interface IMacroRepository : IRepositoryQueryable<string, IMacro>
+    internal interface IMacroRepository : IRepositoryQueryable<string, IMacro>
    {
         
    }
--- 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();
        }

        /// <summary>