Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManager.cs

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManager.cs (modified) (4 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManager.cs

@@ -98 +98 @@
     /// </summary>
     /// <param name="plugins"></param>
-    public void Install(IEnumerable<IPluginDescription> plugins) {
+    public void Install(IEnumerable<IPluginDescription> plugins, out bool cancelled) {
       var args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreInstall(args);
       if (!args.Cancel) {
+        cancelled = false;
         var client = DeploymentService.UpdateServiceClientFactory.CreateClient();
         try {
@@ -123 +124 @@
           throw new InstallationManagerException("General communication exception in connection to server.", e);
         }
+      } else {
+        cancelled = true;
       }
     }
@@ -130 +133 @@
     /// </summary>
     /// <param name="plugins"></param>
-    public void Update(IEnumerable<IPluginDescription> plugins) {
+    public void Update(IEnumerable<IPluginDescription> plugins, out bool cancelled) {
       PluginInfrastructureCancelEventArgs args = new PluginInfrastructureCancelEventArgs(plugins);
       OnPreUpdate(args);
       if (!args.Cancel) {
+        cancelled = false;
         var client = DeploymentService.UpdateServiceClientFactory.CreateClient();
         try {
@@ -155 +159 @@
           throw new InstallationManagerException("General communication exception in connection to server.", e);
         }
+      } else {
+        cancelled = true;
       }
     }

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates