Browse Source

Remove options dependency from PackageManagementService class.

pull/15/head
Matt Ward 14 years ago
parent
commit
7443b601fb
  1. 6
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementService.cs
  2. 2
      src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementService.cs
  3. 27
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementService.cs
  4. 2
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementServices.cs
  5. 2
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementViewModels.cs
  6. 2
      src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementServiceTests.cs

6
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementService.cs

@ -14,8 +14,6 @@ namespace ICSharpCode.PackageManagement.Design @@ -14,8 +14,6 @@ namespace ICSharpCode.PackageManagement.Design
{
public event EventHandler ParentPackageInstalled;
PackageManagementOptions options = new PackageManagementOptions(new Properties());
protected virtual void OnParentPackageInstalled()
{
if (ParentPackageInstalled != null) {
@ -74,10 +72,6 @@ namespace ICSharpCode.PackageManagement.Design @@ -74,10 +72,6 @@ namespace ICSharpCode.PackageManagement.Design
FakeActiveProjectManager.FakeLocalRepository.FakePackages.Add(package);
}
public PackageManagementOptions Options {
get { return options; }
}
public FakePackageManagementOutputMessagesView FakeOutputMessagesView = new FakePackageManagementOutputMessagesView();
public IPackageManagementOutputMessagesView OutputMessagesView {

2
src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementService.cs

@ -27,8 +27,6 @@ namespace ICSharpCode.PackageManagement @@ -27,8 +27,6 @@ namespace ICSharpCode.PackageManagement
void OnParentPackageInstalled(IPackage package);
void OnParentPackageUninstalled(IPackage package);
PackageManagementOptions Options { get; }
IPackageManagementOutputMessagesView OutputMessagesView { get; }
}
}

27
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementService.cs

@ -13,7 +13,6 @@ namespace ICSharpCode.PackageManagement @@ -13,7 +13,6 @@ namespace ICSharpCode.PackageManagement
public class PackageManagementService : IPackageManagementService
{
IPackageManagementOutputMessagesView outputMessagesView;
PackageManagementOptions options;
IRegisteredPackageRepositories registeredPackageRepositories;
IPackageManagerFactory packageManagerFactory;
IPackageManagementProjectService projectService;
@ -25,7 +24,6 @@ namespace ICSharpCode.PackageManagement @@ -25,7 +24,6 @@ namespace ICSharpCode.PackageManagement
IPackageManagementProjectService projectService,
IPackageManagementOutputMessagesView outputMessagesView)
: this(
options,
new RegisteredPackageRepositories(packageRepositoryCache, options),
packageManagerFactory,
projectService,
@ -33,11 +31,8 @@ namespace ICSharpCode.PackageManagement @@ -33,11 +31,8 @@ namespace ICSharpCode.PackageManagement
{
}
public PackageManagementService(
PackageManagementOptions options,
IRegisteredPackageRepositories registeredPackageRepositories)
public PackageManagementService(IRegisteredPackageRepositories registeredPackageRepositories)
: this(
options,
registeredPackageRepositories,
new SharpDevelopPackageManagerFactory(),
new PackageManagementProjectService(),
@ -46,41 +41,21 @@ namespace ICSharpCode.PackageManagement @@ -46,41 +41,21 @@ namespace ICSharpCode.PackageManagement
}
public PackageManagementService(
PackageManagementOptions options,
IRegisteredPackageRepositories registeredPackageRepositories,
IPackageManagerFactory packageManagerFactory,
IPackageManagementProjectService projectService,
IPackageManagementOutputMessagesView outputMessagesView)
{
this.options = options;
this.registeredPackageRepositories = registeredPackageRepositories;
this.packageManagerFactory = packageManagerFactory;
this.projectService = projectService;
this.outputMessagesView = outputMessagesView;
}
public PackageManagementService(
PackageManagementOptions options,
IPackageManagerFactory packageManagerFactory,
IPackageManagementProjectService projectService,
IPackageManagementOutputMessagesView outputMessagesView)
: this(
options,
new PackageRepositoryCache(options.PackageSources, options.RecentPackages),
packageManagerFactory,
projectService,
outputMessagesView)
{
}
public IPackageManagementOutputMessagesView OutputMessagesView {
get { return outputMessagesView; }
}
public PackageManagementOptions Options {
get { return options; }
}
public event EventHandler ParentPackageInstalled;
protected virtual void OnParentPackageInstalled()

2
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementServices.cs

@ -17,7 +17,7 @@ namespace ICSharpCode.PackageManagement @@ -17,7 +17,7 @@ namespace ICSharpCode.PackageManagement
{
options = new PackageManagementOptions();
registeredPackageRepositories = new RegisteredPackageRepositories(options);
packageManagementService = new PackageManagementService(options, registeredPackageRepositories);
packageManagementService = new PackageManagementService(registeredPackageRepositories);
}
public static PackageManagementOptions Options {

2
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementViewModels.cs

@ -75,7 +75,7 @@ namespace ICSharpCode.PackageManagement @@ -75,7 +75,7 @@ namespace ICSharpCode.PackageManagement
if (IsInDesignMode()) {
packageManagementOptionsViewModel = new DesignTimePackageManagementOptionsViewModel();
} else {
packageManagementOptionsViewModel = new PackageManagementOptionsViewModel(packageManagementService.Options);
packageManagementOptionsViewModel = new PackageManagementOptionsViewModel(PackageManagementServices.Options);
}
}

2
src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementServiceTests.cs

@ -46,7 +46,7 @@ namespace PackageManagement.Tests @@ -46,7 +46,7 @@ namespace PackageManagement.Tests
fakeProjectService.CurrentProject = testProject;
packageManagementService =
new PackageManagementService(options,
new PackageManagementService(
fakeRegisteredPackageRepositories,
fakePackageManagerFactory,
fakeProjectService,

Loading…
Cancel
Save