Changeset 13363

Timestamp:

11/24/15 16:34:17 (9 years ago)

Author:

gkronber

Message:

#2522: improvements to new PluginInformationDialog and removed obsolete classes

Location:

branches/RefactorPluginInfrastructure-2522

Files:

• HeuristicLab.PluginInfrastructure.UI/AboutDialog.Designer.cs (modified) (13 diffs)
• HeuristicLab.PluginInfrastructure.UI/AboutDialog.cs (modified) (4 diffs)
• HeuristicLab.PluginInfrastructure.UI/HeuristicLab.PluginInfrastructure.UI-4.0.csproj (modified) (3 diffs)
• HeuristicLab.PluginInfrastructure.UI/InstallationManagerControl.Designer.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/InstallationManagerControl.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/InstallationManagerForm.Designer.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/InstallationManagerForm.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/InstalledPluginsView.Designer.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/InstalledPluginsView.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/LicenseView.Designer.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/LicenseView.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/MultiSelectListView.Designer.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/MultiSelectListView.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/PluginInformationDialog.Designer.cs (modified) (5 diffs)
• HeuristicLab.PluginInfrastructure.UI/PluginInformationDialog.cs (modified) (4 diffs)
• HeuristicLab.PluginInfrastructure.UI/PluginView.Designer.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/PluginView.cs (deleted)
• HeuristicLab.PluginInfrastructure.UI/Util.cs (deleted)
• HeuristicLab.PluginInfrastructure/3.3/Interfaces/IPluginDescription.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/3.3/PluginValidator.cs (modified) (5 diffs)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/AboutDialog.Designer.cs

@@ -47 +47 @@
       this.components = new System.ComponentModel.Container();
       this.okButton = new System.Windows.Forms.Button();
-      this.pluginListView = new System.Windows.Forms.ListView();
-      this.pluginNameColumnHeader = new System.Windows.Forms.ColumnHeader();
-      this.pluginVersionColumnHeader = new System.Windows.Forms.ColumnHeader();
-      this.pluginDescriptionColumnHeader = new System.Windows.Forms.ColumnHeader();
       this.imageList = new System.Windows.Forms.ImageList(this.components);
       this.pictureBox = new System.Windows.Forms.PictureBox();
@@ -59 +55 @@
       this.versionTextBox = new System.Windows.Forms.TextBox();
       this.copyrightTextBox = new System.Windows.Forms.TextBox();
-      this.pluginsGroupBox = new System.Windows.Forms.GroupBox();
       this.licenseTextBox = new System.Windows.Forms.RichTextBox();
       this.label2 = new System.Windows.Forms.Label();
@@ -66 +61 @@
       this.webLinkLabel = new System.Windows.Forms.LinkLabel();
       this.mailLinkLabel = new System.Windows.Forms.LinkLabel();
+      this.showPluginsButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-      this.pluginsGroupBox.SuspendLayout();
       this.panel1.SuspendLayout();
       this.SuspendLayout();
@@ -83 +78 @@
       this.okButton.Click += new System.EventHandler(this.okButton_Click);
       // 
-      // 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.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.pluginNameColumnHeader,
-            this.pluginVersionColumnHeader,
-            this.pluginDescriptionColumnHeader});
-      this.pluginListView.Location = new System.Drawing.Point(6, 19);
-      this.pluginListView.Name = "pluginListView";
-      this.pluginListView.ShowGroups = false;
-      this.pluginListView.Size = new System.Drawing.Size(589, 201);
-      this.pluginListView.SmallImageList = this.imageList;
-      this.pluginListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
-      this.pluginListView.TabIndex = 0;
-      this.pluginListView.UseCompatibleStateImageBehavior = false;
-      this.pluginListView.View = System.Windows.Forms.View.Details;
-      this.pluginListView.ItemActivate += new System.EventHandler(this.pluginListView_ItemActivate);
-      // 
-      // pluginNameColumnHeader
-      // 
-      this.pluginNameColumnHeader.Text = "Name";
-      // 
-      // pluginVersionColumnHeader
-      // 
-      this.pluginVersionColumnHeader.Text = "Version";
-      // 
-      // pluginDescriptionColumnHeader
-      // 
-      this.pluginDescriptionColumnHeader.Text = "Description";
-      // 
       // imageList
       // 
@@ -191 +154 @@
       this.copyrightTextBox.Text = "(C)";
       // 
-      // pluginsGroupBox
-      // 
-      this.pluginsGroupBox.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.pluginsGroupBox.Controls.Add(this.pluginListView);
-      this.pluginsGroupBox.Location = new System.Drawing.Point(12, 306);
-      this.pluginsGroupBox.Name = "pluginsGroupBox";
-      this.pluginsGroupBox.Size = new System.Drawing.Size(601, 226);
-      this.pluginsGroupBox.TabIndex = 12;
-      this.pluginsGroupBox.TabStop = false;
-      this.pluginsGroupBox.Text = "Plugins";
-      // 
       // licenseTextBox
       // 
-      this.licenseTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.licenseTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.licenseTextBox.BackColor = System.Drawing.SystemColors.HighlightText;
       this.licenseTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -230 +180 @@
       // panel1
       // 
-      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.panel1.BackColor = System.Drawing.SystemColors.Control;
       this.panel1.Controls.Add(this.okButton);
-      this.panel1.Location = new System.Drawing.Point(0, 538);
+      this.panel1.Location = new System.Drawing.Point(0, 388);
       this.panel1.Name = "panel1";
       this.panel1.Size = new System.Drawing.Size(626, 48);
@@ -270 +220 @@
       this.mailLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.mailLinkLabel_LinkClicked);
       // 
+      // showPluginsButton
+      // 
+      this.showPluginsButton.Location = new System.Drawing.Point(12, 198);
+      this.showPluginsButton.Name = "showPluginsButton";
+      this.showPluginsButton.Size = new System.Drawing.Size(102, 23);
+      this.showPluginsButton.TabIndex = 12;
+      this.showPluginsButton.Text = "Show Plugins";
+      this.showPluginsButton.UseVisualStyleBackColor = true;
+      this.showPluginsButton.Click += new System.EventHandler(this.showPluginsButton_Click);
+      // 
       // AboutDialog
       // 
       this.AcceptButton = this.okButton;
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.BackColor = System.Drawing.SystemColors.Window;
       this.CancelButton = this.okButton;
-      this.ClientSize = new System.Drawing.Size(625, 586);
+      this.ClientSize = new System.Drawing.Size(625, 436);
+      this.Controls.Add(this.showPluginsButton);
       this.Controls.Add(this.mailLinkLabel);
       this.Controls.Add(this.webLinkLabel);
@@ -284 +244 @@
       this.Controls.Add(this.label2);
       this.Controls.Add(this.licenseTextBox);
-      this.Controls.Add(this.pluginsGroupBox);
       this.Controls.Add(this.copyrightTextBox);
       this.Controls.Add(this.versionTextBox);
@@ -292 +251 @@
       this.Controls.Add(this.label);
       this.Controls.Add(this.pictureBox);
-      this.Icon = Resources.HeuristicLab;
+      this.Icon = global::HeuristicLab.PluginInfrastructure.UI.Resources.HeuristicLab;
       this.MaximizeBox = false;
       this.MinimizeBox = false;
@@ -299 +258 @@
       this.Text = "About HeuristicLab";
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-      this.pluginsGroupBox.ResumeLayout(false);
       this.panel1.ResumeLayout(false);
       this.ResumeLayout(false);
@@ -309 +267 @@
 
     private System.Windows.Forms.Button okButton;
-    private System.Windows.Forms.ListView pluginListView;
     private System.Windows.Forms.ImageList imageList;
-    private System.Windows.Forms.ColumnHeader pluginNameColumnHeader;
-    private System.Windows.Forms.ColumnHeader pluginVersionColumnHeader;
-    private System.Windows.Forms.ColumnHeader pluginDescriptionColumnHeader;
     private System.Windows.Forms.PictureBox pictureBox;
     private System.Windows.Forms.Label label;
@@ -321 +275 @@
     private System.Windows.Forms.TextBox versionTextBox;
     private System.Windows.Forms.TextBox copyrightTextBox;
-    private System.Windows.Forms.GroupBox pluginsGroupBox;
     private System.Windows.Forms.RichTextBox licenseTextBox;
     private System.Windows.Forms.Label label2;
@@ -328 +281 @@
     private System.Windows.Forms.LinkLabel webLinkLabel;
     private System.Windows.Forms.LinkLabel mailLinkLabel;
+    private System.Windows.Forms.Button showPluginsButton;
   }
 }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/AboutDialog.cs

@@ -31 +31 @@
   /// </summary>
   public partial class AboutDialog : Form {
+    private List<IPluginDescription> plugins;
+
     /// <summary>
-    /// Creates a new about dialog with all plugins loaded in the current application.
+    /// Creates a new about dialog listing all plugins in the <paramref name="plugins"/> enumerable.
     /// </summary>
-    public AboutDialog() {
+    /// <param name="plugins">Enumerable of plugins that should be listed.</param>
+    public AboutDialog(IEnumerable<IPluginDescription> plugins) {
       InitializeComponent();
       var entryAssembly = Assembly.GetEntryAssembly();
@@ -43 +46 @@
       pictureBox.Image = Resources.HeuristicLabLogo;
       licenseTextBox.Text = Resources.LicenseText;
-      UpdatePluginList(ApplicationManager.Manager.Plugins);
+      this.plugins = plugins.ToList();
       ActiveControl = okButton;
     }
 
     /// <summary>
-    /// Creates a new about dialog listing all plugins in the <paramref name="plugins"/> enumerable.
+    /// Creates a new about dialog with all plugins loaded in the current application.
     /// </summary>
-    /// <param name="plugins">Enumerable of plugins that should be listed.</param>
-    public AboutDialog(IEnumerable<IPluginDescription> plugins)
-      : this() {
-      UpdatePluginList(plugins);
-    }
-
-    private void UpdatePluginList(IEnumerable<IPluginDescription> plugins) {
-      pluginListView.Items.Clear();
-      foreach (var plugin in plugins) {
-        ListViewItem pluginItem = CreateListViewItem(plugin);
-        pluginListView.Items.Add(pluginItem);
-      }
-      Util.ResizeColumns(pluginListView.Columns.OfType<ColumnHeader>());
+    public AboutDialog()
+      : this(ApplicationManager.Manager.Plugins) {
     }
 
@@ -91 +83 @@
 
     private void pluginListView_ItemActivate(object sender, EventArgs e) {
-      if (pluginListView.SelectedItems.Count > 0) {
-        PluginView view = new PluginView((IPluginDescription)pluginListView.SelectedItems[0].Tag);
-        view.Show(this);
-      }
     }
 
@@ -108 +96 @@
       System.Diagnostics.Process.Start("mailto:" + mailLinkLabel.Text);
     }
+
+    private void showPluginsButton_Click(object sender, EventArgs e) {
+      var d = new PluginInformationDialog(plugins);
+      d.ShowDialog(this);
+    }
   }
 }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/HeuristicLab.PluginInfrastructure.UI-4.0.csproj

@@ -60 +60 @@
       <DependentUpon>FrameworkVersionErrorDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="InstallationManagerControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="InstallationManagerControl.Designer.cs">
-      <DependentUpon>InstallationManagerControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="InstallationManagerForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="InstallationManagerForm.Designer.cs">
-      <DependentUpon>InstallationManagerForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="InstalledPluginsView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="InstalledPluginsView.Designer.cs">
-      <DependentUpon>InstalledPluginsView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="LicenseView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="LicenseView.Designer.cs">
-      <DependentUpon>LicenseView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MultiSelectListView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="MultiSelectListView.Designer.cs">
-      <DependentUpon>MultiSelectListView.cs</DependentUpon>
-    </Compile>
     <Compile Include="PluginInformationDialog.cs">
       <SubType>Form</SubType>
@@ -95 +65 @@
     <Compile Include="PluginInformationDialog.Designer.cs">
       <DependentUpon>PluginInformationDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="PluginView.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="PluginView.Designer.cs">
-      <DependentUpon>PluginView.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -116 +80 @@
       <DependentUpon>StarterForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Util.cs" />
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="PluginInformationDialog.resx">
-      <DependentUpon>PluginInformationDialog.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Resources\Error.ico" />
     <EmbeddedResource Include="Resources\HeuristicLab.ico" />

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/PluginInformationDialog.Designer.cs

@@ -65 +65 @@
       this.label = new System.Windows.Forms.Label();
       this.panel2 = new System.Windows.Forms.Panel();
+      this.stateTextBox = new System.Windows.Forms.TextBox();
+      this.label5 = new System.Windows.Forms.Label();
       this.panel1.SuspendLayout();
       this.panel2.SuspendLayout();
@@ -158 +160 @@
       this.textBox.BackColor = System.Drawing.SystemColors.HighlightText;
       this.textBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
-      this.textBox.Location = new System.Drawing.Point(6, 98);
+      this.textBox.Location = new System.Drawing.Point(6, 117);
       this.textBox.Name = "textBox";
       this.textBox.ReadOnly = true;
       this.textBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
-      this.textBox.Size = new System.Drawing.Size(526, 394);
+      this.textBox.Size = new System.Drawing.Size(526, 375);
       this.textBox.TabIndex = 11;
       this.textBox.Text = "Files and License Text";
       this.textBox.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.licenseTextBox_LinkClicked);
       this.textBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.textBox_MouseClick);
+      this.textBox.MouseLeave += new System.EventHandler(this.textBox_MouseLeave);
+      this.textBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.textBox_MouseMove);
       // 
       // label2
@@ -267 +271 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel2.Controls.Add(this.stateTextBox);
+      this.panel2.Controls.Add(this.label5);
       this.panel2.Controls.Add(this.contactTextBox);
       this.panel2.Controls.Add(this.mailLinkLabel);
@@ -282 +288 @@
       this.panel2.Size = new System.Drawing.Size(554, 495);
       this.panel2.TabIndex = 13;
+      // 
+      // stateTextBox
+      // 
+      this.stateTextBox.BackColor = System.Drawing.SystemColors.HighlightText;
+      this.stateTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+      this.stateTextBox.Location = new System.Drawing.Point(87, 98);
+      this.stateTextBox.Name = "stateTextBox";
+      this.stateTextBox.ReadOnly = true;
+      this.stateTextBox.Size = new System.Drawing.Size(355, 13);
+      this.stateTextBox.TabIndex = 13;
+      this.stateTextBox.Text = "Enabled/Disabled";
+      // 
+      // label5
+      // 
+      this.label5.AutoSize = true;
+      this.label5.Location = new System.Drawing.Point(3, 98);
+      this.label5.Margin = new System.Windows.Forms.Padding(3);
+      this.label5.Name = "label5";
+      this.label5.Size = new System.Drawing.Size(35, 13);
+      this.label5.TabIndex = 12;
+      this.label5.Text = "State:";
       // 
       // PluginInformationDialog
@@ -327 +354 @@
     private System.Windows.Forms.Label label;
     private System.Windows.Forms.Panel panel2;
+    private System.Windows.Forms.TextBox stateTextBox;
+    private System.Windows.Forms.Label label5;
   }
 }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure.UI/PluginInformationDialog.cs

@@ -52 +52 @@
         pluginListView.Items.Add(pluginItem);
       }
-      Util.ResizeColumns(pluginListView.Columns.OfType<ColumnHeader>());
     }
 
@@ -101 +100 @@
       productTextBox.Text = pluginDescription.Name;
       versionTextBox.Text = pluginDescription.Version.ToString();
-      contactTextBox.Text =
-        pluginDescription.ContactName + " " + pluginDescription.ContactEmail;
-
-      // build text and later replace plugindependency names with RTF links (too lazy to create RTF document)
-      textBox.Text =
-        pluginDescription.Description +
-        Environment.NewLine + Environment.NewLine +
-        "Files:" + Environment.NewLine +
-        string.Join(Environment.NewLine, pluginDescription.Files) +
-        Environment.NewLine + Environment.NewLine +
-        "Dependencies:" + Environment.NewLine;
+      contactTextBox.Text = pluginDescription.ContactName + " " + pluginDescription.ContactEmail;
+      stateTextBox.Text = pluginDescription.PluginState.ToString();
+
+      textBox.Text = string.Empty;
+      textBox.AppendText(pluginDescription.Description + Environment.NewLine + Environment.NewLine);
+
+      if (!string.IsNullOrEmpty(pluginDescription.LoadingErrorInformation)) {
+        var startSel = textBox.TextLength;
+        textBox.AppendText("Error loading: " + pluginDescription.LoadingErrorInformation);
+        textBox.SelectionStart = startSel;
+        textBox.SelectionLength = textBox.TextLength;
+        textBox.SelectionColor = Color.Red;
+        textBox.AppendText(Environment.NewLine + Environment.NewLine);
+      }
+
+      textBox.AppendText("Files:" + Environment.NewLine);
+      foreach (var f in pluginDescription.Files) {
+        textBox.AppendText(f.Name); // might add icons for files here in the future
+        textBox.AppendText(Environment.NewLine);
+      }
+
+      textBox.AppendText(Environment.NewLine);
+      if (pluginDescription.Dependencies.Any())
+        textBox.AppendText("Dependencies:" + Environment.NewLine);
 
       // foreach dependency add a new line and set the formatting
@@ -146 +158 @@
 
     private void textBox_MouseClick(object sender, MouseEventArgs e) {
-      int i = textBox.GetCharIndexFromPosition(e.Location);
-      var text = textBox.Text;
-      // extract clicked string (left and right are whitespace
-      int startPos = i; while (startPos >= 0 && !char.IsWhiteSpace(text[startPos])) startPos--;
-      int endPos = i; while (endPos < textBox.TextLength && !char.IsWhiteSpace(text[endPos])) endPos++;
-      string clickedWord = text.Substring(startPos + 1, endPos - startPos - 1);
+      var clickedWord = GetWordAtMousePos(e.Location);
 
       pluginListView.SelectedItems.Clear();
@@ -164 +171 @@
     }
 
+    private void textBox_MouseMove(object sender, MouseEventArgs e) {
+      var wordUnderMouse = GetWordAtMousePos(e.Location);
+
+      // find first matching item
+      bool foundMatchingItem = false;
+      for (int pi = 0; pi < pluginListView.Items.Count; pi++) {
+        if (pluginListView.Items[pi].Text == wordUnderMouse) {
+          foundMatchingItem = true;
+          break;
+        }
+      }
+      // set to hand if a match is found
+      Cursor = foundMatchingItem ? Cursors.Hand : Cursors.Arrow;
+    }
+    private void textBox_MouseLeave(object sender, EventArgs e) {
+      // make sure the cursor is set to default when the control is left
+      Cursor = Cursors.Default;
+    }
+
+    private string GetWordAtMousePos(Point pos) {
+      int i = textBox.GetCharIndexFromPosition(pos);
+      if (i < 0 || i > textBox.TextLength) return string.Empty;
+      var text = textBox.Text;
+      // extract clicked string (left and right are whitespace
+      int startPos = i; while (startPos >= 0 && !char.IsWhiteSpace(text[startPos])) startPos--;
+      int endPos = i; while (endPos < textBox.TextLength && !char.IsWhiteSpace(text[endPos])) endPos++;
+      if (startPos == endPos) return string.Empty;
+      return text.Substring(startPos + 1, endPos - startPos - 1);
+    }
+
   }
 }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Interfaces/IPluginDescription.cs

@@ -60 +60 @@
     /// </summary>
     string LicenseText { get; }
+    /// <summary>
+    /// Gets or sets the plugin state.
+    /// </summary>
+    PluginState PluginState { get; }
+    /// <summary>
+    /// Gets the error message why this plugin has been disabled.
+    /// </summary>
+    string LoadingErrorInformation { get; }
   }
 }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/PluginValidator.cs

@@ -183 +183 @@
           RegisterLoadedAssembly(asm);
           assemblies.Add(asm);
-        }
-        catch (BadImageFormatException) { } // just ignore the case that the .dll file is not a CLR assembly (e.g. a native dll)
-        catch (FileLoadException) { }
-        catch (SecurityException) { }
-        catch (ReflectionTypeLoadException) { } // referenced assemblies are missing
+        } catch (BadImageFormatException) { } // just ignore the case that the .dll file is not a CLR assembly (e.g. a native dll)
+        catch (FileLoadException) { } catch (SecurityException) { } catch (ReflectionTypeLoadException) { } // referenced assemblies are missing
       }
       return assemblies;
@@ -216 +213 @@
             desc.Disable(errorStrBuiler.ToString());
           }
-        }
-        catch (BadImageFormatException ex) {
+        } catch (BadImageFormatException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "BadImageFormatException: " + ex.Message);
-        }
-        catch (FileNotFoundException ex) {
+        } catch (FileNotFoundException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "FileNotFoundException: " + ex.Message);
-        }
-        catch (FileLoadException ex) {
+        } catch (FileLoadException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "FileLoadException: " + ex.Message);
-        }
-        catch (ArgumentException ex) {
+        } catch (ArgumentException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "ArgumentException: " + ex.Message);
-        }
-        catch (SecurityException ex) {
+        } catch (SecurityException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "SecurityException: " + ex.Message);
@@ -258 +250 @@
           pluginDescriptions.AddRange(assemblyPluginDescriptions);
         }
-        // ignore exceptions. Just don't yield a plugin description when an exception is thrown
+          // ignore exceptions. Just don't yield a plugin description when an exception is thrown
         catch (FileNotFoundException) {
-        }
-        catch (FileLoadException) {
-        }
-        catch (InvalidPluginException) {
-        }
-        catch (TypeLoadException) {
-        }
-        catch (MissingMemberException) {
+        } catch (FileLoadException) {
+        } catch (InvalidPluginException) {
+        } catch (TypeLoadException) {
+        } catch (MissingMemberException) {
         }
       }
@@ -339 +327 @@
           try {
             version = new Version((string)dependencyAttr.ConstructorArguments[1].Value); // might throw FormatException
-          }
-          catch (FormatException ex) {
+          } catch (FormatException ex) {
             throw new InvalidPluginException("Invalid version format of dependency " + name + " in plugin " + pluginType.ToString(), ex);
           }
@@ -519 +506 @@
               Assembly.Load(assemblyName);
               assemblyNames.Add(assemblyName);
-            }
-            catch (BadImageFormatException) {
+            } catch (BadImageFormatException) {
               desc.Disable(Path.GetFileName(assemblyLocation) + " is not a valid assembly.");
-            }
-            catch (FileLoadException) {
+            } catch (FileLoadException) {
               desc.Disable("Can't load file " + Path.GetFileName(assemblyLocation));
-            }
-            catch (FileNotFoundException) {
+            } catch (FileNotFoundException) {
               desc.Disable("File " + Path.GetFileName(assemblyLocation) + " is missing.");
-            }
-            catch (SecurityException) {
+            } catch (SecurityException) {
               desc.Disable("File " + Path.GetFileName(assemblyLocation) + " can't be loaded because of security constraints.");
-            }
-            catch (NotSupportedException ex) {
+            } catch (NotSupportedException ex) {
               // disable the plugin
               desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "NotSupportedException: " + ex.Message);