Changeset 3627

Timestamp:

05/05/10 11:37:57 (15 years ago)

Author:

gkronber

Message:

Refactored class names and fixed a dependency-selection bug. #994 (Clean up plugin infrastructure project)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced

Files:

• AvailablePluginsView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/RemotePluginInstaller.Designer.cs) (1 diff)
• AvailablePluginsView.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/RemotePluginInstaller.cs) (8 diffs)
• AvailablePluginsView.resx (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/RemotePluginInstaller.resx)
• EditProductsView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/ProductEditor.Designer.cs) (1 diff)
• EditProductsView.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/ProductEditor.cs) (5 diffs)
• EditProductsView.resx (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/ProductEditor.resx)
• InstallationManagerForm.Designer.cs (modified) (3 diffs)
• InstallationManagerForm.cs (modified) (1 diff)
• InstalledPluginsView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LocalPluginsView.Designer.cs) (1 diff)
• InstalledPluginsView.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LocalPluginsView.cs) (3 diffs)
• InstalledPluginsView.resx (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LocalPluginsView.resx)
• LicenseConfirmationDialog.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationBox.Designer.cs) (5 diffs)
• LicenseConfirmationDialog.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationBox.cs) (1 diff)
• LicenseConfirmationDialog.resx (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationBox.resx)
• LicenseView.Designer.cs (modified) (1 diff)
• PluginComparisonView.Designer.cs (deleted)
• PluginComparisonView.cs (deleted)
• PluginComparisonView.resx (deleted)
• PluginListView.Designer.cs (deleted)
• PluginListView.cs (deleted)
• PluginListView.resx (deleted)
• PluginView.Designer.cs (modified) (10 diffs)
• PluginView.cs (modified) (4 diffs)
• PluginView.resx (modified) (1 diff)
• UploadPluginsView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginEditor.Designer.cs) (1 diff)
• UploadPluginsView.cs (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginEditor.cs) (5 diffs)
• UploadPluginsView.resx (moved) (moved from trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginEditor.resx)
• Util.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/AvailablePluginsView.Designer.cs

@@ -20 +20 @@
 #endregion
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class RemotePluginInstallerView {
+  partial class AvailablePluginsView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/AvailablePluginsView.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class RemotePluginInstallerView : InstallationManagerControl {
+  internal partial class AvailablePluginsView : InstallationManagerControl {
     private class RefreshBackgroundWorkerResult {
       public IEnumerable<IPluginDescription> RemotePlugins { get; set; }
@@ -66 +66 @@
       set { pluginManager = value; }
     }
-    public RemotePluginInstallerView() {
+    public AvailablePluginsView() {
       InitializeComponent();
       productImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.Resources.Setup_Install);
@@ -212 +212 @@
 
     private void UpdatePluginsList() {
-      // clear plugins list view
-      List<ListViewItem> pluginItemsToDelete = new List<ListViewItem>(pluginsListView.Items.OfType<ListViewItem>());
-      pluginItemsToDelete.ForEach(item => pluginsListView.Items.Remove(item));
+      pluginsListView.Items.Clear();
 
       // populate plugins list
@@ -264 +262 @@
     private void remotePluginsListView_ItemChecked(object sender, ItemCheckedEventArgs e) {
       foreach (ListViewItem item in pluginsListView.SelectedItems) {
-        // dispatch by check state and type of item (product/plugin)
-        IPluginDescription plugin = item.Tag as IPluginDescription;
-        if (plugin != null)
-          if (e.Item.Checked)
-            HandlePluginChecked(plugin);
-          else
-            HandlePluginUnchecked(plugin);
-        else {
-          DeploymentService.ProductDescription product = item.Tag as DeploymentService.ProductDescription;
-          if (product != null)
-            if (e.Item.Checked)
-              HandleProductChecked(product);
-            else
-              HandleProductUnchecked(product);
-        }
+        IPluginDescription plugin = (IPluginDescription)item.Tag;
+        if (e.Item.Checked)
+          HandlePluginChecked(plugin);
+        else
+          HandlePluginUnchecked(plugin);
       }
       installPluginsButton.Enabled = pluginsListView.CheckedItems.Count > 0;
-    }
-
-    private void HandleProductUnchecked(HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.ProductDescription product) {
-      // also uncheck the plugins of the product
-      List<ListViewItem> modifiedItems = new List<ListViewItem>();
-      modifiedItems.Add(FindItemForProduct(product));
-      foreach (var plugin in product.Plugins) {
-        // there can be multiple entries for a single plugin in different groups
-        foreach (var item in FindItemsForPlugin(plugin)) {
-          if (item != null && item.Checked)
-            modifiedItems.Add(item);
-        }
-      }
-      pluginsListView.UncheckItems(modifiedItems);
-    }
-
-    private void HandleProductChecked(HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.ProductDescription product) {
-      // also check all plugins of the product
-      List<ListViewItem> modifiedItems = new List<ListViewItem>();
-      modifiedItems.Add(FindItemForProduct(product));
-      foreach (var plugin in product.Plugins) {
-        // there can be multiple entries for a single plugin in different groups
-        foreach (var item in FindItemsForPlugin(plugin)) {
-          if (item != null && !item.Checked) {
-            if (!modifiedItems.Contains(item))
-              modifiedItems.Add(item);
-          }
-        }
-      }
-      pluginsListView.CheckItems(modifiedItems);
     }
 
@@ -317 +275 @@
       List<ListViewItem> modifiedItems = new List<ListViewItem>();
       modifiedItems.AddRange(FindItemsForPlugin(plugin));
-      var dependentPlugins = from otherPlugin in plugins
-                             where otherPlugin.Dependencies.Any(dep => dep.Name == plugin.Name && dep.Version == plugin.Version)
-                             select otherPlugin;
+      var dependentPlugins = Util.GetAllDependents(plugin, plugins);
       foreach (var dependentPlugin in dependentPlugins) {
         // there can be multiple entries for a single plugin in different groups
@@ -329 +285 @@
         }
       }
-      // also uncheck all products containing this plugin
-      var dependentProducts = from product in products
-                              where product.Plugins.Any(p => p.Name == plugin.Name && p.Version == plugin.Version)
-                              select product;
-      foreach (var dependentProduct in dependentProducts) {
-        var item = FindItemForProduct(dependentProduct);
-        if (item != null && item.Checked) {
-          if (!modifiedItems.Contains(item))
-            modifiedItems.Add(item);
-        }
-      }
       pluginsListView.UncheckItems(modifiedItems);
     }
@@ -347 +292 @@
       List<ListViewItem> modifiedItems = new List<ListViewItem>();
       modifiedItems.AddRange(FindItemsForPlugin(plugin));
-      foreach (var dep in plugin.Dependencies) {
+      foreach (var dep in Util.GetAllDependencies(plugin)) {
         // there can be multiple entries for a single plugin in different groups
         foreach (ListViewItem item in FindItemsForPlugin(dep)) {
@@ -369 +314 @@
     }
 
-    private ListViewItem FindItemForProduct(DeploymentService.ProductDescription product) {
-      return (from item in pluginsListView.Items.OfType<ListViewItem>()
-              let otherProduct = item.Tag as DeploymentService.ProductDescription
-              where otherProduct != null && otherProduct.Name == product.Name && otherProduct.Version == product.Version
-              select item).SingleOrDefault();
-    }
-
     private bool IsNewerThan(IPluginDescription plugin1, IPluginDescription plugin2) {
       // newer: build version is higher, or if build version is the same revision is higher

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/EditProductsView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class ProductEditor {
+  partial class EditProductsView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/EditProductsView.cs

@@ -32 +32 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class ProductEditor : InstallationManagerControl {
+  internal partial class EditProductsView : InstallationManagerControl {
     private const string RefreshMessage = "Downloading product and plugin information...";
     private const string UploadMessage = "Uploading product and plugin information...";
@@ -45 +45 @@
     private HashSet<DeploymentService.ProductDescription> dirtyProducts;
 
-    public ProductEditor() {
+    public EditProductsView() {
       InitializeComponent();
 
@@ -384 +384 @@
           if (!modifiedPlugins.Contains(plugin))
             modifiedPlugins.Add(plugin);
-          foreach (var dep in GetAllDependencies(plugin)) {
+          foreach (var dep in Util.GetAllDependencies(plugin)) {
             if (!modifiedPlugins.Contains(dep))
               modifiedPlugins.Add(dep);
@@ -397 +397 @@
           if (!modifiedPlugins.Contains(plugin))
             modifiedPlugins.Add(plugin);
-          foreach (var dep in GetAllDependents(plugin)) {
+          foreach (var dep in Util.GetAllDependents(plugin, plugins.Cast<IPluginDescription>())) {
             if (!modifiedPlugins.Contains(dep))
               modifiedPlugins.Add(dep);
@@ -412 +412 @@
 
     #region helper
-    private IEnumerable<IPluginDescription> GetAllDependents(IPluginDescription plugin) {
-      return from p in plugins
-             let matchingEntries = from dep in GetAllDependencies(p)
-                                   where dep.Name == plugin.Name
-                                   where dep.Version == plugin.Version
-                                   select dep
-             where matchingEntries.Any()
-             select p as IPluginDescription;
-    }
-
-    private IEnumerable<IPluginDescription> GetAllDependencies(IPluginDescription plugin) {
-      HashSet<IPluginDescription> yieldedPlugins = new HashSet<IPluginDescription>();
-      foreach (var dep in plugin.Dependencies) {
-        foreach (var recDep in GetAllDependencies(dep)) {
-          if (!yieldedPlugins.Contains(recDep)) {
-            yieldedPlugins.Add(recDep);
-            yield return recDep;
-          }
-        }
-        if (!yieldedPlugins.Contains(dep)) {
-          yieldedPlugins.Add(dep);
-          yield return dep;
-        }
-      }
-    }
     private void MarkProductDirty(HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.ProductDescription activeProduct) {
       if (!dirtyProducts.Contains(activeProduct)) {

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.Designer.cs

@@ -53 +53 @@
       this.basicUpdateView = new HeuristicLab.PluginInfrastructure.Advanced.BasicUpdateView();
       this.localPluginsTabPage = new System.Windows.Forms.TabPage();
-      this.localPluginsView = new HeuristicLab.PluginInfrastructure.Advanced.LocalPluginsView();
+      this.localPluginsView = new HeuristicLab.PluginInfrastructure.Advanced.InstalledPluginsView();
       this.availablePluginsTabPage = new System.Windows.Forms.TabPage();
-      this.remotePluginInstaller = new HeuristicLab.PluginInfrastructure.Advanced.RemotePluginInstallerView();
+      this.remotePluginInstaller = new HeuristicLab.PluginInfrastructure.Advanced.AvailablePluginsView();
       this.uploadPluginsTabPage = new System.Windows.Forms.TabPage();
-      this.pluginEditor = new HeuristicLab.PluginInfrastructure.Advanced.PluginEditor();
+      this.pluginEditor = new HeuristicLab.PluginInfrastructure.Advanced.UploadPluginsView();
       this.manageProductsTabPage = new System.Windows.Forms.TabPage();
-      this.productEditor = new HeuristicLab.PluginInfrastructure.Advanced.ProductEditor();
+      this.productEditor = new HeuristicLab.PluginInfrastructure.Advanced.EditProductsView();
       this.logTabPage = new System.Windows.Forms.TabPage();
       this.logTextBox = new System.Windows.Forms.TextBox();
@@ -324 +324 @@
     private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar;
     private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel;
-    private RemotePluginInstallerView remotePluginInstaller;
+    private AvailablePluginsView remotePluginInstaller;
     private System.Windows.Forms.TabControl tabControl;
     private System.Windows.Forms.TabPage localPluginsTabPage;
@@ -335 +335 @@
     private System.Windows.Forms.TabPage uploadPluginsTabPage;
     private System.Windows.Forms.TabPage manageProductsTabPage;
-    private PluginEditor pluginEditor;
-    private ProductEditor productEditor;
-    private LocalPluginsView localPluginsView;
+    private UploadPluginsView pluginEditor;
+    private EditProductsView productEditor;
+    private InstalledPluginsView localPluginsView;
     private System.Windows.Forms.TabPage updateAllPluginsTabPage;
     private BasicUpdateView basicUpdateView;

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.cs

@@ -172 +172 @@
       foreach (var plugin in plugins) {
         if (!string.IsNullOrEmpty(plugin.LicenseText)) {
-          var licenseConfirmationBox = new LicenseConfirmationBox(plugin);
+          var licenseConfirmationBox = new LicenseConfirmationDialog(plugin);
           if (licenseConfirmationBox.ShowDialog() != DialogResult.OK)
             return false;

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstalledPluginsView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class LocalPluginsView {
+  partial class InstalledPluginsView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstalledPluginsView.cs

@@ -34 +34 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class LocalPluginsView : InstallationManagerControl {
+  internal partial class InstalledPluginsView : InstallationManagerControl {
     private const string CheckingPluginsMessage = "Checking for updated plugins...";
     private const string NoUpdatesAvailableMessage = "No updates available.";
@@ -58 +58 @@
     }
 
-    public LocalPluginsView()
+    public InstalledPluginsView()
       : base() {
       InitializeComponent();
@@ -171 +171 @@
         List<ListViewItem> modifiedItems = new List<ListViewItem>();
         foreach (ListViewItem item in localPluginsListView.SelectedItems) {
-          var plugin = (IPluginDescription)item.Tag;
           modifiedItems.Add(item);
-          // also uncheck all dependent plugins
-          foreach (ListViewItem dependentItem in localPluginsListView.Items) {
-            var dependent = (IPluginDescription)dependentItem.Tag;
-            if (!dependentItem.Checked && (from dep in dependent.Dependencies
-                                           where dep.Name == plugin.Name
-                                           where dep.Version == plugin.Version
-                                           select dep).Any()) {
-              modifiedItems.Add(dependentItem);
+          int oldItemsCount = 0;
+          while (oldItemsCount < modifiedItems.Count) {
+            oldItemsCount = modifiedItems.Count;
+            var oldModifiedItems = new List<ListViewItem>(modifiedItems);
+            foreach (var modifiedItem in oldModifiedItems) {
+              var plugin = (IPluginDescription)modifiedItem.Tag;
+              // also check all dependent plugins
+              foreach (ListViewItem dependentItem in localPluginsListView.Items) {
+                var dependent = (IPluginDescription)dependentItem.Tag;
+                if (!modifiedItems.Contains(dependentItem) &&
+                  !dependentItem.Checked && (from dep in dependent.Dependencies
+                                             where dep.Name == plugin.Name
+                                             where dep.Version == plugin.Version
+                                             select dep).Any()) {
+                  modifiedItems.Add(dependentItem);
+                }
+              }
             }
           }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationDialog.Designer.cs

@@ -20 +20 @@
 #endregion
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class LicenseConfirmationBox {
+  partial class LicenseConfirmationDialog {
     /// <summary>
     /// Required designer variable.
@@ -45 +45 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LicenseConfirmationBox));
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LicenseConfirmationDialog));
       this.richTextBox = new System.Windows.Forms.RichTextBox();
       this.acceptButton = new System.Windows.Forms.Button();
@@ -89 +89 @@
       // 
       this.rejectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.rejectButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
       this.rejectButton.Location = new System.Drawing.Point(428, 53);
       this.rejectButton.Name = "rejectButton";
@@ -165 +166 @@
       this.panel1.TabIndex = 6;
       // 
-      // LicenseConfirmationBox
-      // 
+      // LicenseConfirmationDialog
+      // 
+      this.AcceptButton = this.acceptButton;
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.BackColor = System.Drawing.SystemColors.HighlightText;
+      this.CancelButton = this.rejectButton;
       this.ClientSize = new System.Drawing.Size(518, 429);
       this.Controls.Add(this.panel1);
@@ -176 +179 @@
       this.Controls.Add(this.richTextBox);
       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-      this.Name = "LicenseConfirmationBox";
+      this.MaximizeBox = false;
+      this.MinimizeBox = false;
+      this.Name = "LicenseConfirmationDialog";
+      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
       this.radioButtonGroupBox.ResumeLayout(false);
       this.radioButtonGroupBox.PerformLayout();

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationDialog.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class LicenseConfirmationBox : Form {
-    public LicenseConfirmationBox() {
+  internal partial class LicenseConfirmationDialog : Form {
+    public LicenseConfirmationDialog() {
       InitializeComponent();
     }
 
-    public LicenseConfirmationBox(IPluginDescription plugin) {
+    public LicenseConfirmationDialog(IPluginDescription plugin) {
       InitializeComponent();
       richTextBox.Text = plugin.LicenseText;

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseView.Designer.cs

@@ -67 +67 @@
       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
       this.Name = "LicenseView";
+      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
       this.Text = "License Agreement";
       this.ResumeLayout(false);

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginView.Designer.cs

@@ -52 +52 @@
       this.contactTextBox = new System.Windows.Forms.TextBox();
       this.contactInfoLabel = new System.Windows.Forms.Label();
-      this.licenseButton = new System.Windows.Forms.Button();
       this.dependenciesGroupBox = new System.Windows.Forms.GroupBox();
       this.dependenciesListView = new System.Windows.Forms.ListView();
@@ -70 +69 @@
       this.descriptionTextBox = new System.Windows.Forms.TextBox();
       this.errorTextBox = new System.Windows.Forms.TextBox();
+      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.showLicenseButton = new System.Windows.Forms.Button();
       this.dependenciesGroupBox.SuspendLayout();
       this.filesGroupBox.SuspendLayout();
@@ -131 +132 @@
       this.contactInfoLabel.Text = "Contact:";
       // 
-      // licenseButton
-      // 
-      this.licenseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.licenseButton.Location = new System.Drawing.Point(3, 575);
-      this.licenseButton.Name = "licenseButton";
-      this.licenseButton.Size = new System.Drawing.Size(103, 23);
-      this.licenseButton.TabIndex = 10;
-      this.licenseButton.Text = "Show license";
-      this.licenseButton.UseVisualStyleBackColor = true;
-      this.licenseButton.Click += new System.EventHandler(this.licenseButton_Click);
-      // 
       // dependenciesGroupBox
       // 
@@ -150 +140 @@
       this.dependenciesGroupBox.Location = new System.Drawing.Point(12, 324);
       this.dependenciesGroupBox.Name = "dependenciesGroupBox";
-      this.dependenciesGroupBox.Size = new System.Drawing.Size(663, 229);
+      this.dependenciesGroupBox.Size = new System.Drawing.Size(663, 198);
       this.dependenciesGroupBox.TabIndex = 1;
       this.dependenciesGroupBox.TabStop = false;
@@ -164 +154 @@
       this.dependenciesListView.Location = new System.Drawing.Point(3, 16);
       this.dependenciesListView.Name = "dependenciesListView";
-      this.dependenciesListView.Size = new System.Drawing.Size(657, 210);
+      this.dependenciesListView.Size = new System.Drawing.Size(657, 179);
       this.dependenciesListView.SmallImageList = this.pluginsImageList;
       this.dependenciesListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
@@ -294 +284 @@
       this.errorTextBox.TabIndex = 21;
       // 
+      // showLicenseButton
+      // 
+      this.showLicenseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.showLicenseButton.Location = new System.Drawing.Point(12, 528);
+      this.showLicenseButton.Name = "showLicenseButton";
+      this.showLicenseButton.Size = new System.Drawing.Size(87, 23);
+      this.showLicenseButton.TabIndex = 22;
+      this.showLicenseButton.Text = "Show License";
+      this.toolTip.SetToolTip(this.showLicenseButton, "Show Plugin License");
+      this.showLicenseButton.UseVisualStyleBackColor = true;
+      this.showLicenseButton.Click += new System.EventHandler(this.showLicenseButton_Click);
+      // 
       // PluginView
       // 
@@ -299 +301 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(687, 565);
+      this.Controls.Add(this.showLicenseButton);
       this.Controls.Add(this.errorTextBox);
       this.Controls.Add(this.descriptionTextBox);
@@ -307 +310 @@
       this.Controls.Add(this.dependenciesGroupBox);
       this.Controls.Add(this.filesGroupBox);
-      this.Controls.Add(this.licenseButton);
       this.Controls.Add(this.contactTextBox);
       this.Controls.Add(this.contactInfoLabel);
@@ -331 +333 @@
     protected System.Windows.Forms.TextBox contactTextBox;
     protected System.Windows.Forms.Label contactInfoLabel;
-    protected System.Windows.Forms.Button licenseButton;
     protected System.Windows.Forms.GroupBox dependenciesGroupBox;
     private System.Windows.Forms.ColumnHeader pluginNameHeader;
@@ -349 +350 @@
     private System.Windows.Forms.ImageList filesImageList;
     private System.Windows.Forms.ColumnHeader pluginDescriptionHeader;
+    private System.Windows.Forms.ToolTip toolTip;
+    private System.Windows.Forms.Button showLicenseButton;
 
   }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginView.cs

@@ -66 +66 @@
       versionTextBox.Text = plugin.Version.ToString();
       contactTextBox.Text = CombineStrings(plugin.ContactName, plugin.ContactEmail);
+      toolTip.SetToolTip(contactTextBox, contactTextBox.Text);
       descriptionTextBox.Text = plugin.Description;
+      toolTip.SetToolTip(descriptionTextBox, plugin.Description);
       var localPlugin = plugin as PluginDescription;
       if (localPlugin != null) {
         stateTextBox.Text = localPlugin.PluginState.ToString();
         errorTextBox.Text = localPlugin.LoadingErrorInformation;
+        toolTip.SetToolTip(stateTextBox, stateTextBox.Text + Environment.NewLine + errorTextBox.Text);
+        toolTip.SetToolTip(errorTextBox, errorTextBox.Text);
       }
       foreach (PluginDescription dependency in plugin.Dependencies) {
@@ -92 +96 @@
       Util.ResizeColumns(filesListView.Columns.OfType<ColumnHeader>());
 
-      licenseButton.Enabled = !string.IsNullOrEmpty(plugin.LicenseText);
+      showLicenseButton.Enabled = !string.IsNullOrEmpty(plugin.LicenseText);
     }
 
@@ -106 +110 @@
     }
 
-    private void licenseButton_Click(object sender, EventArgs e) {
-      LicenseView view = new LicenseView(plugin);
-      view.Show();
-    }
-
     private void dependenciesListView_ItemActivate(object sender, EventArgs e) {
       if (dependenciesListView.SelectedItems.Count > 0) {
@@ -118 +117 @@
       }
     }
+
+    private void showLicenseButton_Click(object sender, EventArgs e) {
+      LicenseView view = new LicenseView(plugin);
+      view.Show();
+    }
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginView.resx

@@ -123 +123 @@
   <metadata name="filesImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>181, 17</value>
+  </metadata>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>306, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/UploadPluginsView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class PluginEditor {
+  partial class UploadPluginsView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/UploadPluginsView.cs

@@ -34 +34 @@
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class PluginEditor : InstallationManagerControl {
+  internal partial class UploadPluginsView : InstallationManagerControl {
     private const string UploadMessage = "Uploading plugins...";
     private const string RefreshMessage = "Downloading plugin information from deployment service...";
@@ -48 +48 @@
     }
 
-    public PluginEditor() {
+    public UploadPluginsView() {
       InitializeComponent();
       pluginImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.Resources.plugin_16);
@@ -192 +192 @@
           if (!modifiedPlugins.Contains(plugin))
             modifiedPlugins.Add(plugin);
-          foreach (var dep in GetAllDependencies(plugin)) {
+          foreach (var dep in Util.GetAllDependencies(plugin)) {
             if (!modifiedPlugins.Contains(dep))
               modifiedPlugins.Add(dep);
@@ -204 +204 @@
           if (!modifiedPlugins.Contains(plugin))
             modifiedPlugins.Add(plugin);
-          foreach (var dep in GetAllDependents(plugin)) {
+          foreach (var dep in Util.GetAllDependents(plugin, localAndServerPlugins.Keys)) {
             if (!modifiedPlugins.Contains(dep))
               modifiedPlugins.Add(dep);
@@ -242 +242 @@
       Util.ResizeColumns(listView.Columns.OfType<ColumnHeader>());
       ignoreItemCheckedEvents = false;
-    }
-
-    private IEnumerable<IPluginDescription> GetAllDependents(IPluginDescription plugin) {
-      return from p in localAndServerPlugins.Keys
-             let matchingEntries = from dep in GetAllDependencies(p)
-                                   where dep.Name == plugin.Name
-                                   where dep.Version == plugin.Version
-                                   select dep
-             where matchingEntries.Any()
-             select p;
-    }
-
-    private IEnumerable<IPluginDescription> GetAllDependencies(IPluginDescription plugin) {
-      foreach (var dep in plugin.Dependencies) {
-        foreach (var recDep in GetAllDependencies(dep)) {
-          yield return recDep;
-        }
-        yield return dep;
-      }
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/Util.cs

@@ -46 +46 @@
         ResizeColumn(columnHeader);
     }
+
+    internal static IEnumerable<IPluginDescription> GetAllDependents(IPluginDescription plugin, IEnumerable<IPluginDescription> availablePlugins) {
+      return from p in availablePlugins
+             let matchingEntries = from dep in GetAllDependencies(p)
+                                   where dep.Name == plugin.Name
+                                   where dep.Version == plugin.Version
+                                   select dep
+             where matchingEntries.Any()
+             select p as IPluginDescription;
+    }
+
+    internal static IEnumerable<IPluginDescription> GetAllDependencies(IPluginDescription plugin) {
+      HashSet<IPluginDescription> yieldedPlugins = new HashSet<IPluginDescription>();
+      foreach (var dep in plugin.Dependencies) {
+        foreach (var recDep in GetAllDependencies(dep)) {
+          if (!yieldedPlugins.Contains(recDep)) {
+            yieldedPlugins.Add(recDep);
+            yield return recDep;
+          }
+        }
+        if (!yieldedPlugins.Contains(dep)) {
+          yieldedPlugins.Add(dep);
+          yield return dep;
+        }
+      }
+    }
+
   }
 }