From c838b8a381655104fb4bbb15e48d33d9414074bf Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 19 Feb 2013 06:27:13 -0100 Subject: [PATCH] Core.Strings - resharp --- src/Umbraco.Core/Strings/ContentBaseExtensions.cs | 3 +-- src/Umbraco.Core/Strings/DefaultShortStringHelper.cs | 3 --- src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs | 3 +-- src/Umbraco.Core/Strings/LegacyShortStringHelper.cs | 2 +- src/Umbraco.Core/Strings/UrlSegmentProviderResolver.cs | 7 ++----- src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs | 4 ++-- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Core/Strings/ContentBaseExtensions.cs b/src/Umbraco.Core/Strings/ContentBaseExtensions.cs index d802bc3706..1ab2840906 100644 --- a/src/Umbraco.Core/Strings/ContentBaseExtensions.cs +++ b/src/Umbraco.Core/Strings/ContentBaseExtensions.cs @@ -1,5 +1,4 @@ -using System; -using System.Globalization; +using System.Globalization; using System.Linq; using Umbraco.Core.Models; diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs index ef7e43e870..a2c1e50f50 100644 --- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs @@ -43,9 +43,6 @@ namespace Umbraco.Core.Strings // ValidStringCharacters = ValidStringCharactersSource.ToCharArray(); //} - public DefaultShortStringHelper() - { } - #endregion #region Configuration diff --git a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs index a361b67fdd..a09b92b0dc 100644 --- a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs +++ b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs @@ -1,5 +1,4 @@ -using System; -using System.Globalization; +using System.Globalization; using Umbraco.Core.Models; namespace Umbraco.Core.Strings diff --git a/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs b/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs index 30367c176c..f800088d6b 100644 --- a/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/LegacyShortStringHelper.cs @@ -118,7 +118,7 @@ function isSafeAlias(alias) {{ // check for camel (if previous character is a space, we'll upper case the current one if (safeString.Length == 0 && invalidFirstCharacters.Contains(currentChar.ToLower())) { - currentChar = ""; + //currentChar = ""; } else { diff --git a/src/Umbraco.Core/Strings/UrlSegmentProviderResolver.cs b/src/Umbraco.Core/Strings/UrlSegmentProviderResolver.cs index ef0be3513b..c302b01502 100644 --- a/src/Umbraco.Core/Strings/UrlSegmentProviderResolver.cs +++ b/src/Umbraco.Core/Strings/UrlSegmentProviderResolver.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; - -using Umbraco.Core.ObjectResolution; +using Umbraco.Core.ObjectResolution; namespace Umbraco.Core.Strings { @@ -35,7 +32,7 @@ namespace Umbraco.Core.Strings /// public IEnumerable Providers { - get { return this.Values; } + get { return Values; } } } } \ No newline at end of file diff --git a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs index 9b6face92c..50edc36574 100644 --- a/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs +++ b/src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs @@ -168,7 +168,7 @@ namespace Umbraco.Web.Routing LogHelper.Debug("{0}Uri=\"{1}\"", () => tracePrefix, () => _pcr.Uri); // try to find a domain matching the current request - var domainAndUri = DomainHelper.DomainMatch(Domain.GetDomains(), _pcr.Uri, false); + var domainAndUri = DomainHelper.DomainMatch(Domain.GetDomains().ToArray(), _pcr.Uri, false); // handle domain if (domainAndUri != null) @@ -218,7 +218,7 @@ namespace Umbraco.Web.Routing var nodePath = _pcr.PublishedContent.Path; LogHelper.Debug("{0}Path=\"{1}\"", () => tracePrefix, () => nodePath); var rootNodeId = _pcr.HasDomain ? _pcr.Domain.RootNodeId : (int?)null; - var domain = DomainHelper.LookForWildcardDomain(Domain.GetDomains(), nodePath, rootNodeId); + var domain = DomainHelper.LookForWildcardDomain(Domain.GetDomains().ToArray(), nodePath, rootNodeId); if (domain != null) {