Changeset 3179 for trunk/sources/HeuristicLab.PluginAdministrator/3.3/PluginEditor.cs

Timestamp:

03/22/10 16:53:27 (14 years ago)

Author:

gkronber

Message:

Improved controls for deployment service interaction.
Increased max values for message sizes and related limits in the deployment service configuration.
Recreated proxy classes for the deployment service.

#891 (Refactor GUI for plugin management)

File:

• trunk/sources/HeuristicLab.PluginAdministrator/3.3/PluginEditor.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.PluginAdministrator/3.3/PluginEditor.cs

@@ -133 +133 @@
 
         foreach (var plugin in IteratePlugins(selectedPlugins)) {
+          SetMainFormStatusBar("Uploading", plugin);
           adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin));
         }
@@ -144 +145 @@
       }
     }
+
     #endregion
 
@@ -187 +189 @@
           var plugin = (IPluginDescription)item.Tag;
           // also check all dependencies
-          modifiedPlugins.Add(plugin);
+          if (!modifiedPlugins.Contains(plugin))
+            modifiedPlugins.Add(plugin);
           foreach (var dep in GetAllDependencies(plugin)) {
-            modifiedPlugins.Add(dep);
+            if (!modifiedPlugins.Contains(dep))
+              modifiedPlugins.Add(dep);
           }
         }
@@ -197 +201 @@
           var plugin = (IPluginDescription)item.Tag;
           // also uncheck all dependent plugins
-          modifiedPlugins.Add(plugin);
+          if (!modifiedPlugins.Contains(plugin))
+            modifiedPlugins.Add(plugin);
           foreach (var dep in GetAllDependents(plugin)) {
-            modifiedPlugins.Add(dep);
+            if (!modifiedPlugins.Contains(dep))
+              modifiedPlugins.Add(dep);
           }
         }
@@ -231 +237 @@
 
     private IEnumerable<IPluginDescription> IteratePlugins(IEnumerable<IPluginDescription> plugins) {
+      HashSet<IPluginDescription> yieldedItems = new HashSet<IPluginDescription>();
       foreach (var plugin in plugins) {
         foreach (var dependency in IteratePlugins(plugin.Dependencies)) {
-          yield return dependency;
-        }
-        yield return plugin;
+          if (!yieldedItems.Contains(dependency)) {
+            yieldedItems.Add(dependency);
+            yield return dependency;
+          }
+        }
+        if (!yieldedItems.Contains(plugin)) {
+          yieldedItems.Add(plugin);
+          yield return plugin;
+        }
       }
     }
@@ -309 +322 @@
       MainFormManager.GetMainForm<MainForm>().HideProgressBar();
     }
+    private void SetMainFormStatusBar(string p, IPluginDescription plugin) {
+      if (InvokeRequired) Invoke((Action<string, IPluginDescription>)SetMainFormStatusBar, p, plugin);
+      else {
+        MainFormManager.GetMainForm<MainForm>().SetStatusBarText(p + " " + plugin.ToString());
+      }
+    }
+
     #endregion
   }