Changeset 3179 for trunk/sources/HeuristicLab.PluginAdministrator

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)

Location:

trunk/sources/HeuristicLab.PluginAdministrator/3.3

Files:

• MainForm.cs (modified) (4 diffs)
• PluginEditor.cs (modified) (6 diffs)
• PluginListView.cs (modified) (6 diffs)
• ProductEditor.Designer.cs (modified) (11 diffs)
• ProductEditor.cs (modified) (2 diffs)

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

@@ -29 +29 @@
   internal class MainForm : DockingMainForm {
     private System.Windows.Forms.ToolStripProgressBar progressBar;
-
+    private System.Windows.Forms.ToolStripLabel statusLabel;
     public MainForm(Type type)
       : base(type) {
@@ -41 +41 @@
 
     private void InitializeComponent() {
+      this.progressBar = new System.Windows.Forms.ToolStripProgressBar();
+      this.statusLabel = new System.Windows.Forms.ToolStripLabel();
       this.SuspendLayout();
+      // 
+      // progressBar
+      // 
+      this.progressBar.MarqueeAnimationSpeed = 30;
+      this.progressBar.Name = "progressBar";
+      this.progressBar.Size = new System.Drawing.Size(100, 16);
+      this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
+      this.progressBar.Visible = false;
 
-      progressBar = new System.Windows.Forms.ToolStripProgressBar();
-      progressBar.MarqueeAnimationSpeed = 30;
-      progressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
-      progressBar.Visible = false;
-      statusStrip.Items.Add(progressBar);
+      this.statusLabel.Name = "statusLabel";
+      this.statusLabel.Visible = true;
       // 
       // MainForm
@@ -56 +63 @@
       this.ResumeLayout(false);
       this.PerformLayout();
+
     }
 
@@ -65 +73 @@
       progressBar.Visible = false;
     }
+
+    public void SetStatusBarText(string msg) {
+      statusLabel.Text = msg;
+    }
   }
 }

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
   }

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

@@ -47 +47 @@
     }
 
-    private List<IPluginDescription> checkedPlugins = new List<IPluginDescription>();
+    private Dictionary<IPluginDescription, bool> checkedPlugins = new Dictionary<IPluginDescription, bool>();
     public IEnumerable<IPluginDescription> CheckedPlugins {
       get {
-        return checkedPlugins;
+        return from pair in checkedPlugins
+               where pair.Value
+               select pair.Key;
       }
     }
@@ -77 +79 @@
     private ListViewItem CreateListViewItem(IPluginDescription plugin) {
       var item = new ListViewItem(new string[] { plugin.Name, plugin.Version.ToString() });
-      item.Checked = (from p in checkedPlugins where p.Name == plugin.Name where p.Version == plugin.Version select p).Any();
+      item.Checked = checkedPlugins.ContainsKey(plugin) ? checkedPlugins[plugin] : false;
       item.Tag = plugin;
       return item;
@@ -89 +91 @@
           // also check all dependencies
           MarkPluginChecked(plugin);
-          modifiedPlugins.Add(plugin);
+          if (!modifiedPlugins.Contains(plugin))
+            modifiedPlugins.Add(plugin);
           foreach (var dep in GetAllDependencies(plugin)) {
             MarkPluginChecked(dep);
-            modifiedPlugins.Add(dep);
+            if (!modifiedPlugins.Contains(dep))
+              modifiedPlugins.Add(dep);
           }
         }
@@ -102 +106 @@
           // also uncheck all dependent plugins
           MarkPluginUnchecked(plugin);
-          modifiedPlugins.Add(plugin);
+          if (!modifiedPlugins.Contains(plugin))
+            modifiedPlugins.Add(plugin);
           foreach (var dep in GetAllDependents(plugin)) {
             MarkPluginUnchecked(dep);
-            modifiedPlugins.Add(dep);
+            if (!modifiedPlugins.Contains(dep))
+              modifiedPlugins.Add(dep);
           }
 
@@ -115 +121 @@
 
     private void MarkPluginChecked(IPluginDescription plugin) {
-      var matching = from p in checkedPlugins
-                     where p.Name == plugin.Name
-                     where p.Version == plugin.Version
-                     select p;
-      if (!matching.Any()) checkedPlugins.Add(plugin);
+      checkedPlugins[plugin] = true;
     }
 
     private void MarkPluginUnchecked(IPluginDescription plugin) {
-      checkedPlugins = (from p in checkedPlugins
-                        where p.Name != plugin.Name ||
-                              p.Version != plugin.Version
-                        select p).ToList();
+      checkedPlugins[plugin] = false;
     }
 
@@ -148 +147 @@
 
     private IEnumerable<IPluginDescription> GetAllDependencies(IPluginDescription plugin) {
+      HashSet<IPluginDescription> yieldedPlugins = new HashSet<IPluginDescription>();
       foreach (var dep in plugin.Dependencies) {
         foreach (var recDep in GetAllDependencies(dep)) {
-          yield return recDep;
+          if (!yieldedPlugins.Contains(recDep)) {
+            yieldedPlugins.Add(recDep);
+            yield return recDep;
+          }
         }
-        yield return dep;
+        if (!yieldedPlugins.Contains(dep)) {
+          yieldedPlugins.Add(dep);
+          yield return dep;
+        }
       }
     }

trunk/sources/HeuristicLab.PluginAdministrator/3.3/ProductEditor.Designer.cs

@@ -54 +54 @@
       this.productVersionHeader = new System.Windows.Forms.ColumnHeader();
       this.productImageList = new System.Windows.Forms.ImageList(this.components);
-      this.pluginImageList = new System.Windows.Forms.ImageList(this.components);
+      this.pluginListView = new HeuristicLab.PluginAdministrator.PluginListView();
       this.pluginsLabel = new System.Windows.Forms.Label();
       this.versionTextBox = new System.Windows.Forms.TextBox();
@@ -60 +60 @@
       this.nameTextBox = new System.Windows.Forms.TextBox();
       this.nameLabel = new System.Windows.Forms.Label();
+      this.pluginImageList = new System.Windows.Forms.ImageList(this.components);
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
-      this.pluginListView = new PluginListView();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
@@ -81 +81 @@
       // 
       this.saveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.saveButton.Enabled = false;
       this.saveButton.Location = new System.Drawing.Point(3, 365);
       this.saveButton.Name = "saveButton";
@@ -91 +92 @@
       // newProductButton
       // 
+      this.newProductButton.Enabled = false;
       this.newProductButton.Location = new System.Drawing.Point(84, 3);
       this.newProductButton.Name = "newProductButton";
@@ -132 +134 @@
             this.productNameHeader,
             this.productVersionHeader});
+      this.productsListView.Enabled = false;
       this.productsListView.FullRowSelect = true;
       this.productsListView.Location = new System.Drawing.Point(3, 3);
@@ -159 +162 @@
       this.productImageList.TransparentColor = System.Drawing.Color.Transparent;
       // 
-      // pluginImageList
-      // 
-      this.pluginImageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
-      this.pluginImageList.ImageSize = new System.Drawing.Size(16, 16);
-      this.pluginImageList.TransparentColor = System.Drawing.Color.Transparent;
+      // pluginListView
+      // 
+      this.pluginListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.pluginListView.Enabled = false;
+      this.pluginListView.Location = new System.Drawing.Point(3, 85);
+      this.pluginListView.Name = "pluginListView";
+      this.pluginListView.Plugins = null;
+      this.pluginListView.Size = new System.Drawing.Size(330, 303);
+      this.pluginListView.TabIndex = 7;
+      this.pluginListView.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.pluginListView_ItemChecked);
       // 
       // pluginsLabel
@@ -178 +188 @@
       this.versionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.versionTextBox.Enabled = false;
       this.versionTextBox.Location = new System.Drawing.Point(68, 29);
       this.versionTextBox.Name = "versionTextBox";
@@ -187 +198 @@
       // 
       this.versionLabel.AutoSize = true;
+      this.versionLabel.Enabled = false;
       this.versionLabel.Location = new System.Drawing.Point(10, 32);
       this.versionLabel.Name = "versionLabel";
@@ -197 +209 @@
       this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.nameTextBox.Enabled = false;
       this.nameTextBox.Location = new System.Drawing.Point(68, 3);
       this.nameTextBox.Name = "nameTextBox";
@@ -206 +219 @@
       // 
       this.nameLabel.AutoSize = true;
+      this.nameLabel.Enabled = false;
       this.nameLabel.Location = new System.Drawing.Point(17, 6);
       this.nameLabel.Name = "nameLabel";
@@ -212 +226 @@
       this.nameLabel.Text = "Name:";
       // 
+      // pluginImageList
+      // 
+      this.pluginImageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+      this.pluginImageList.ImageSize = new System.Drawing.Size(16, 16);
+      this.pluginImageList.TransparentColor = System.Drawing.Color.Transparent;
+      // 
       // errorProvider
       // 
       this.errorProvider.ContainerControl = this;
-      // 
-      // pluginListView
-      // 
-      this.pluginListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.pluginListView.Location = new System.Drawing.Point(3, 85);
-      this.pluginListView.Name = "pluginListView";
-      this.pluginListView.Plugins = null;
-      this.pluginListView.Size = new System.Drawing.Size(330, 303);
-      this.pluginListView.TabIndex = 7;
-      this.pluginListView.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.pluginListView_ItemChecked);
       // 
       // ProductEditor

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

@@ -91 +91 @@
 
     private void refreshProductsWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
-      this.products = new List<PluginDeploymentService.ProductDescription>(
-        (PluginDeploymentService.ProductDescription[])((object[])e.Result)[0]);
-      this.plugins = new List<PluginDeploymentService.PluginDescription>(
-        (PluginDeploymentService.PluginDescription[])((object[])e.Result)[1]);
-
-      UpdateProductsList();
-      dirtyProducts.Clear();
-
-      Cursor = Cursors.Default;
-      SetControlsEnabled(true);
+      if (!e.Cancelled && e.Result != null) {
+        this.products = new List<PluginDeploymentService.ProductDescription>(
+          (PluginDeploymentService.ProductDescription[])((object[])e.Result)[0]);
+        this.plugins = new List<PluginDeploymentService.PluginDescription>(
+          (PluginDeploymentService.PluginDescription[])((object[])e.Result)[1]);
+
+        UpdateProductsList();
+        dirtyProducts.Clear();
+
+        Cursor = Cursors.Default;
+        SetControlsEnabled(true);
+      }
     }
     #endregion
@@ -136 +138 @@
       newProductButton.Enabled = enabled;
       splitContainer.Enabled = enabled;
+      productsListView.Enabled = enabled;
+      nameLabel.Enabled = enabled;
+      nameTextBox.Enabled = enabled;
+      versionLabel.Enabled = enabled;
+      versionTextBox.Enabled = enabled;
+      pluginListView.Enabled = enabled;
     }