From fdc69727458940ac1fd6c63399a5749b2c85322b Mon Sep 17 00:00:00 2001 From: Suha Can Date: Mon, 31 Jan 2011 10:43:44 -0800 Subject: [PATCH] Minor alteration to previous contribution --HG-- branch : 1.x --- .../{RouteExtention.cs => RouteExtension.cs} | 14 ++++---------- src/Orchard/Mvc/OrchardControllerFactory.cs | 1 + src/Orchard/Mvc/Routes/ShellRoute.cs | 1 + src/Orchard/Orchard.Framework.csproj | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) rename src/Orchard/Mvc/Extensions/{RouteExtention.cs => RouteExtension.cs} (76%) diff --git a/src/Orchard/Mvc/Extensions/RouteExtention.cs b/src/Orchard/Mvc/Extensions/RouteExtension.cs similarity index 76% rename from src/Orchard/Mvc/Extensions/RouteExtention.cs rename to src/Orchard/Mvc/Extensions/RouteExtension.cs index 882f64989..cac69c3ce 100644 --- a/src/Orchard/Mvc/Extensions/RouteExtention.cs +++ b/src/Orchard/Mvc/Extensions/RouteExtension.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.Routing; +using System.Web.Routing; using System.Web.Mvc; -namespace Orchard.Mvc{ - - public static class RouteExtention{ +namespace Orchard.Mvc.Extensions { + public static class RouteExtension{ public static string GetAreaName(this RouteBase route){ var routeWithArea = route as IRouteWithArea; if (routeWithArea != null) { @@ -24,8 +19,7 @@ namespace Orchard.Mvc{ public static string GetAreaName(this RouteData routeData){ object area; - if (routeData.DataTokens.TryGetValue("area", out area)) - { + if (routeData.DataTokens.TryGetValue("area", out area)) { return area as string; } diff --git a/src/Orchard/Mvc/OrchardControllerFactory.cs b/src/Orchard/Mvc/OrchardControllerFactory.cs index 5dc828412..6bf9c2d78 100644 --- a/src/Orchard/Mvc/OrchardControllerFactory.cs +++ b/src/Orchard/Mvc/OrchardControllerFactory.cs @@ -4,6 +4,7 @@ using System.Web.Routing; using Autofac; using Autofac.Core; using Autofac.Features.Metadata; +using Orchard.Mvc.Extensions; namespace Orchard.Mvc { public interface IControllerType { diff --git a/src/Orchard/Mvc/Routes/ShellRoute.cs b/src/Orchard/Mvc/Routes/ShellRoute.cs index 0e7e50083..54882834e 100644 --- a/src/Orchard/Mvc/Routes/ShellRoute.cs +++ b/src/Orchard/Mvc/Routes/ShellRoute.cs @@ -7,6 +7,7 @@ using System.Web.SessionState; using Autofac; using Orchard.Environment; using Orchard.Environment.Configuration; +using Orchard.Mvc.Extensions; namespace Orchard.Mvc.Routes { diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index df5cdec31..0a7324e1e 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -183,7 +183,7 @@ - +