Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerControl.Designer.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerControl.Designer.cs	(revision 13335)
+++ 	(revision )
@@ -1,52 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class InstallationManagerControl {
-    /// <summary> 
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Component Designer generated code
-
-    /// <summary> 
-    /// Required method for Designer support - do not modify 
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-    }
-
-    #endregion
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerControl.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerControl.cs	(revision 13335)
+++ 	(revision )
@@ -1,31 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-using System.Windows.Forms;
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class InstallationManagerControl : UserControl {
-
-    public InstallationManagerControl()
-      : base() {
-      InitializeComponent();
-    }
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.Designer.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.Designer.cs	(revision 13335)
+++ 	(revision )
@@ -1,180 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class InstallationManagerForm {
-    /// <summary>
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary>
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Windows Form Designer generated code
-
-    /// <summary>
-    /// Required method for Designer support - do not modify
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
-      this.statusStrip = new System.Windows.Forms.StatusStrip();
-      this.toolStripProgressBar = new System.Windows.Forms.ToolStripProgressBar();
-      this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
-      this.tabControl = new System.Windows.Forms.TabControl();
-      this.localPluginsTabPage = new System.Windows.Forms.TabPage();
-      this.localPluginsView = new HeuristicLab.PluginInfrastructure.Advanced.InstalledPluginsView();
-      this.logTabPage = new System.Windows.Forms.TabPage();
-      this.logTextBox = new System.Windows.Forms.TextBox();
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.statusStrip.SuspendLayout();
-      this.tabControl.SuspendLayout();
-      this.localPluginsTabPage.SuspendLayout();
-      this.logTabPage.SuspendLayout();
-      this.SuspendLayout();
-      // 
-      // statusStrip
-      // 
-      this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripProgressBar,
-            this.toolStripStatusLabel});
-      this.statusStrip.Location = new System.Drawing.Point(0, 422);
-      this.statusStrip.Name = "statusStrip";
-      this.statusStrip.Size = new System.Drawing.Size(622, 22);
-      this.statusStrip.TabIndex = 0;
-      // 
-      // toolStripProgressBar
-      // 
-      this.toolStripProgressBar.MarqueeAnimationSpeed = 30;
-      this.toolStripProgressBar.Name = "toolStripProgressBar";
-      this.toolStripProgressBar.Size = new System.Drawing.Size(100, 16);
-      this.toolStripProgressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
-      this.toolStripProgressBar.Visible = false;
-      // 
-      // toolStripStatusLabel
-      // 
-      this.toolStripStatusLabel.Name = "toolStripStatusLabel";
-      this.toolStripStatusLabel.Size = new System.Drawing.Size(0, 17);
-      // 
-      // tabControl
-      // 
-      this.tabControl.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.tabControl.Controls.Add(this.localPluginsTabPage);
-      this.tabControl.Controls.Add(this.logTabPage);
-      this.tabControl.Location = new System.Drawing.Point(12, 27);
-      this.tabControl.Name = "tabControl";
-      this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(598, 392);
-      this.tabControl.TabIndex = 16;
-      this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
-      // 
-      // localPluginsTabPage
-      // 
-      this.localPluginsTabPage.Controls.Add(this.localPluginsView);
-      this.localPluginsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.localPluginsTabPage.Name = "localPluginsTabPage";
-      this.localPluginsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.localPluginsTabPage.Size = new System.Drawing.Size(590, 366);
-      this.localPluginsTabPage.TabIndex = 0;
-      this.localPluginsTabPage.Text = "Installed Plugins";
-      this.toolTip.SetToolTip(this.localPluginsTabPage, "Delete or update installed plugins");
-      this.localPluginsTabPage.UseVisualStyleBackColor = true;
-      // 
-      // localPluginsView
-      // 
-      this.localPluginsView.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.localPluginsView.InstallationManager = null;
-      this.localPluginsView.Location = new System.Drawing.Point(6, 6);
-      this.localPluginsView.Name = "localPluginsView";
-      this.localPluginsView.PluginManager = null;
-      this.localPluginsView.Size = new System.Drawing.Size(578, 354);
-      this.localPluginsView.TabIndex = 0;
-      // 
-      // logTabPage
-      // 
-      this.logTabPage.Controls.Add(this.logTextBox);
-      this.logTabPage.Location = new System.Drawing.Point(4, 22);
-      this.logTabPage.Name = "logTabPage";
-      this.logTabPage.Size = new System.Drawing.Size(590, 366);
-      this.logTabPage.TabIndex = 2;
-      this.logTabPage.Text = "Log";
-      this.toolTip.SetToolTip(this.logTabPage, "Show Log Messages");
-      this.logTabPage.UseVisualStyleBackColor = true;
-      // 
-      // logTextBox
-      // 
-      this.logTextBox.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.logTextBox.Location = new System.Drawing.Point(3, 3);
-      this.logTextBox.Multiline = true;
-      this.logTextBox.Name = "logTextBox";
-      this.logTextBox.ReadOnly = true;
-      this.logTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.logTextBox.Size = new System.Drawing.Size(584, 360);
-      this.logTextBox.TabIndex = 0;
-      // 
-      // InstallationManagerForm
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.ClientSize = new System.Drawing.Size(622, 444);
-      this.Controls.Add(this.tabControl);
-      this.Controls.Add(this.statusStrip);
-      this.Icon = global::HeuristicLab.PluginInfrastructure.Resources.HeuristicLab;
-      this.Name = "InstallationManagerForm";
-      this.Text = "Plugin Manager";
-      this.statusStrip.ResumeLayout(false);
-      this.statusStrip.PerformLayout();
-      this.tabControl.ResumeLayout(false);
-      this.localPluginsTabPage.ResumeLayout(false);
-      this.logTabPage.ResumeLayout(false);
-      this.logTabPage.PerformLayout();
-      this.ResumeLayout(false);
-      this.PerformLayout();
-
-    }
-
-    #endregion
-
-    private System.Windows.Forms.StatusStrip statusStrip;
-    private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar;
-    private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel;
-    private System.Windows.Forms.TabControl tabControl;
-    private System.Windows.Forms.TabPage localPluginsTabPage;
-    private System.Windows.Forms.TabPage logTabPage;
-    private System.Windows.Forms.TextBox logTextBox;
-    private InstalledPluginsView localPluginsView;
-    private System.Windows.Forms.ToolTip toolTip;
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstallationManagerForm.cs	(revision 13335)
+++ 	(revision )
@@ -1,46 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-using System;
-using System.Windows.Forms;
-using HeuristicLab.PluginInfrastructure.Manager;
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class InstallationManagerForm : Form {
-    private string pluginDir;
-
-    public InstallationManagerForm(PluginManager pluginManager)
-      : base() {
-      InitializeComponent();
-      Text = "HeuristicLab Plugin Manager " + AssemblyHelpers.GetFileVersion(GetType().Assembly);
-
-      pluginDir = Application.StartupPath;
-
-      localPluginsView.PluginManager = pluginManager;
-      // localPluginsView.InstallationManager = installationManager;
-    }
-
-    #region button events
-    private void tabControl_SelectedIndexChanged(object sender, EventArgs e) {
-      toolStripStatusLabel.Text = string.Empty;
-    }
-    #endregion
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.Designer.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.Designer.cs	(revision 13335)
+++ 	(revision )
@@ -1,128 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class InstalledPluginsView {
-    /// <summary> 
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Component Designer generated code
-
-    /// <summary> 
-    /// Required method for Designer support - do not modify 
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
-      System.Windows.Forms.ListViewGroup listViewGroup3 = new System.Windows.Forms.ListViewGroup("Active Plugins", System.Windows.Forms.HorizontalAlignment.Left);
-      System.Windows.Forms.ListViewGroup listViewGroup4 = new System.Windows.Forms.ListViewGroup("Disabled Plugins", System.Windows.Forms.HorizontalAlignment.Left);
-      this.localPluginsListView = new HeuristicLab.PluginInfrastructure.Advanced.MultiSelectListView();
-      this.nameHeader = new System.Windows.Forms.ColumnHeader();
-      this.versionHeader = new System.Windows.Forms.ColumnHeader();
-      this.descriptionHeader = new System.Windows.Forms.ColumnHeader();
-      this.pluginImageList = new System.Windows.Forms.ImageList(this.components);
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.SuspendLayout();
-      // 
-      // localPluginsListView
-      // 
-      this.localPluginsListView.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.localPluginsListView.CheckBoxes = true;
-      this.localPluginsListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.nameHeader,
-            this.versionHeader,
-            this.descriptionHeader});
-      listViewGroup3.Header = "Active Plugins";
-      listViewGroup3.Name = "activePluginsGroup";
-      listViewGroup4.Header = "Disabled Plugins";
-      listViewGroup4.Name = "disabledPluginsGroup";
-      this.localPluginsListView.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
-            listViewGroup3,
-            listViewGroup4});
-      this.localPluginsListView.Location = new System.Drawing.Point(0, 0);
-      this.localPluginsListView.Name = "localPluginsListView";
-      this.localPluginsListView.Size = new System.Drawing.Size(539, 477);
-      this.localPluginsListView.SmallImageList = this.pluginImageList;
-      this.localPluginsListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
-      this.localPluginsListView.SuppressItemCheckedEvents = false;
-      this.localPluginsListView.TabIndex = 13;
-      this.localPluginsListView.UseCompatibleStateImageBehavior = false;
-      this.localPluginsListView.View = System.Windows.Forms.View.Details;
-      this.localPluginsListView.ItemActivate += new System.EventHandler(this.localPluginsListView_ItemActivate);
-      // 
-      // nameHeader
-      // 
-      this.nameHeader.Text = "Name";
-      this.nameHeader.Width = 199;
-      // 
-      // versionHeader
-      // 
-      this.versionHeader.Text = "Version";
-      this.versionHeader.Width = 84;
-      // 
-      // descriptionHeader
-      // 
-      this.descriptionHeader.Text = "Description";
-      this.descriptionHeader.Width = 245;
-      // 
-      // 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;
-      // 
-      // LocalPluginsView
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.Controls.Add(this.localPluginsListView);
-      this.Name = "LocalPluginsView";
-      this.Size = new System.Drawing.Size(539, 508);
-      this.ResumeLayout(false);
-
-    }
-
-    #endregion
-
-    private MultiSelectListView localPluginsListView;
-    private System.Windows.Forms.ColumnHeader nameHeader;
-    private System.Windows.Forms.ColumnHeader versionHeader;
-    private System.Windows.Forms.ColumnHeader descriptionHeader;
-    private System.Windows.Forms.ToolTip toolTip;
-    private System.Windows.Forms.ImageList pluginImageList;
-    // private LocalPluginManagerView localPluginManagerView;
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/InstalledPluginsView.cs	(revision 13335)
+++ 	(revision )
@@ -1,110 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows.Forms;
-using HeuristicLab.PluginInfrastructure.Manager;
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class InstalledPluginsView : InstallationManagerControl {
-    private const string CheckingPluginsMessage = "Checking for updated plugins...";
-    private const string NoUpdatesAvailableMessage = "No updates available.";
-
-    private ListViewGroup enabledPluginsGroup;
-    private ListViewGroup disabledPluginsGroup;
-
-    private PluginManager pluginManager;
-    public PluginManager PluginManager {
-      get { return pluginManager; }
-      set {
-        pluginManager = value;
-        UpdateControl();
-      }
-    }
-
-    // private InstallationManager installationManager;
-    // public InstallationManager InstallationManager {
-    //   get { return installationManager; }
-    //   set { installationManager = value; }
-    // }
-
-    public InstalledPluginsView()
-      : base() {
-      InitializeComponent();
-      enabledPluginsGroup = localPluginsListView.Groups["activePluginsGroup"];
-      disabledPluginsGroup = localPluginsListView.Groups["disabledPluginsGroup"];
-      pluginImageList.Images.Add(HeuristicLab.PluginInfrastructure.Resources.Plugin);
-      UpdateControl();
-    }
-
-
-    #region event handlers for update plugins backgroundworker
-    // compares for two plugins with same major and minor version if plugin1 is newer than plugin2
-    private static bool IsNewerThan(IPluginDescription plugin1, IPluginDescription plugin2) {
-      // newer: build version is higher, or if build version is the same revision is higher
-      return plugin1.Version.Build > plugin2.Version.Build ||
-        (plugin1.Version.Build == plugin2.Version.Build && plugin1.Version.Revision > plugin2.Version.Revision);
-    }
-    #endregion
-
-    private void UpdateControl() {
-      ClearPluginList();
-      if (pluginManager != null) {
-        localPluginsListView.SuppressItemCheckedEvents = true;
-        foreach (var plugin in pluginManager.Plugins) {
-          var item = CreateListViewItem(plugin);
-          if (plugin.PluginState == PluginState.Enabled) {
-            item.Group = enabledPluginsGroup;
-          } else if (plugin.PluginState == PluginState.Disabled) {
-            item.Group = disabledPluginsGroup;
-          }
-          localPluginsListView.Items.Add(item);
-        }
-        localPluginsListView.SuppressItemCheckedEvents = false;
-      }
-      Util.ResizeColumns(localPluginsListView.Columns.OfType<ColumnHeader>());
-    }
-
-    private void ClearPluginList() {
-      List<ListViewItem> itemsToRemove = new List<ListViewItem>(localPluginsListView.Items.OfType<ListViewItem>());
-      itemsToRemove.ForEach(item => localPluginsListView.Items.Remove(item));
-    }
-
-    private static ListViewItem CreateListViewItem(PluginDescription plugin) {
-      ListViewItem item = new ListViewItem(new string[] { plugin.Name, plugin.Version.ToString(), plugin.Description });
-      item.Tag = plugin;
-      item.ImageIndex = 0;
-      return item;
-    }
-
-
-    private void localPluginsListView_ItemActivate(object sender, EventArgs e) {
-      if (localPluginsListView.SelectedItems.Count > 0) {
-        var plugin = (PluginDescription)localPluginsListView.SelectedItems[0].Tag;
-        PluginView pluginView = new PluginView(plugin);
-        pluginView.Show(this);
-      }
-    }
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseView.Designer.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseView.Designer.cs	(revision 13335)
+++ 	(revision )
@@ -1,81 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class LicenseView {
-    /// <summary> 
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Component Designer generated code
-
-    /// <summary> 
-    /// Required method for Designer support - do not modify 
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LicenseView));
-      this.richTextBox = new System.Windows.Forms.RichTextBox();
-      this.SuspendLayout();
-      // 
-      // richTextBox
-      // 
-      this.richTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.richTextBox.Location = new System.Drawing.Point(0, 0);
-      this.richTextBox.Name = "richTextBox";
-      this.richTextBox.ReadOnly = true;
-      this.richTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
-      this.richTextBox.Size = new System.Drawing.Size(410, 445);
-      this.richTextBox.TabIndex = 1;
-      this.richTextBox.Text = "";
-      // 
-      // LicenseView
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.ClientSize = new System.Drawing.Size(410, 445);
-      this.Controls.Add(this.richTextBox);
-      this.Icon = HeuristicLab.PluginInfrastructure.Resources.HeuristicLab;
-      this.Name = "LicenseView";
-      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-      this.Text = "License Agreement";
-      this.ResumeLayout(false);
-
-    }
-
-    #endregion
-
-    private System.Windows.Forms.RichTextBox richTextBox;
-
-
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseView.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/LicenseView.cs	(revision 13335)
+++ 	(revision )
@@ -1,39 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-using System.Windows.Forms;
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class LicenseView : Form {
-
-    public LicenseView()
-      : base() {
-      InitializeComponent();
-      Name = "License";
-    }
-
-    public LicenseView(IPluginDescription plugin)
-      : base() {
-      InitializeComponent();
-      Name = "License of: " + plugin;
-      richTextBox.Text = plugin.LicenseText;
-    }
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/MultiSelectListView.Designer.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/MultiSelectListView.Designer.cs	(revision 13335)
+++ 	(revision )
@@ -1,51 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class MultiSelectListView {
-    /// <summary> 
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Component Designer generated code
-
-    /// <summary> 
-    /// Required method for Designer support - do not modify 
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
-    }
-
-    #endregion
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/MultiSelectListView.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/MultiSelectListView.cs	(revision 13335)
+++ 	(revision )
@@ -1,95 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class MultiSelectListView : ListView {
-    public MultiSelectListView() {
-      InitializeComponent();
-    }
-
-    private bool inhibitAutoCheck;
-    protected override void OnMouseDown(MouseEventArgs e) {
-      inhibitAutoCheck = true;
-      base.OnMouseDown(e);
-    }
-
-    protected override void OnMouseUp(MouseEventArgs e) {
-      base.OnMouseUp(e);
-      inhibitAutoCheck = false;
-    }
-
-    // item check is raised for each selected item that was not directly clicked (those should be ignored)
-    // and then one the item whose checkbox was clicked
-    protected override void OnItemCheck(ItemCheckEventArgs ice) {
-      if (ice == null) throw new ArgumentNullException("ice");
-      // don't change the checked state of items that were not clicked directly
-      if (inhibitAutoCheck) {
-        ice.NewValue = ice.CurrentValue;
-      }
-      // if this item was directly clicked then check if it is selected as well
-      var item = Items[ice.Index];
-      if (!item.Selected) {
-        // when the item was not selected previously 
-        // clear any selection 
-        List<ListViewItem> selectedItems = new List<ListViewItem>(SelectedItems.OfType<ListViewItem>());
-        selectedItems.ForEach(x => x.Selected = false);
-        // select only the clicked item
-        item.Selected = true;
-      }
-      base.OnItemCheck(ice);
-    }
-
-    private bool suppressItemCheckedEvents;
-    public bool SuppressItemCheckedEvents {
-      get {
-        return suppressItemCheckedEvents;
-      }
-      set {
-        suppressItemCheckedEvents = value;
-      }
-    }
-    protected override void OnItemChecked(ItemCheckedEventArgs e) {
-      if (!suppressItemCheckedEvents)
-        base.OnItemChecked(e);
-    }
-
-    public void CheckItems(IEnumerable<ListViewItem> items) {
-      suppressItemCheckedEvents = true;
-
-      foreach (var item in items)
-        item.Checked = true;
-      suppressItemCheckedEvents = false;
-    }
-
-    public void UncheckItems(IEnumerable<ListViewItem> items) {
-      suppressItemCheckedEvents = true;
-
-      foreach (var item in items)
-        item.Checked = false;
-      suppressItemCheckedEvents = false;
-    }
-
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginView.Designer.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginView.Designer.cs	(revision 13335)
+++ 	(revision )
@@ -1,356 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  partial class PluginView {
-    /// <summary> 
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary> 
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing) {
-      if (disposing && (components != null)) {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Component Designer generated code
-
-    /// <summary> 
-    /// Required method for Designer support - do not modify 
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
-      this.nameLabel = new System.Windows.Forms.Label();
-      this.nameTextBox = new System.Windows.Forms.TextBox();
-      this.versionTextBox = new System.Windows.Forms.TextBox();
-      this.versionLabel = new System.Windows.Forms.Label();
-      this.contactTextBox = new System.Windows.Forms.TextBox();
-      this.contactInfoLabel = new System.Windows.Forms.Label();
-      this.dependenciesGroupBox = new System.Windows.Forms.GroupBox();
-      this.dependenciesListView = new System.Windows.Forms.ListView();
-      this.pluginNameHeader = new System.Windows.Forms.ColumnHeader();
-      this.pluginVersionHeader = new System.Windows.Forms.ColumnHeader();
-      this.pluginDescriptionHeader = new System.Windows.Forms.ColumnHeader();
-      this.pluginsImageList = new System.Windows.Forms.ImageList(this.components);
-      this.filesListView = new System.Windows.Forms.ListView();
-      this.fileNameHeader = new System.Windows.Forms.ColumnHeader();
-      this.fileTypeHeader = new System.Windows.Forms.ColumnHeader();
-      this.filesImageList = new System.Windows.Forms.ImageList(this.components);
-      this.filesGroupBox = new System.Windows.Forms.GroupBox();
-      this.stateTextBox = new System.Windows.Forms.TextBox();
-      this.stateLabel = new System.Windows.Forms.Label();
-      this.errorLabel = new System.Windows.Forms.Label();
-      this.descriptionLabel = new System.Windows.Forms.Label();
-      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();
-      this.SuspendLayout();
-      // 
-      // nameLabel
-      // 
-      this.nameLabel.AutoSize = true;
-      this.nameLabel.Location = new System.Drawing.Point(9, 15);
-      this.nameLabel.Name = "nameLabel";
-      this.nameLabel.Size = new System.Drawing.Size(38, 13);
-      this.nameLabel.TabIndex = 0;
-      this.nameLabel.Text = "Name:";
-      // 
-      // nameTextBox
-      // 
-      this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.nameTextBox.Location = new System.Drawing.Point(78, 12);
-      this.nameTextBox.Name = "nameTextBox";
-      this.nameTextBox.ReadOnly = true;
-      this.nameTextBox.Size = new System.Drawing.Size(594, 20);
-      this.nameTextBox.TabIndex = 1;
-      // 
-      // versionTextBox
-      // 
-      this.versionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.versionTextBox.Location = new System.Drawing.Point(78, 38);
-      this.versionTextBox.Name = "versionTextBox";
-      this.versionTextBox.ReadOnly = true;
-      this.versionTextBox.Size = new System.Drawing.Size(594, 20);
-      this.versionTextBox.TabIndex = 3;
-      // 
-      // versionLabel
-      // 
-      this.versionLabel.AutoSize = true;
-      this.versionLabel.Location = new System.Drawing.Point(9, 41);
-      this.versionLabel.Name = "versionLabel";
-      this.versionLabel.Size = new System.Drawing.Size(45, 13);
-      this.versionLabel.TabIndex = 2;
-      this.versionLabel.Text = "Version:";
-      // 
-      // contactTextBox
-      // 
-      this.contactTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.contactTextBox.Location = new System.Drawing.Point(78, 64);
-      this.contactTextBox.Name = "contactTextBox";
-      this.contactTextBox.ReadOnly = true;
-      this.contactTextBox.Size = new System.Drawing.Size(594, 20);
-      this.contactTextBox.TabIndex = 5;
-      // 
-      // contactInfoLabel
-      // 
-      this.contactInfoLabel.AutoSize = true;
-      this.contactInfoLabel.Location = new System.Drawing.Point(9, 67);
-      this.contactInfoLabel.Name = "contactInfoLabel";
-      this.contactInfoLabel.Size = new System.Drawing.Size(47, 13);
-      this.contactInfoLabel.TabIndex = 4;
-      this.contactInfoLabel.Text = "Contact:";
-      // 
-      // dependenciesGroupBox
-      // 
-      this.dependenciesGroupBox.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.dependenciesGroupBox.Controls.Add(this.dependenciesListView);
-      this.dependenciesGroupBox.Location = new System.Drawing.Point(12, 324);
-      this.dependenciesGroupBox.Name = "dependenciesGroupBox";
-      this.dependenciesGroupBox.Size = new System.Drawing.Size(663, 198);
-      this.dependenciesGroupBox.TabIndex = 1;
-      this.dependenciesGroupBox.TabStop = false;
-      this.dependenciesGroupBox.Text = "Dependencies";
-      // 
-      // dependenciesListView
-      // 
-      this.dependenciesListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.pluginNameHeader,
-            this.pluginVersionHeader,
-            this.pluginDescriptionHeader});
-      this.dependenciesListView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.dependenciesListView.Location = new System.Drawing.Point(3, 16);
-      this.dependenciesListView.Name = "dependenciesListView";
-      this.dependenciesListView.Size = new System.Drawing.Size(657, 179);
-      this.dependenciesListView.SmallImageList = this.pluginsImageList;
-      this.dependenciesListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
-      this.dependenciesListView.TabIndex = 0;
-      this.dependenciesListView.UseCompatibleStateImageBehavior = false;
-      this.dependenciesListView.View = System.Windows.Forms.View.Details;
-      this.dependenciesListView.ItemActivate += new System.EventHandler(this.dependenciesListView_ItemActivate);
-      // 
-      // pluginNameHeader
-      // 
-      this.pluginNameHeader.Text = "Name";
-      this.pluginNameHeader.Width = 200;
-      // 
-      // pluginVersionHeader
-      // 
-      this.pluginVersionHeader.Text = "Version";
-      this.pluginVersionHeader.Width = 120;
-      // 
-      // pluginDescriptionHeader
-      // 
-      this.pluginDescriptionHeader.Text = "Description";
-      this.pluginDescriptionHeader.Width = 325;
-      // 
-      // pluginsImageList
-      // 
-      this.pluginsImageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
-      this.pluginsImageList.ImageSize = new System.Drawing.Size(16, 16);
-      this.pluginsImageList.TransparentColor = System.Drawing.Color.Transparent;
-      // 
-      // filesListView
-      // 
-      this.filesListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.fileNameHeader,
-            this.fileTypeHeader});
-      this.filesListView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.filesListView.Location = new System.Drawing.Point(3, 16);
-      this.filesListView.Name = "filesListView";
-      this.filesListView.Size = new System.Drawing.Size(657, 131);
-      this.filesListView.SmallImageList = this.filesImageList;
-      this.filesListView.TabIndex = 0;
-      this.filesListView.UseCompatibleStateImageBehavior = false;
-      this.filesListView.View = System.Windows.Forms.View.Details;
-      // 
-      // fileNameHeader
-      // 
-      this.fileNameHeader.Text = "Name";
-      this.fileNameHeader.Width = 200;
-      // 
-      // fileTypeHeader
-      // 
-      this.fileTypeHeader.Text = "Type";
-      this.fileTypeHeader.Width = 120;
-      // 
-      // filesImageList
-      // 
-      this.filesImageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
-      this.filesImageList.ImageSize = new System.Drawing.Size(16, 16);
-      this.filesImageList.TransparentColor = System.Drawing.Color.Transparent;
-      // 
-      // filesGroupBox
-      // 
-      this.filesGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.filesGroupBox.Controls.Add(this.filesListView);
-      this.filesGroupBox.Location = new System.Drawing.Point(12, 168);
-      this.filesGroupBox.Name = "filesGroupBox";
-      this.filesGroupBox.Size = new System.Drawing.Size(663, 150);
-      this.filesGroupBox.TabIndex = 11;
-      this.filesGroupBox.TabStop = false;
-      this.filesGroupBox.Text = "Files";
-      // 
-      // stateTextBox
-      // 
-      this.stateTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.stateTextBox.Location = new System.Drawing.Point(78, 116);
-      this.stateTextBox.Name = "stateTextBox";
-      this.stateTextBox.ReadOnly = true;
-      this.stateTextBox.Size = new System.Drawing.Size(594, 20);
-      this.stateTextBox.TabIndex = 13;
-      // 
-      // stateLabel
-      // 
-      this.stateLabel.AutoSize = true;
-      this.stateLabel.Location = new System.Drawing.Point(9, 119);
-      this.stateLabel.Name = "stateLabel";
-      this.stateLabel.Size = new System.Drawing.Size(35, 13);
-      this.stateLabel.TabIndex = 12;
-      this.stateLabel.Text = "State:";
-      // 
-      // errorLabel
-      // 
-      this.errorLabel.AutoSize = true;
-      this.errorLabel.Location = new System.Drawing.Point(9, 145);
-      this.errorLabel.Name = "errorLabel";
-      this.errorLabel.Size = new System.Drawing.Size(32, 13);
-      this.errorLabel.TabIndex = 15;
-      this.errorLabel.Text = "Error:";
-      // 
-      // descriptionLabel
-      // 
-      this.descriptionLabel.AutoSize = true;
-      this.descriptionLabel.Location = new System.Drawing.Point(9, 93);
-      this.descriptionLabel.Name = "descriptionLabel";
-      this.descriptionLabel.Size = new System.Drawing.Size(63, 13);
-      this.descriptionLabel.TabIndex = 17;
-      this.descriptionLabel.Text = "Description:";
-      // 
-      // descriptionTextBox
-      // 
-      this.descriptionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.descriptionTextBox.Location = new System.Drawing.Point(78, 90);
-      this.descriptionTextBox.Multiline = true;
-      this.descriptionTextBox.Name = "descriptionTextBox";
-      this.descriptionTextBox.ReadOnly = true;
-      this.descriptionTextBox.Size = new System.Drawing.Size(594, 20);
-      this.descriptionTextBox.TabIndex = 20;
-      // 
-      // errorTextBox
-      // 
-      this.errorTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.errorTextBox.Location = new System.Drawing.Point(78, 142);
-      this.errorTextBox.Multiline = true;
-      this.errorTextBox.Name = "errorTextBox";
-      this.errorTextBox.ReadOnly = true;
-      this.errorTextBox.Size = new System.Drawing.Size(594, 20);
-      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
-      // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.ClientSize = new System.Drawing.Size(687, 565);
-      this.Controls.Add(this.showLicenseButton);
-      this.Controls.Add(this.errorTextBox);
-      this.Controls.Add(this.descriptionTextBox);
-      this.Controls.Add(this.errorLabel);
-      this.Controls.Add(this.descriptionLabel);
-      this.Controls.Add(this.stateTextBox);
-      this.Controls.Add(this.stateLabel);
-      this.Controls.Add(this.dependenciesGroupBox);
-      this.Controls.Add(this.filesGroupBox);
-      this.Controls.Add(this.contactTextBox);
-      this.Controls.Add(this.contactInfoLabel);
-      this.Controls.Add(this.versionTextBox);
-      this.Controls.Add(this.versionLabel);
-      this.Controls.Add(this.nameTextBox);
-      this.Controls.Add(this.nameLabel);
-      this.Icon = global::HeuristicLab.PluginInfrastructure.Resources.HeuristicLab;
-      this.Name = "PluginView";
-      this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-      this.dependenciesGroupBox.ResumeLayout(false);
-      this.filesGroupBox.ResumeLayout(false);
-      this.ResumeLayout(false);
-      this.PerformLayout();
-
-    }
-
-    #endregion
-
-    protected System.Windows.Forms.Label nameLabel;
-    protected System.Windows.Forms.TextBox nameTextBox;
-    protected System.Windows.Forms.TextBox versionTextBox;
-    protected System.Windows.Forms.Label versionLabel;
-    protected System.Windows.Forms.TextBox contactTextBox;
-    protected System.Windows.Forms.Label contactInfoLabel;
-    protected System.Windows.Forms.GroupBox dependenciesGroupBox;
-    private System.Windows.Forms.ColumnHeader pluginNameHeader;
-    private System.Windows.Forms.ColumnHeader pluginVersionHeader;
-    protected System.Windows.Forms.ListView dependenciesListView;
-    private System.Windows.Forms.ListView filesListView;
-    private System.Windows.Forms.GroupBox filesGroupBox;
-    private System.Windows.Forms.ImageList pluginsImageList;
-    private System.Windows.Forms.ColumnHeader fileNameHeader;
-    private System.Windows.Forms.ColumnHeader fileTypeHeader;
-    protected System.Windows.Forms.TextBox stateTextBox;
-    protected System.Windows.Forms.Label stateLabel;
-    protected System.Windows.Forms.Label errorLabel;
-    protected System.Windows.Forms.Label descriptionLabel;
-    protected System.Windows.Forms.TextBox descriptionTextBox;
-    protected System.Windows.Forms.TextBox errorTextBox;
-    private System.Windows.Forms.ImageList filesImageList;
-    private System.Windows.Forms.ColumnHeader pluginDescriptionHeader;
-    private System.Windows.Forms.ToolTip toolTip;
-    private System.Windows.Forms.Button showLicenseButton;
-
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginView.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/PluginView.cs	(revision 13335)
+++ 	(revision )
@@ -1,122 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-using System;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using HeuristicLab.PluginInfrastructure.Manager;
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal partial class PluginView : Form {
-    private const string IMAGE_KEY_PLUGIN = "Plugin";
-    private const string IMAGE_KEY_ASSEMBLY = "Assembly";
-    private const string IMAGE_KEY_FILE = "File";
-    private const string IMAGE_KEY_DOCUMENT = "Document";
-
-    private IPluginDescription plugin;
-
-    public PluginView()
-      : base() {
-      InitializeComponent();
-      PopulateImageList();
-    }
-
-    public PluginView(IPluginDescription plugin)
-      : base() {
-      InitializeComponent();
-      PopulateImageList();
-
-      this.plugin = plugin;
-      this.Text = "Plugin Details: " + plugin.ToString();
-      UpdateControls();
-    }
-
-    private void PopulateImageList() {
-      pluginsImageList.Images.Add(IMAGE_KEY_PLUGIN, HeuristicLab.PluginInfrastructure.Resources.Plugin);
-      filesImageList.Images.Add(IMAGE_KEY_ASSEMBLY, HeuristicLab.PluginInfrastructure.Resources.Assembly);
-      filesImageList.Images.Add(IMAGE_KEY_FILE, HeuristicLab.PluginInfrastructure.Resources.File);
-      filesImageList.Images.Add(IMAGE_KEY_DOCUMENT, HeuristicLab.PluginInfrastructure.Resources.Document);
-    }
-
-    public void UpdateControls() {
-      string appDir = Path.GetDirectoryName(Application.ExecutablePath);
-      nameTextBox.Text = plugin.Name;
-      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();
-        if (!string.IsNullOrEmpty(localPlugin.LoadingErrorInformation))
-          errorTextBox.Text = localPlugin.LoadingErrorInformation.Replace(Environment.NewLine, " ");
-        toolTip.SetToolTip(stateTextBox, stateTextBox.Text + Environment.NewLine + errorTextBox.Text);
-        toolTip.SetToolTip(errorTextBox, errorTextBox.Text);
-      }
-      foreach (PluginDescription dependency in plugin.Dependencies) {
-        var depItem = new ListViewItem(new string[] { dependency.Name, dependency.Version.ToString(), dependency.Description });
-        depItem.Tag = dependency;
-        depItem.ImageKey = IMAGE_KEY_PLUGIN;
-        dependenciesListView.Items.Add(depItem);
-      }
-      foreach (var file in plugin.Files) {
-        string displayedFileName = file.Name.Replace(appDir, string.Empty);
-        displayedFileName = displayedFileName.TrimStart(Path.DirectorySeparatorChar);
-        var fileItem = new ListViewItem(new string[] { displayedFileName, file.Type.ToString() });
-        if (file.Type == PluginFileType.Assembly) {
-          fileItem.ImageKey = IMAGE_KEY_ASSEMBLY;
-        } else if (file.Type == PluginFileType.License) {
-          fileItem.ImageKey = IMAGE_KEY_DOCUMENT;
-        } else fileItem.ImageKey = IMAGE_KEY_FILE;
-        filesListView.Items.Add(fileItem);
-      }
-      Util.ResizeColumns(dependenciesListView.Columns.OfType<ColumnHeader>());
-      Util.ResizeColumns(filesListView.Columns.OfType<ColumnHeader>());
-
-      showLicenseButton.Enabled = !string.IsNullOrEmpty(plugin.LicenseText);
-    }
-
-    private string CombineStrings(string a, string b) {
-      if (string.IsNullOrEmpty(a))
-        // a is empty
-        if (!string.IsNullOrEmpty(b)) return CombineStrings(b, string.Empty);
-        else return string.Empty;
-      // a is not empty
-      else if (string.IsNullOrEmpty(b)) return a;
-      // and b are not empty
-      else return a + ", " + b;
-    }
-
-    private void dependenciesListView_ItemActivate(object sender, EventArgs e) {
-      if (dependenciesListView.SelectedItems.Count > 0) {
-        var dep = (PluginDescription)dependenciesListView.SelectedItems[0].Tag;
-        PluginView view = new PluginView(dep);
-        view.Show(this);
-      }
-    }
-
-    private void showLicenseButton_Click(object sender, EventArgs e) {
-      LicenseView view = new LicenseView(plugin);
-      view.Show(this);
-    }
-  }
-}
Index: branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/Util.cs
===================================================================
--- branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Advanced/Util.cs	(revision 13335)
+++ 	(revision )
@@ -1,42 +1,0 @@
-﻿#region License Information
-/* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- *
- * This file is part of HeuristicLab.
- *
- * HeuristicLab is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * HeuristicLab is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace HeuristicLab.PluginInfrastructure.Advanced {
-  internal static class Util {
-    internal static void ResizeColumn(ColumnHeader columnHeader) {
-      columnHeader.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
-      int headerSize = columnHeader.Width;
-      columnHeader.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
-      int contentSize = columnHeader.Width;
-      columnHeader.Width = Math.Max(headerSize, contentSize);
-    }
-
-    internal static void ResizeColumns(IEnumerable<ColumnHeader> columnHeaders) {
-      foreach (var columnHeader in columnHeaders)
-        ResizeColumn(columnHeader);
-    }
-  }
-}
