PackageManagement: PackagesViewModel Events

Previous commit UpdatedPackagesViewModel events restored
PackageViewModel PackageChanged events removed

src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs

@@ -55,27 +55,27 @@ namespace ICSharpCode.PackageManagement
 			packageManagementEvents.ParentPackagesUpdated += InstalledPackagesChanged;
 		}
 		
-		void TryGetActiveProject()
+		protected override void OnDispose()
 		{
-			try {
-				project = solution.GetActiveProject();
-			} catch (Exception ex) {
-				errorMessage = ex.Message;
-			}
+			packageManagementEvents.ParentPackageInstalled -= InstalledPackagesChanged;
+			packageManagementEvents.ParentPackageUninstalled -= InstalledPackagesChanged;
+			packageManagementEvents.ParentPackagesUpdated -= InstalledPackagesChanged;
 		}
-
+		
 		void InstalledPackagesChanged(object sender, EventArgs e)
 		{
 			ReadPackages();
 		}
 		
-		protected override void OnDispose()
+		void TryGetActiveProject()
 		{
-			packageManagementEvents.ParentPackageInstalled -= InstalledPackagesChanged;
-			packageManagementEvents.ParentPackageUninstalled -= InstalledPackagesChanged;
-			packageManagementEvents.ParentPackagesUpdated -= InstalledPackagesChanged;
+			try {
+				project = solution.GetActiveProject();
+			} catch (Exception ex) {
+				errorMessage = ex.Message;
+			}
 		}
-		
+
 		protected override IQueryable<IPackage> GetAllPackages()
 		{
 			if (errorMessage != null) {

src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs

@@ -319,7 +319,6 @@ namespace ICSharpCode.PackageManagement
 						installAction.IgnoreDependencies, 
 						installAction.AllowPrereleaseVersions);
 					packageManagementEvents.OnParentPackageInstalled(package);
-					PackageChanged();
 				}
 			} catch (Exception ex) {
 				ReportError(ex);
@@ -333,7 +332,6 @@ namespace ICSharpCode.PackageManagement
 				GetInstallPackageOperations();
 				if (LicensesAccepted()) {
 					InstallPackage();
-					PackageChanged();
 				}
 			} catch (Exception ex) {
 				ReportError(ex);
@@ -407,7 +405,6 @@ namespace ICSharpCode.PackageManagement
 				var packageManager = new NuGet.PackageManager(solutionPackageRepository.Repository, solutionPackageRepository.PackagePathResolver, solutionPackageRepository.FileSystem);
 				packageManager.UninstallPackage(package.Id, package.Version);
 				packageManagementEvents.OnParentPackageUninstalled(package);
-				PackageChanged();
 			} catch (Exception ex) {
 				ReportError(ex);
 				logger.LogError(ex);
@@ -421,7 +418,6 @@ namespace ICSharpCode.PackageManagement
 				UninstallPackageAction action = project.CreateUninstallPackageAction();
 				action.Package = package;
 				actionRunner.Run(action);
-				PackageChanged();
 			} catch (Exception ex) {
 				ReportError(ex);
 				logger.LogError(ex);
@@ -498,7 +494,6 @@ namespace ICSharpCode.PackageManagement
 				IList<ProcessPackageAction> actions = GetProcessPackageActionsForSelectedProjects(projects);
 				if (actions.Any() && LicensesAccepted()) {
 					RunActionsIfAnyExist(actions);
-					PackageChanged();
 				}
 			} catch (Exception ex) {
 				ReportError(ex);

src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackagesViewModel.cs

@@ -46,23 +46,32 @@ namespace ICSharpCode.PackageManagement
 			this.logger = packageViewModelFactory.Logger;
 			this.packageManagementEvents = packageViewModelFactory.PackageManagementEvents;
 			
-			packageManagementEvents.ParentPackagesUpdated += PackagesUpdated;
-			
 			ShowPackageSources = true;
 			ShowUpdateAllPackages = true;
 			ShowPrerelease = true;
+
+			RegisterEvents();
 		}
 		
-		void PackagesUpdated(object sender, EventArgs e)
+		void RegisterEvents()
 		{
-			ReadPackages();
+			packageManagementEvents.ParentPackageInstalled += PackagesUpdated;
+			packageManagementEvents.ParentPackageUninstalled += PackagesUpdated;
+			packageManagementEvents.ParentPackagesUpdated += PackagesUpdated;
 		}
-		
+
 		protected override void OnDispose()
 		{
+			packageManagementEvents.ParentPackageInstalled -= PackagesUpdated;
+			packageManagementEvents.ParentPackageUninstalled -= PackagesUpdated;
 			packageManagementEvents.ParentPackagesUpdated -= PackagesUpdated;
 		}
 		
+		void PackagesUpdated(object sender, EventArgs e)
+		{
+			ReadPackages();
+		}
+		
 		protected override void UpdateRepositoryBeforeReadPackagesTaskStarts()
 		{
 			try {