From bb71efd4fa5b0b384c27fa30d719e1c481b5102f Mon Sep 17 00:00:00 2001
From: jakobdyrby <jad@netmester.dk>
Date: Fri, 6 Jun 2014 14:17:32 +0200
Subject: [PATCH] Move moving classes around

---
 .../ConflictingPackageContentFinder.cs                      | 3 ++-
 .../IConflictingPackageContentFinder.cs                     | 2 +-
 src/Umbraco.Core/Services/PackagingService.cs               | 6 ++++--
 src/Umbraco.Core/Services/ServiceContext.cs                 | 2 +-
 src/Umbraco.Core/Umbraco.Core.csproj                        | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename src/Umbraco.Core/{Services => Packaging}/ConflictingPackageContentFinder.cs (96%)
 rename src/Umbraco.Core/{Services => Packaging}/IConflictingPackageContentFinder.cs (88%)

diff --git a/src/Umbraco.Core/Services/ConflictingPackageContentFinder.cs b/src/Umbraco.Core/Packaging/ConflictingPackageContentFinder.cs
similarity index 96%
rename from src/Umbraco.Core/Services/ConflictingPackageContentFinder.cs
rename to src/Umbraco.Core/Packaging/ConflictingPackageContentFinder.cs
index be2e9a03a0..0188c446d4 100644
--- a/src/Umbraco.Core/Services/ConflictingPackageContentFinder.cs
+++ b/src/Umbraco.Core/Packaging/ConflictingPackageContentFinder.cs
@@ -2,8 +2,9 @@
 using System.Linq;
 using System.Xml.Linq;
 using Umbraco.Core.Models;
+using Umbraco.Core.Services;
 
-namespace Umbraco.Core.Services
+namespace Umbraco.Core.Packaging
 {
     public class ConflictingPackageContentFinder : IConflictingPackageContentFinder
     {
diff --git a/src/Umbraco.Core/Services/IConflictingPackageContentFinder.cs b/src/Umbraco.Core/Packaging/IConflictingPackageContentFinder.cs
similarity index 88%
rename from src/Umbraco.Core/Services/IConflictingPackageContentFinder.cs
rename to src/Umbraco.Core/Packaging/IConflictingPackageContentFinder.cs
index 88b6e0dd34..5842e978b4 100644
--- a/src/Umbraco.Core/Services/IConflictingPackageContentFinder.cs
+++ b/src/Umbraco.Core/Packaging/IConflictingPackageContentFinder.cs
@@ -1,7 +1,7 @@
 using System.Xml.Linq;
 using Umbraco.Core.Models;
 
-namespace Umbraco.Core.Services
+namespace Umbraco.Core.Packaging
 {
     public interface IConflictingPackageContentFinder
     {
diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
index f685426d4a..db7eb357a5 100644
--- a/src/Umbraco.Core/Services/PackagingService.cs
+++ b/src/Umbraco.Core/Services/PackagingService.cs
@@ -1575,14 +1575,16 @@ namespace Umbraco.Core.Services
 
         internal IPackageInstallation PackageInstallation
         {
+            //NOTE The PackageInstallation class should be passed as IPackageInstallation through the 
+            //constructor (probably as an overload to avoid breaking stuff), so that its extendable.
+                // NOTE COMMENT: But is is not a service? and all other parced in constructor is services...
             private get { return _packageInstallation ?? new PackageInstallation(this, _macroService, _fileService, new PackageExtraction()); }
             set { _packageInstallation = value; }
-
-            
         }
 
         internal InstallationSummary InstallPackage(string packageFilePath, int userId = 0)
         {
+            //TODO Add events ?
             return PackageInstallation.InstallPackage(packageFilePath, userId);
         }
 
diff --git a/src/Umbraco.Core/Services/ServiceContext.cs b/src/Umbraco.Core/Services/ServiceContext.cs
index a2bee22c85..c32160f5f0 100644
--- a/src/Umbraco.Core/Services/ServiceContext.cs
+++ b/src/Umbraco.Core/Services/ServiceContext.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Services
         private Lazy<IMemberTypeService> _memberTypeService;
         private Lazy<IMemberGroupService> _memberGroupService;
         private Lazy<INotificationService> _notificationService;
-        
+
         /// <summary>
         /// public ctor - will generally just be used for unit testing
         /// </summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 5c76d2e0bb..8f665a55ab 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -1045,7 +1045,7 @@
     <Compile Include="Services\IMembershipUserService.cs" />
     <Compile Include="Services\IMemberTypeService.cs" />
     <Compile Include="Services\INotificationService.cs" />
-    <Compile Include="Services\IConflictingPackageContentFinder.cs" />
+    <Compile Include="Packaging\IConflictingPackageContentFinder.cs" />
     <Compile Include="Services\IRelationService.cs" />
     <Compile Include="Services\ISectionService.cs" />
     <Compile Include="Services\IPackagingService.cs" />
@@ -1060,7 +1060,7 @@
     <Compile Include="Services\MemberService.cs" />
     <Compile Include="Services\MemberTypeService.cs" />
     <Compile Include="Services\NotificationService.cs" />
-    <Compile Include="Services\ConflictingPackageContentFinder.cs" />
+    <Compile Include="Packaging\ConflictingPackageContentFinder.cs" />
     <Compile Include="Services\RelationService.cs" />
     <Compile Include="Services\SectionService.cs" />
     <Compile Include="Services\ServerRegistrationService.cs" />