diff --git a/src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs b/src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs index 1788932c8f..76b6d0295e 100644 --- a/src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs +++ b/src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs @@ -3,91 +3,90 @@ using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.UI; -using System.Linq; +using umbraco.interfaces; using Umbraco.Core.Logging; using Umbraco.Core.ObjectResolution; -using umbraco.interfaces; namespace Umbraco.Core.Macros { - /// - /// A resolver to return all IMacroGuiRendering objects - /// - /// - /// Much of this classes methods are based on legacy code from umbraco.editorControls.macrocontainer.MacroControlFactory - /// this code should probably be reviewed and cleaned up if necessary. - /// - internal sealed class MacroFieldEditorsResolver : LazyManyObjectsResolverBase - { - /// - /// Constructor - /// - /// - /// - /// - internal MacroFieldEditorsResolver(IServiceProvider serviceProvider, ILogger logger, Func> macroEditors) + /// + /// A resolver to return all IMacroGuiRendering objects + /// + /// + /// Much of this classes methods are based on legacy code from umbraco.editorControls.macrocontainer.MacroControlFactory + /// this code should probably be reviewed and cleaned up if necessary. + /// + internal sealed class MacroFieldEditorsResolver : LazyManyObjectsResolverBase + { + /// + /// Constructor + /// + /// + /// + /// + internal MacroFieldEditorsResolver(IServiceProvider serviceProvider, ILogger logger, Func> macroEditors) : base(serviceProvider, logger, macroEditors, ObjectLifetimeScope.Transient) - { } + { } - /// - /// Gets the implementations. - /// - public IEnumerable MacroFieldEditors - { - get - { - return Values; - } - } + /// + /// Gets the implementations. + /// + public IEnumerable MacroFieldEditors + { + get + { + return Values; + } + } - /// - /// Gets the value based on the type of control - /// - /// - /// - /// - /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory - /// - internal string GetValueFromMacroControl(Control macroControl) - { + /// + /// Gets the value based on the type of control + /// + /// + /// + /// + /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory + /// + internal string GetValueFromMacroControl(Control macroControl) + { return HttpUtility.HtmlDecode(((IMacroGuiRendering)macroControl).Value); - } + } - /// - /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory - /// - internal List MacroControlTypes - { - get { return InstanceTypes.ToList(); } - } + /// + /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory + /// + internal List MacroControlTypes + { + get { return InstanceTypes.ToList(); } + } - /// - /// Create an instance of a Macro control and return it. - /// Because the macro control uses inline client script whichs is not generated after postback - /// That's why we use the Page Picker instead of the content picker of the macro. - /// - /// - /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory - /// - internal Control GetMacroRenderControlByType(PersistableMacroProperty prop, string uniqueId) - { - var m = MacroControlTypes.FindLast(macroGuiCcontrol => macroGuiCcontrol.ToString() == string.Format("{0}.{1}", prop.AssemblyName, prop.TypeName)); - var instance = ServiceProvider.GetService(m) as IMacroGuiRendering; - if (instance != null) - { - if (string.IsNullOrEmpty(prop.Value) == false) - { + /// + /// Create an instance of a Macro control and return it. + /// Because the macro control uses inline client script whichs is not generated after postback + /// That's why we use the Page Picker instead of the content picker of the macro. + /// + /// + /// This is legacy code migrated from umbraco.editorControls.macrocontainer.MacroControlFactory + /// + internal Control GetMacroRenderControlByType(PersistableMacroProperty prop, string uniqueId) + { + var m = MacroControlTypes.FindLast(macroGuiCcontrol => macroGuiCcontrol.ToString() == string.Format("{0}.{1}", prop.AssemblyName, prop.TypeName)); + var instance = ServiceProvider.GetService(m) as IMacroGuiRendering; + if (instance != null) + { + if (string.IsNullOrEmpty(prop.Value) == false) + { instance.Value = HttpUtility.HtmlDecode(prop.Value); - } - var macroControl = instance as Control; - if (macroControl != null) - { - macroControl.ID = uniqueId; - return macroControl; - } - } - return null; - } + } + var macroControl = instance as Control; + if (macroControl != null) + { + macroControl.ID = uniqueId; + return macroControl; + } + } + return null; + } - } -} \ No newline at end of file + } +} diff --git a/src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs b/src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs index 4decb03ca0..d4472e2f1b 100644 --- a/src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs +++ b/src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs @@ -1,15 +1,11 @@ using System; using System.Collections.Generic; using System.Text.RegularExpressions; -using Moq; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Logging; -using Umbraco.Core.Logging; using Umbraco.Core.Models.Rdbms; -using Umbraco.Core.ObjectResolution; using Umbraco.Core.Persistence; -using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Tests.TestHelpers; @@ -113,16 +109,16 @@ namespace Umbraco.Tests.Persistence //re-create it dbSqlServer.Execute(@"CREATE TABLE [umbracoServer]( - [id] [int] IDENTITY(1,1) NOT NULL, - [address] [nvarchar](500) NOT NULL, - [computerName] [nvarchar](255) NOT NULL, - [registeredDate] [datetime] NOT NULL CONSTRAINT [DF_umbracoServer_registeredDate] DEFAULT (getdate()), - [lastNotifiedDate] [datetime] NOT NULL, - [isActive] [bit] NOT NULL, - [isMaster] [bit] NOT NULL, + [id] [int] IDENTITY(1,1) NOT NULL, + [address] [nvarchar](500) NOT NULL, + [computerName] [nvarchar](255) NOT NULL, + [registeredDate] [datetime] NOT NULL CONSTRAINT [DF_umbracoServer_registeredDate] DEFAULT (getdate()), + [lastNotifiedDate] [datetime] NOT NULL, + [isActive] [bit] NOT NULL, + [isMaster] [bit] NOT NULL, CONSTRAINT [PK_umbracoServer] PRIMARY KEY CLUSTERED ( - [id] ASC + [id] ASC )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] )"); var data = new List(); @@ -282,4 +278,4 @@ namespace Umbraco.Tests.Persistence } } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs index 56fe6306e3..3a212dddfa 100644 --- a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs +++ b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs @@ -1,16 +1,12 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.ObjectResolution; -using Umbraco.Core.IO; namespace Umbraco.Web.Media.ThumbnailProviders { - [Weight(1000)] + [Weight(1000)] public class ImageThumbnailProvider : AbstractThumbnailProvider { protected override IEnumerable SupportedExtensions diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs index d6cfbbef13..68acfe3d1f 100644 --- a/src/Umbraco.Web/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs @@ -1,22 +1,14 @@ using System; -using System.Collections.Generic; -using System.Globalization; using System.Linq; -using System.Net; using System.Net.Http.Formatting; -using System.Web.Http; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Web.Models.Trees; -using Umbraco.Web.Mvc; -using Umbraco.Web.WebApi.Filters; using umbraco; using umbraco.BusinessLogic.Actions; using umbraco.cms.businesslogic.packager; -using Umbraco.Core.Models.EntityBase; using Umbraco.Core.Services; +using Umbraco.Web.Models.Trees; +using Umbraco.Web.Mvc; +using Umbraco.Web.WebApi.Filters; using Constants = Umbraco.Core.Constants; -using Umbraco.Core.Services; namespace Umbraco.Web.Trees { @@ -116,4 +108,4 @@ namespace Umbraco.Web.Trees return menu; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/UI/LegacyDialogHandler.cs b/src/Umbraco.Web/UI/LegacyDialogHandler.cs index 0c3d09f1a2..efcea4bbd5 100644 --- a/src/Umbraco.Web/UI/LegacyDialogHandler.cs +++ b/src/Umbraco.Web/UI/LegacyDialogHandler.cs @@ -1,16 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; -using System.Text; using System.Web; using System.Xml; -using Umbraco.Core; -using Umbraco.Core.IO; -using umbraco.BasePages; using umbraco.BusinessLogic; using umbraco.interfaces; -using System.Linq; +using Umbraco.Core; +using Umbraco.Core.IO; namespace Umbraco.Web.UI { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs index 7379c89963..77a8575ace 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs @@ -1,35 +1,12 @@ using System; -using System.Collections; using System.Collections.Generic; using System.ComponentModel; -using System.Data; -using System.IO; -using System.Linq; using System.Text; -using System.Web; -using System.Xml; -using System.Configuration; -using Umbraco.Core; -using umbraco.BasePages; -using umbraco.BusinessLogic; -using umbraco.businesslogic; -using umbraco.cms.businesslogic; -using umbraco.cms.businesslogic.cache; -using umbraco.cms.businesslogic.contentitem; -using umbraco.cms.businesslogic.datatype; -using umbraco.cms.businesslogic.language; -using umbraco.cms.businesslogic.media; -using umbraco.cms.businesslogic.member; -using umbraco.cms.businesslogic.property; -using umbraco.cms.businesslogic.web; -using umbraco.interfaces; -using umbraco.DataLayer; -using umbraco.BusinessLogic.Utils; -using umbraco.cms.presentation.Trees; using umbraco.BusinessLogic.Actions; -using Umbraco.Core.IO; +using umbraco.cms.presentation.Trees; +using umbraco.interfaces; using Umbraco.Core; - +using Umbraco.Core.IO; namespace umbraco { @@ -49,13 +26,13 @@ namespace umbraco { Javascript.Append( @" - function openScriptEditor(id) { - UmbClientMgr.contentFrame('settings/scripts/editScript.aspx?file=' + id); - } + function openScriptEditor(id) { + UmbClientMgr.contentFrame('settings/scripts/editScript.aspx?file=' + id); + } function openScriptFolder(id) { - return false; - } - "); + return false; + } + "); } protected override string FilePath diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs index 06606d7b19..91722ab82e 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs @@ -1,17 +1,14 @@ -using System.Web; +using System; +using System.Linq; +using System.Web; using System.Web.UI; -using ClientDependency.Core; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Web.UI; -using Umbraco.Web; -using System; -using Umbraco.Web.UI.Controls; using System.Web.UI.WebControls; +using ClientDependency.Core; using umbraco.BasePages; using umbraco.BusinessLogic; +using Umbraco.Core; using Umbraco.Web; -using System.Linq; +using Umbraco.Web.UI; using UmbracoUserControl = Umbraco.Web.UI.Controls.UmbracoUserControl; namespace umbraco.cms.presentation.create.controls diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs index a46d37216d..edd6382468 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs @@ -1,16 +1,14 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Web; +using System.Linq; using System.Web.UI; using System.Web.UI.WebControls; -using Umbraco.Core; -using UmbracoExamine; using System.Xml; using Examine; using Examine.LuceneEngine.SearchCriteria; -using System.Linq; using Umbraco.Core; +using UmbracoExamine; namespace umbraco.presentation.dialogs diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs index 9ba5f91bd3..3346fa608c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs @@ -1,25 +1,13 @@ using System; using System.Collections.Generic; -using System.Data; -using System.Configuration; using System.Globalization; -using System.Linq; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.HtmlControls; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Xml.Linq; -using System.Xml; using System.IO; +using System.Xml; +using umbraco.BusinessLogic; +using umbraco.cms.businesslogic.web; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.Logging; -using umbraco.cms.businesslogic.web; -using umbraco.BusinessLogic; -using umbraco.cms.businesslogic; -using Umbraco.Core.IO; namespace umbraco.presentation.preview { diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs index e7137e0977..1205c2f0fd 100644 --- a/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs +++ b/src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs @@ -1,28 +1,24 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Dynamic; -using Umbraco.Core; -using umbraco.interfaces; using System.Collections; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Web.Compilation; -using System.Linq.Expressions; +using System.Collections.Generic; +using System.Dynamic; +using System.Linq; using System.Linq.Dynamic; +using System.Reflection; +using umbraco.interfaces; using Umbraco.Core; + namespace umbraco.MacroEngines { public class DynamicNodeList : DynamicObject, IEnumerable { - public List Items; + public List Items; - [Obsolete("Use the Items property instead")] - public List get_Items() - { - return Items; - } + [Obsolete("Use the Items property instead")] + public List get_Items() + { + return Items; + } public DynamicNodeList() { @@ -69,97 +65,97 @@ namespace umbraco.MacroEngines } public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result) { - var firstArg = args.FirstOrDefault(); - //this is to check for 'DocumentTypeAlias' vs 'NodeTypeAlias' for compatibility - if (firstArg != null && firstArg.ToString().InvariantStartsWith("DocumentTypeAlias")) - { - firstArg = "NodeTypeAlias" + firstArg.ToString().Substring("DocumentTypeAlias".Length); - } + var firstArg = args.FirstOrDefault(); + //this is to check for 'DocumentTypeAlias' vs 'NodeTypeAlias' for compatibility + if (firstArg != null && firstArg.ToString().InvariantStartsWith("DocumentTypeAlias")) + { + firstArg = "NodeTypeAlias" + firstArg.ToString().Substring("DocumentTypeAlias".Length); + } var name = binder.Name; - if (name == "Single") - { - string predicate = firstArg == null ? "" : firstArg.ToString(); - var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); - var single = this.Single(predicate, values); - result = new DynamicNode(single); - return true; - } - if (name == "SingleOrDefault") - { - string predicate = firstArg == null ? "" : firstArg.ToString(); - var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); - var single = this.SingleOrDefault(predicate, values); - if (single == null) - result = new DynamicNull(); - else - result = new DynamicNode(single); - return true; - } - if (name == "First") - { - string predicate = firstArg == null ? "" : firstArg.ToString(); - var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); - var first = this.First(predicate, values); - result = new DynamicNode(first); - return true; - } - if (name == "FirstOrDefault") - { - string predicate = firstArg == null ? "" : firstArg.ToString(); - var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); - var first = this.FirstOrDefault(predicate, values); - if (first == null) - result = new DynamicNull(); - else - result = new DynamicNode(first); - return true; - } - if (name == "Last") - { - string predicate = firstArg == null ? "" : firstArg.ToString(); - var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); - var last = this.Last(predicate, values); - result = new DynamicNode(last); - return true; - } - if (name == "LastOrDefault") - { - string predicate = firstArg == null ? "" : firstArg.ToString(); - var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); - var last = this.LastOrDefault(predicate, values); - if (last == null) - result = new DynamicNull(); - else - result = new DynamicNode(last); - return true; - } + if (name == "Single") + { + string predicate = firstArg == null ? "" : firstArg.ToString(); + var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); + var single = this.Single(predicate, values); + result = new DynamicNode(single); + return true; + } + if (name == "SingleOrDefault") + { + string predicate = firstArg == null ? "" : firstArg.ToString(); + var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); + var single = this.SingleOrDefault(predicate, values); + if (single == null) + result = new DynamicNull(); + else + result = new DynamicNode(single); + return true; + } + if (name == "First") + { + string predicate = firstArg == null ? "" : firstArg.ToString(); + var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); + var first = this.First(predicate, values); + result = new DynamicNode(first); + return true; + } + if (name == "FirstOrDefault") + { + string predicate = firstArg == null ? "" : firstArg.ToString(); + var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); + var first = this.FirstOrDefault(predicate, values); + if (first == null) + result = new DynamicNull(); + else + result = new DynamicNode(first); + return true; + } + if (name == "Last") + { + string predicate = firstArg == null ? "" : firstArg.ToString(); + var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); + var last = this.Last(predicate, values); + result = new DynamicNode(last); + return true; + } + if (name == "LastOrDefault") + { + string predicate = firstArg == null ? "" : firstArg.ToString(); + var values = predicate.IsNullOrWhiteSpace() ? new object[] { } : args.Skip(1).ToArray(); + var last = this.LastOrDefault(predicate, values); + if (last == null) + result = new DynamicNull(); + else + result = new DynamicNode(last); + return true; + } if (name == "Where") { - string predicate = firstArg.ToString(); + string predicate = firstArg.ToString(); var values = args.Skip(1).ToArray(); result = new DynamicNodeList(this.Where(predicate, values).ToList()); return true; } if (name == "OrderBy") { - result = new DynamicNodeList(this.OrderBy(firstArg.ToString()).ToList()); + result = new DynamicNodeList(this.OrderBy(firstArg.ToString()).ToList()); + return true; + } + if (name == "Take") + { + result = new DynamicNodeList(this.Take((int)firstArg)); + return true; + } + if (name == "Skip") + { + result = new DynamicNodeList(this.Skip((int)firstArg)); return true; } - if (name == "Take") - { - result = new DynamicNodeList(this.Take((int)firstArg)); - return true; - } - if (name == "Skip") - { - result = new DynamicNodeList(this.Skip((int)firstArg)); - return true; - } if (name == "InGroupsOf") { int groupSize = 0; - if (int.TryParse(firstArg.ToString(), out groupSize)) + if (int.TryParse(firstArg.ToString(), out groupSize)) { result = this.InGroupsOf(groupSize); return true; @@ -170,7 +166,7 @@ namespace umbraco.MacroEngines if (name == "GroupedInto") { int groupCount = 0; - if (int.TryParse(firstArg.ToString(), out groupCount)) + if (int.TryParse(firstArg.ToString(), out groupCount)) { result = this.GroupedInto(groupCount); return true; @@ -180,7 +176,7 @@ namespace umbraco.MacroEngines } if (name == "GroupBy") { - result = this.GroupBy(firstArg.ToString()); + result = this.GroupBy(firstArg.ToString()); return true; } if (name == "Average" || name == "Min" || name == "Max" || name == "Sum") @@ -190,40 +186,40 @@ namespace umbraco.MacroEngines } if (name == "Union") { - if ((firstArg as IEnumerable) != null) + if ((firstArg as IEnumerable) != null) { - result = new DynamicNodeList(this.Items.Union(firstArg as IEnumerable)); + result = new DynamicNodeList(this.Items.Union(firstArg as IEnumerable)); return true; } - if ((firstArg as DynamicNodeList) != null) + if ((firstArg as DynamicNodeList) != null) { - result = new DynamicNodeList(this.Items.Union((firstArg as DynamicNodeList).Items)); + result = new DynamicNodeList(this.Items.Union((firstArg as DynamicNodeList).Items)); return true; } } if (name == "Except") { - if ((firstArg as IEnumerable) != null) + if ((firstArg as IEnumerable) != null) { - result = new DynamicNodeList(this.Items.Except(firstArg as IEnumerable, new DynamicNodeIdEqualityComparer())); + result = new DynamicNodeList(this.Items.Except(firstArg as IEnumerable, new DynamicNodeIdEqualityComparer())); return true; } - if ((firstArg as DynamicNodeList) != null) + if ((firstArg as DynamicNodeList) != null) { - result = new DynamicNodeList(this.Items.Except((firstArg as DynamicNodeList).Items, new DynamicNodeIdEqualityComparer())); + result = new DynamicNodeList(this.Items.Except((firstArg as DynamicNodeList).Items, new DynamicNodeIdEqualityComparer())); return true; } } if (name == "Intersect") { - if ((firstArg as IEnumerable) != null) + if ((firstArg as IEnumerable) != null) { - result = new DynamicNodeList(this.Items.Intersect(firstArg as IEnumerable, new DynamicNodeIdEqualityComparer())); + result = new DynamicNodeList(this.Items.Intersect(firstArg as IEnumerable, new DynamicNodeIdEqualityComparer())); return true; } - if ((firstArg as DynamicNodeList) != null) + if ((firstArg as DynamicNodeList) != null) { - result = new DynamicNodeList(this.Items.Intersect((firstArg as DynamicNodeList).Items, new DynamicNodeIdEqualityComparer())); + result = new DynamicNodeList(this.Items.Intersect((firstArg as DynamicNodeList).Items, new DynamicNodeIdEqualityComparer())); return true; } } @@ -453,12 +449,12 @@ namespace umbraco.MacroEngines var genericArgs = (new[] { this }).Concat(args); result = methodToExecute.Invoke(null, genericArgs.ToArray()); } - else if (TypeHelper.IsTypeAssignableFrom(methodToExecute.GetParameters().First().ParameterType)) - { - //if it is IQueryable, we'll need to cast Items AsQueryable - var genericArgs = (new[] { Items.AsQueryable() }).Concat(args); - result = methodToExecute.Invoke(null, genericArgs.ToArray()); - } + else if (TypeHelper.IsTypeAssignableFrom(methodToExecute.GetParameters().First().ParameterType)) + { + //if it is IQueryable, we'll need to cast Items AsQueryable + var genericArgs = (new[] { Items.AsQueryable() }).Concat(args); + result = methodToExecute.Invoke(null, genericArgs.ToArray()); + } else { var genericArgs = (new[] { Items }).Concat(args); @@ -487,52 +483,52 @@ namespace umbraco.MacroEngines return result; } - public IEnumerator GetEnumerator() - { - return Items.GetEnumerator(); - } + public IEnumerator GetEnumerator() + { + return Items.GetEnumerator(); + } - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } + IEnumerator IEnumerable.GetEnumerator() + { + return GetEnumerator(); + } - public T Single(string predicate, params object[] values) - { - return predicate.IsNullOrWhiteSpace() - ? ((IQueryable)Items.AsQueryable()).Single() - : Where(predicate, values).Single(); - } - public T SingleOrDefault(string predicate, params object[] values) - { - return predicate.IsNullOrWhiteSpace() - ? ((IQueryable)Items.AsQueryable()).SingleOrDefault() - : Where(predicate, values).SingleOrDefault(); - } - public T First(string predicate, params object[] values) - { - return predicate.IsNullOrWhiteSpace() - ? ((IQueryable)Items.AsQueryable()).First() - : Where(predicate, values).First(); - } - public T FirstOrDefault(string predicate, params object[] values) - { - return predicate.IsNullOrWhiteSpace() - ? ((IQueryable)Items.AsQueryable()).FirstOrDefault() - : Where(predicate, values).FirstOrDefault(); - } - public T Last(string predicate, params object[] values) - { - return predicate.IsNullOrWhiteSpace() - ? ((IQueryable)Items.AsQueryable()).Last() - : Where(predicate, values).Last(); - } - public T LastOrDefault(string predicate, params object[] values) - { - return predicate.IsNullOrWhiteSpace() - ? ((IQueryable)Items.AsQueryable()).LastOrDefault() - : Where(predicate, values).LastOrDefault(); - } + public T Single(string predicate, params object[] values) + { + return predicate.IsNullOrWhiteSpace() + ? ((IQueryable)Items.AsQueryable()).Single() + : Where(predicate, values).Single(); + } + public T SingleOrDefault(string predicate, params object[] values) + { + return predicate.IsNullOrWhiteSpace() + ? ((IQueryable)Items.AsQueryable()).SingleOrDefault() + : Where(predicate, values).SingleOrDefault(); + } + public T First(string predicate, params object[] values) + { + return predicate.IsNullOrWhiteSpace() + ? ((IQueryable)Items.AsQueryable()).First() + : Where(predicate, values).First(); + } + public T FirstOrDefault(string predicate, params object[] values) + { + return predicate.IsNullOrWhiteSpace() + ? ((IQueryable)Items.AsQueryable()).FirstOrDefault() + : Where(predicate, values).FirstOrDefault(); + } + public T Last(string predicate, params object[] values) + { + return predicate.IsNullOrWhiteSpace() + ? ((IQueryable)Items.AsQueryable()).Last() + : Where(predicate, values).Last(); + } + public T LastOrDefault(string predicate, params object[] values) + { + return predicate.IsNullOrWhiteSpace() + ? ((IQueryable)Items.AsQueryable()).LastOrDefault() + : Where(predicate, values).LastOrDefault(); + } public IQueryable Where(string predicate, params object[] values) { return ((IQueryable)Items.AsQueryable()).Where(predicate, values); diff --git a/src/umbraco.businesslogic/ApplicationTree.cs b/src/umbraco.businesslogic/ApplicationTree.cs index 2c015c9b05..e91490f796 100644 --- a/src/umbraco.businesslogic/ApplicationTree.cs +++ b/src/umbraco.businesslogic/ApplicationTree.cs @@ -1,17 +1,7 @@ using System; -using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Web; -using System.Xml.Linq; using AutoMapper; using Umbraco.Core; -using Umbraco.Core.Cache; -using Umbraco.Core.IO; -using Umbraco.Core.Events; -using Umbraco.Core.IO; -using Umbraco.Core.Services; -using umbraco.DataLayer; namespace umbraco.BusinessLogic { diff --git a/src/umbraco.businesslogic/BasePages/BasePage.cs b/src/umbraco.businesslogic/BasePages/BasePage.cs index bbd3a41fee..d16e3b658b 100644 --- a/src/umbraco.businesslogic/BasePages/BasePage.cs +++ b/src/umbraco.businesslogic/BasePages/BasePage.cs @@ -1,24 +1,17 @@ using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Data; -using System.Web; using System.Linq; +using System.Web; using System.Web.Mvc; -using System.Web.Routing; -using System.Web.Security; using System.Web.UI; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.IO; -using Umbraco.Core.Cache; -using Umbraco.Core.Logging; -using Umbraco.Core.Services; using umbraco.BusinessLogic; using umbraco.DataLayer; using Umbraco.Core; +using Umbraco.Core.IO; +using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Security; +using Umbraco.Core.Services; namespace umbraco.BasePages { @@ -108,17 +101,17 @@ namespace umbraco.BasePages } } - private UrlHelper _url; - /// - /// Returns a UrlHelper - /// - /// - /// This URL helper is created without any route data and an empty request context - /// - public UrlHelper Url - { - get { return _url ?? (_url = new UrlHelper(Context.Request.RequestContext)); } - } + private UrlHelper _url; + /// + /// Returns a UrlHelper + /// + /// + /// This URL helper is created without any route data and an empty request context + /// + public UrlHelper Url + { + get { return _url ?? (_url = new UrlHelper(Context.Request.RequestContext)); } + } /// /// Returns a refernce of an instance of ClientTools for access to the pages client API @@ -315,7 +308,7 @@ namespace umbraco.BasePages Culture = ui.Culture(u) }); - LogHelper.Info("User {0} (Id: {1}) logged in", () => u.Name, () => u.Id); + LogHelper.Info("User {0} (Id: {1}) logged in", () => u.Name, () => u.Id); } diff --git a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs index 36a0f63f36..b19d1671ca 100644 --- a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs +++ b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs @@ -1,13 +1,12 @@ using System; -using Umbraco.Core.Logging; using System.Linq; using System.Web; +using umbraco.businesslogic.Exceptions; +using umbraco.BusinessLogic; +using umbraco.interfaces; using Umbraco.Core; using Umbraco.Core.IO; using Umbraco.Core.Logging; -using umbraco.BusinessLogic; -using umbraco.businesslogic.Exceptions; -using umbraco.interfaces; using Umbraco.Core.Models; using Umbraco.Core.Security; @@ -132,8 +131,8 @@ namespace umbraco.BasePages if (permissions.IndexOf(Action) > -1 && (Path.Contains("-20") || ("," + Path + ",").Contains("," + getUser().StartNodeId.ToString() + ","))) return true; - var user = getUser(); - LogHelper.Info("User {0} has insufficient permissions in UmbracoEnsuredPage: '{1}', '{2}', '{3}'", () => user.Name, () => Path, () => permissions, () => Action); + var user = getUser(); + LogHelper.Info("User {0} has insufficient permissions in UmbracoEnsuredPage: '{1}', '{2}', '{3}'", () => user.Name, () => Path, () => permissions, () => Action); return false; } @@ -199,4 +198,4 @@ namespace umbraco.BasePages } } } -} \ No newline at end of file +} diff --git a/src/umbraco.editorControls/uploadfield/uploadField.cs b/src/umbraco.editorControls/uploadfield/uploadField.cs index 8a62fb3073..590fd25d9f 100644 --- a/src/umbraco.editorControls/uploadfield/uploadField.cs +++ b/src/umbraco.editorControls/uploadfield/uploadField.cs @@ -1,18 +1,16 @@ using System; using System.IO; -using System.Linq; using System.Text.RegularExpressions; using System.Web; using System.Web.UI; using System.Web.UI.HtmlControls; using System.Web.UI.WebControls; -using Umbraco.Core.Configuration; -using Umbraco.Core.IO; using umbraco.interfaces; using Umbraco.Core; +using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; +using Umbraco.Core.IO; using Content = umbraco.cms.businesslogic.Content; -using Umbraco.Core; namespace umbraco.editorControls { @@ -329,4 +327,4 @@ namespace umbraco.editorControls base.Render(output); } } -} \ No newline at end of file +}