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

Adding internal constructor overloads to Document, Content and CMSNode for better setup of legacy objects using new objects.

Browse Source
This commit is contained in:
Morten Christensen
2012-12-12 18:44:55 -01:00
parent 6dd63aa0b3
commit 0cdb7af3eb
4 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/umbraco.cms/businesslogic/CMSNode.cs
View File

@@ -4,6 +4,7 @@ using System.Data;
using System.Xml;
using Umbraco.Core.Models;
using Umbraco.Core.Models.EntityBase;
using umbraco.cms.businesslogic.web;
using umbraco.DataLayer;
using umbraco.BusinessLogic;
@@ -399,6 +400,11 @@ namespace umbraco.cms.businesslogic
PopulateCMSNodeFromReader(reader);
}
protected internal CMSNode(IEntity entity)
{
_id = entity.Id;
}
#endregion
#region Public Methods

23
src/umbraco.cms/businesslogic/Content.cs
View File

@@ -1,21 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Data;
using System.Xml;
using Umbraco.Core.IO;
using Umbraco.Core.Models;
using umbraco.cms.businesslogic.property;
using umbraco.cms.businesslogic.propertytype;
using umbraco.DataLayer;
using System.Runtime.CompilerServices;
using umbraco.cms.helpers;
using umbraco.BusinessLogic;
using umbraco.interfaces;
using System.IO;
using umbraco.IO;
using umbraco.cms.businesslogic.datatype.controls;
using Umbraco.Core;
using File = System.IO.File;
using Property = umbraco.cms.businesslogic.property.Property;
using PropertyType = umbraco.cms.businesslogic.propertytype.PropertyType;
namespace umbraco.cms.businesslogic
{
@@ -40,6 +36,7 @@ namespace umbraco.cms.businesslogic
private string _contentTypeIcon;
private ContentType _contentType;
private Properties m_LoadedProperties = null;
private IContentBase _contentBase;
#endregion
@@ -53,6 +50,16 @@ namespace umbraco.cms.businesslogic
protected Content(Guid id, bool noSetup) : base(id, noSetup) { }
protected internal Content(IContentBase contentBase)
: base(contentBase)
{
_contentBase = contentBase;
_version = _contentBase.Version;
_versionDate = _contentBase.UpdateDate;
_versionDateInitialized = true;
}
#endregion
#region Static Methods

33
src/umbraco.cms/businesslogic/web/Document.cs
View File

@@ -156,6 +156,11 @@ namespace umbraco.cms.businesslogic.web
}*/
}
internal Document(IContent content) : base(content)
{
setupNode(content);
}
#endregion
#region Constants and Static members
@@ -398,7 +403,7 @@ namespace umbraco.cms.businesslogic.web
ServiceContext.Current.ContentService.Save(content);
//read the whole object from the db
Document d = new Document(content.Id);
Document d = new Document(content);
//event
NewEventArgs e = new NewEventArgs();
@@ -443,7 +448,7 @@ namespace umbraco.cms.businesslogic.web
public static Document[] GetRootDocuments()
{
var content = ServiceContext.Current.ContentService.GetRootContent();
return content.Select(c => new Document(c.Id)).ToArray();
return content.Select(c => new Document(c)).ToArray();
}
public static int CountSubs(int parentId, bool publishedOnly)
@@ -474,7 +479,7 @@ namespace umbraco.cms.businesslogic.web
public static IEnumerable<Document> GetDocumentsOfDocumentType(int docTypeId)
{
var contents = ServiceContext.Current.ContentService.GetContentOfContentType(docTypeId);
return contents.Select(x => new Document(x.Id)).ToArray();
return contents.Select(x => new Document(x)).ToArray();
}
public static void RemoveTemplateFromDocument(int templateId)
@@ -492,7 +497,7 @@ namespace umbraco.cms.businesslogic.web
public static Document[] GetChildrenForTree(int NodeId)
{
var children = ServiceContext.Current.ContentService.GetChildren(NodeId);
var list = children.Select(x => new Document(x.Id));
var list = children.Select(x => new Document(x));
return list.ToArray();
}
@@ -500,7 +505,7 @@ namespace umbraco.cms.businesslogic.web
public static List<Document> GetChildrenBySearch(int NodeId, string searchString)
{
var children = ServiceContext.Current.ContentService.GetChildrenByName(NodeId, searchString);
return children.Select(x => new Document(x.Id)).ToList();
return children.Select(x => new Document(x)).ToList();
}
@@ -559,7 +564,7 @@ namespace umbraco.cms.businesslogic.web
public static Document[] GetDocumentsForExpiration()
{
var contents = ServiceContext.Current.ContentService.GetContentForExpiration();
return contents.Select(x => new Document(x.Id)).ToArray();
return contents.Select(x => new Document(x)).ToArray();
}
/// <summary>
@@ -570,7 +575,7 @@ namespace umbraco.cms.businesslogic.web
public static Document[] GetDocumentsForRelease()
{
var contents = ServiceContext.Current.ContentService.GetContentForRelease();
return contents.Select(x => new Document(x.Id)).ToArray();
return contents.Select(x => new Document(x)).ToArray();
}
#endregion
@@ -1151,7 +1156,7 @@ where '" + Path + ",' like " + SqlHelper.Concat("node.path", "',%'"));
{
// Make the new document
var content = ServiceContext.Current.ContentService.Copy(_content, CopyTo, RelateToOrignal, u.Id);
newDoc = new Document(content.Id);
newDoc = new Document(content);
e.NewDocument = newDoc;
FireAfterCopy(e);
@@ -1394,13 +1399,19 @@ where '" + Path + ",' like " + SqlHelper.Concat("node.path", "',%'"));
[Obsolete("Deprecated", false)]
protected override void setupNode()
{
_content = Version == Guid.Empty
var content = Version == Guid.Empty
? ServiceContext.Current.ContentService.GetById(Id)
: ServiceContext.Current.ContentService.GetByIdVersion(Id, Version);
if(_content == null)
if(content == null)
throw new ArgumentException(string.Format("No Document exists with id '{0}'", Id));
setupNode(content);
}
private void setupNode(IContent content)
{
_content = content;
//Setting private properties from IContent replacing CMSNode.setupNode() / CMSNode.PopulateCMSNodeFromReader()
base.PopulateCMSNodeFromContent(_content, _objectType);
@@ -1413,7 +1424,7 @@ where '" + Path + ",' like " + SqlHelper.Concat("node.path", "',%'"));
_writer = User.GetUser(_content.WriterId);
_updated = _content.UpdateDate;
if(_content.Template != null)
if (_content.Template != null)
_template = _content.Template.Id;
if (_content.ExpireDate.HasValue)

4
src/umbraco.controls/umbraco.controls.csproj
View File

@@ -124,6 +124,10 @@
<Project>{ccd75ec3-63db-4184-b49d-51c1dd337230}</Project>
<Name>umbraco.cms</Name>
</ProjectReference>
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
<Project>{31785bc3-256c-4613-b2f5-a1b0bdded8c1}</Project>
<Name>Umbraco.Core</Name>
</ProjectReference>
<ProjectReference Include="..\umbraco.datalayer\umbraco.datalayer.csproj">
<Project>{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}</Project>
<Name>umbraco.datalayer</Name>