yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U4-6674 - Kill ToContentSet, becomes ToIndexedArray

Browse Source
This commit is contained in:
Stephan
2016-06-09 20:13:20 +02:00
parent cfa91f000b
commit be2d81154b
18 changed files with 626 additions and 1826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
src/Umbraco.Web/Models/DynamicPublishedContent.cs
View File

@@ -28,13 +28,6 @@ namespace Umbraco.Web.Models
protected internal IPublishedContent PublishedContent { get; private set; }
private DynamicPublishedContentList _contentList;
// must implement that one if we implement IPublishedContent
public IEnumerable<IPublishedContent> ContentSet
{
// that is a definitively non-efficient way of doing it, though it should work
get { return _contentList ?? (_contentList = new DynamicPublishedContentList(PublishedContent.ContentSet)); }
}
public PublishedContentType ContentType { get { return PublishedContent.ContentType; } }
#region Constructors
@@ -435,11 +428,6 @@ namespace Umbraco.Web.Models
get { return PublishedContent.IsDraft; }
}
int IPublishedContent.GetIndex()
{
return PublishedContent.GetIndex();
}
ICollection<IPublishedProperty> IPublishedContent.Properties
{
get { return PublishedContent.Properties; }
@@ -775,20 +763,6 @@ namespace Umbraco.Web.Models
#endregion
#region IPublishedContente extension methods - ContentSet
public int Position()
{
return Index();
}
public int Index()
{
return PublishedContent.GetIndex();
}
#endregion
#region IPublishedContent extension methods - IsSomething: misc
public bool Visible
@@ -818,160 +792,6 @@ namespace Umbraco.Web.Models
#endregion
#region IPublishedContent extension methods - IsSomething: position in set
public bool IsFirst()
{
return PublishedContent.IsFirst();
}
public HtmlString IsFirst(string valueIfTrue)
{
return PublishedContent.IsFirst(valueIfTrue);
}
public HtmlString IsFirst(string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsFirst(valueIfTrue, valueIfFalse);
}
public bool IsNotFirst()
{
return PublishedContent.IsNotFirst();
}
public HtmlString IsNotFirst(string valueIfTrue)
{
return PublishedContent.IsNotFirst(valueIfTrue);
}
public HtmlString IsNotFirst(string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsNotFirst(valueIfTrue, valueIfFalse);
}
public bool IsPosition(int index)
{
return PublishedContent.IsPosition(index);
}
public HtmlString IsPosition(int index, string valueIfTrue)
{
return PublishedContent.IsPosition(index, valueIfTrue);
}
public HtmlString IsPosition(int index, string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsPosition(index, valueIfTrue, valueIfFalse);
}
public bool IsModZero(int modulus)
{
return PublishedContent.IsModZero(modulus);
}
public HtmlString IsModZero(int modulus, string valueIfTrue)
{
return PublishedContent.IsModZero(modulus, valueIfTrue);
}
public HtmlString IsModZero(int modulus, string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsModZero(modulus, valueIfTrue, valueIfFalse);
}
public bool IsNotModZero(int modulus)
{
return PublishedContent.IsNotModZero(modulus);
}
public HtmlString IsNotModZero(int modulus, string valueIfTrue)
{
return PublishedContent.IsNotModZero(modulus, valueIfTrue);
}
public HtmlString IsNotModZero(int modulus, string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsNotModZero(modulus, valueIfTrue, valueIfFalse);
}
public bool IsNotPosition(int index)
{
return PublishedContent.IsNotPosition(index);
}
public HtmlString IsNotPosition(int index, string valueIfTrue)
{
return PublishedContent.IsNotPosition(index, valueIfTrue);
}
public HtmlString IsNotPosition(int index, string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsNotPosition(index, valueIfTrue, valueIfFalse);
}
public bool IsLast()
{
return PublishedContent.IsLast();
}
public HtmlString IsLast(string valueIfTrue)
{
return PublishedContent.IsLast(valueIfTrue);
}
public HtmlString IsLast(string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsLast(valueIfTrue, valueIfFalse);
}
public bool IsNotLast()
{
return PublishedContent.IsNotLast();
}
public HtmlString IsNotLast(string valueIfTrue)
{
return PublishedContent.IsNotLast(valueIfTrue);
}
public HtmlString IsNotLast(string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsNotLast(valueIfTrue, valueIfFalse);
}
public bool IsEven()
{
return PublishedContent.IsEven();
}
public HtmlString IsEven(string valueIfTrue)
{
return PublishedContent.IsEven(valueIfTrue);
}
public HtmlString IsEven(string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsEven(valueIfTrue, valueIfFalse);
}
public bool IsOdd()
{
return PublishedContent.IsOdd();
}
public HtmlString IsOdd(string valueIfTrue)
{
return PublishedContent.IsOdd(valueIfTrue);
}
public HtmlString IsOdd(string valueIfTrue, string valueIfFalse)
{
return PublishedContent.IsOdd(valueIfTrue, valueIfFalse);
}
#endregion
#region IPublishedContent extension methods - IsSomething: equality
public bool IsEqual(DynamicPublishedContent other)
@@ -1209,46 +1029,6 @@ namespace Umbraco.Web.Models
return PublishedContent.Down(contentTypeAlias).AsDynamicOrNull();
}
public DynamicPublishedContent Next()
{
return PublishedContent.Next().AsDynamicOrNull();
}
public DynamicPublishedContent Next(int number)
{
return PublishedContent.Next(number).AsDynamicOrNull();
}
public DynamicPublishedContent Next(string contentTypeAlias)
{
return PublishedContent.Next(contentTypeAlias).AsDynamicOrNull();
}
public DynamicPublishedContent Previous()
{
return PublishedContent.Previous().AsDynamicOrNull();
}
public DynamicPublishedContent Previous(int number)
{
return PublishedContent.Previous(number).AsDynamicOrNull();
}
public DynamicPublishedContent Previous(string contentTypeAlias)
{
return PublishedContent.Previous(contentTypeAlias).AsDynamicOrNull();
}
public DynamicPublishedContent Sibling(int number)
{
return PublishedContent.Previous(number).AsDynamicOrNull();
}
public DynamicPublishedContent Sibling(string contentTypeAlias)
{
return PublishedContent.Previous(contentTypeAlias).AsDynamicOrNull();
}
#endregion
#region Parent

14
src/Umbraco.Web/Models/DynamicPublishedContentList.cs
View File

@@ -19,7 +19,6 @@ namespace Umbraco.Web.Models
public class DynamicPublishedContentList : DynamicObject, IEnumerable<DynamicPublishedContent>
{
private readonly List<IPublishedContent> _content;
private readonly PublishedContentSet<IPublishedContent> _contentSet;
internal readonly List<DynamicPublishedContent> Items;
#region Constructor
@@ -27,22 +26,19 @@ namespace Umbraco.Web.Models
public DynamicPublishedContentList()
{
_content = new List<IPublishedContent>();
_contentSet = new PublishedContentSet<IPublishedContent>(_content);
Items = new List<DynamicPublishedContent>();
}
public DynamicPublishedContentList(IEnumerable<IPublishedContent> items)
{
_content = items.ToList();
_contentSet = new PublishedContentSet<IPublishedContent>(_content);
Items = _contentSet.Select(x => new DynamicPublishedContent(x, this)).ToList();
Items = _content.Select(x => new DynamicPublishedContent(x, this)).ToList();
}
public DynamicPublishedContentList(IEnumerable<DynamicPublishedContent> items)
{
_content = items.Select(x => x.PublishedContent).ToList();
_contentSet = new PublishedContentSet<IPublishedContent>(_content);
Items = _contentSet.Select(x => new DynamicPublishedContent(x, this)).ToList();
Items = _content.Select(x => new DynamicPublishedContent(x, this)).ToList();
}
#endregion
@@ -67,10 +63,7 @@ namespace Umbraco.Web.Models
{
var content = dynamicContent.PublishedContent;
_content.Add(content);
_contentSet.SourceChanged();
var setContent = _contentSet.MapContent(content);
Items.Add(new DynamicPublishedContent(setContent, this));
Items.Add(new DynamicPublishedContent(content, this));
}
/// <summary>
@@ -82,7 +75,6 @@ namespace Umbraco.Web.Models
if (Items.Contains(dynamicContent) == false) return;
Items.Remove(dynamicContent);
_content.Remove(dynamicContent.PublishedContent);
_contentSet.SourceChanged();
}
#endregion

18
src/Umbraco.Web/Models/PublishedContentBase.cs
View File

@@ -115,14 +115,6 @@ namespace Umbraco.Web.Models
public abstract bool IsDraft { get; }
public int GetIndex()
{
var index = this.Siblings().FindIndex(x => x.Id == Id);
if (index < 0)
throw new IndexOutOfRangeException("Could not find content in the content set.");
return index;
}
#endregion
#region Tree
@@ -140,16 +132,6 @@ namespace Umbraco.Web.Models
#endregion
#region ContentSet
public virtual IEnumerable<IPublishedContent> ContentSet
{
// the default content set of a content is its siblings
get { return this.Siblings(); }
}
#endregion
#region ContentType
public abstract PublishedContentType ContentType { get; }