Changeset 9363 for branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3

Timestamp:

04/16/13 13:13:41 (11 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (7 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (14 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

@@ -99 +99 @@
   <ItemGroup>
     <Compile Include="ExtensionMethods\TreeNodeExtensions.cs" />
+    <Compile Include="ListViewItemDateComparer.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Views\HiveJobManagerView.cs">
@@ -233 +234 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -239 +240 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame

@@ -23 +23 @@
 
 namespace HeuristicLab.Clients.Hive.JobManager {
-  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -25 +25 @@
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.Views;
-using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -54 +53 @@
       Content.Refreshing += new EventHandler(Content_Refreshing);
       Content.Refreshed += new EventHandler(Content_Refreshed);
-      Content.HiveExperimentsChanged += new EventHandler(Content_HiveExperimentsChanged);
-
     }
 
@@ -61 +58 @@
       Content.Refreshing -= new EventHandler(Content_Refreshing);
       Content.Refreshed -= new EventHandler(Content_Refreshed);
-      Content.HiveExperimentsChanged -= new EventHandler(Content_HiveExperimentsChanged);
       base.DeregisterContentEvents();
     }
@@ -123 +119 @@
 
     protected override void OnClosing(FormClosingEventArgs e) {
-      base.OnClosing(e);
-      if (Content != null && Content.Jobs != null) {
-        foreach (var exp in Content.Jobs.OfType<RefreshableJob>()) {
-          if (exp.RefreshAutomatically) {
-            exp.RefreshAutomatically = false; // stop result polling
-          }
+      if (Content != null && Content.Jobs.Any(x => x.IsProgressing)) {
+        DialogResult result = MessageBox.Show("There are still unfinished down/uploads. Are you sure you want to close the window?", "HeuristicLab Hive Job Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+
+        if (result == DialogResult.No) {
+          e.Cancel = true;
         }
+      } else {
+        base.OnClosing(e);
       }
     }
 
-    private void HiveExperiments_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<RefreshableJob> e) {
-      foreach (var item in e.Items) {
-        HiveClient.Delete(item);
+    protected override void OnClosed(FormClosedEventArgs e) {
+      if (Content != null) {
+        Content.ClearHiveClient();
+        Content = null;
       }
-    }
-
-    private void Content_HiveExperimentsChanged(object sender, EventArgs e) {
-      Content.Jobs.ItemsRemoved += new CollectionItemsChangedEventHandler<RefreshableJob>(HiveExperiments_ItemsRemoved);
+      base.OnClosed(e);
     }
   }

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Hive.JobManager.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 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.Clients.Hive.JobManager.Views {
   partial class HiveJobPermissionListView {
     /// <summary> 

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Hive.JobManager.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 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.Clients.Hive.JobManager.Views {
   partial class HiveJobPermissionView {
     /// <summary> 

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Hive.JobManager.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 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.Clients.Hive.JobManager.Views {
   partial class HiveResourceSelector {
     /// <summary> 

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Hive.JobManager.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 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.Clients.Hive.JobManager.Views {
   partial class HiveResourceSelectorDialog {
     /// <summary>

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Hive.JobManager.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 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.Clients.Hive.JobManager.Views {
   partial class RefreshableHiveJobListView {
     /// <summary> 
@@ -6 +27 @@
     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) {
-        if (components != null) components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
 
     #region Component Designer generated code

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.Hive.JobManager.Views {
@@ -30 +34 @@
   [Content(typeof(ItemCollection<RefreshableJob>), false)]
   public partial class RefreshableHiveJobListView : HeuristicLab.Core.Views.ItemCollectionView<RefreshableJob> {
+    private Progress progress;
+    private ProgressView progressView;
 
     public RefreshableHiveJobListView() {
       InitializeComponent();
       itemsGroupBox.Text = "Jobs";
-      this.itemsListView.View = View.Details;
+      this.itemsListView.View = System.Windows.Forms.View.Details;
       this.itemsListView.Columns.Clear();
       this.itemsListView.Columns.Add(new ColumnHeader("Date") { Text = "Date" });
@@ -43 +49 @@
       this.itemsListView.HeaderStyle = ColumnHeaderStyle.Clickable;
       this.itemsListView.FullRowSelect = true;
+
+      this.itemsListView.ListViewItemSorter = new ListViewItemDateComparer(0, SortOrder.Ascending);
       this.itemsListView.Sorting = SortOrder.Ascending;
       this.itemsListView.Sort();
+
+      progress = new Progress() {
+        CanBeCanceled = false,
+        ProgressState = ProgressState.Finished
+      };
+      progressView = new ProgressView(this, progress);
     }
 
     protected override RefreshableJob CreateItem() {
-      var refreshableJob = new RefreshableJob() { IsAllowedPrivileged = HiveClient.Instance.IsAllowedPrivileged };
+      var refreshableJob = new RefreshableJob();
       refreshableJob.Job.Name = "New Hive Job";
       return refreshableJob;
+    }
+
+    protected override void OnLockedChanged() {
+      base.OnLockedChanged();
+
+      itemsListView.Enabled = !Locked;
+      addButton.Enabled = !Locked;
+      sortAscendingButton.Enabled = !Locked;
+      sortDescendingButton.Enabled = !Locked;
+      removeButton.Enabled = !Locked;
+    }
+
+    protected override void SetEnabledStateOfControls() {
+      // if the view is locked, a job is currently beeing deleted and everything should be disabled
+      if (!Locked)
+        base.SetEnabledStateOfControls();
     }
 
@@ -58 +88 @@
         System.Windows.Forms.ListView.SelectedListViewItemCollection selectedItems = itemsListView.SelectedItems;
         bool inProgress = false;
-        foreach (ListViewItem item in selectedItems) {                                  
+        foreach (ListViewItem item in selectedItems) {
           RefreshableJob job = item.Tag as RefreshableJob;
           if (job != null && job.IsProgressing) {
@@ -70 +100 @@
           return;
         } else {
-          base.removeButton_Click(sender, e);
-        }
-      }
+          DeleteHiveJobs(e);
+        }
+      }
+    }
+
+    private void DeleteHiveJobs(EventArgs e) {
+      if (itemsListView.SelectedItems.Count > 0) {
+        List<RefreshableJob> items = new List<RefreshableJob>();
+        foreach (ListViewItem item in itemsListView.SelectedItems)
+          items.Add((RefreshableJob)item.Tag);
+
+        var task = System.Threading.Tasks.Task.Factory.StartNew(DeleteHiveJobsAsync, items);
+
+        task.ContinueWith((t) => {
+          progress.Finish();
+          ErrorHandling.ShowErrorDialog("An error occured while deleting the job. ", t.Exception);
+        }, TaskContinuationOptions.OnlyOnFaulted);
+
+        task.ContinueWith((t) => {
+          itemsListView.Invoke(new Action(() => itemsListView.SelectedItems.Clear()));
+        }, TaskContinuationOptions.OnlyOnRanToCompletion);
+      }
+    }
+
+    private void DeleteHiveJobsAsync(object items) {
+      progress.Status = "Deleting job...";
+      progress.ProgressState = ProgressState.Started;
+      progress.ProgressValue = 0.0;
+      foreach (RefreshableJob item in (List<RefreshableJob>)items) {
+        Content.Remove(item);
+      }
+      progress.Finish();
     }
 
@@ -126 +185 @@
       ListViewItem listViewItem = base.CreateListViewItem(item);
       listViewItem.SubItems.Clear();
-      listViewItem.SubItems.Insert(0, new ListViewItem.ListViewSubItem(listViewItem, item.Job.DateCreated.ToString("dd.MM.yyyy HH:mm")));
+      listViewItem.SubItems.Insert(0, new ListViewItem.ListViewSubItem(listViewItem, item.Job.DateCreated.ToString()));
       listViewItem.SubItems.Insert(1, new ListViewItem.ListViewSubItem(listViewItem, item.Job.Name));
       listViewItem.Group = GetListViewGroup(item.Job.OwnerUsername);
@@ -156 +215 @@
       return newGroup;
     }
+
+    /// <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) {
+        if (components != null) components.Dispose();
+        progressView.Content = null;
+        progressView.Dispose();
+      }
+      base.Dispose(disposing);
+    }
   }
 }

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Hive.JobManager.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 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.Clients.Hive.JobManager.Views {
   partial class RefreshableHiveJobView {
     /// <summary> 
@@ -50 +71 @@
       this.refreshButton = new System.Windows.Forms.Button();
       this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();
+      this.UnloadButton = new System.Windows.Forms.Button();
       this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox();
       this.infoGroupBox = new System.Windows.Forms.GroupBox();
@@ -70 +92 @@
       // tabControl
       // 
+      this.tabControl.AllowDrop = true;
       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
@@ -354 +377 @@
       this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");
       this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;
-      this.isPrivilegedCheckBox.Validated += new System.EventHandler(this.isPrivilegedCheckBox_Validated);
+      this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckChanged);
+      // 
+      // UnloadButton
+      // 
+      this.UnloadButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Disconnect;
+      this.UnloadButton.Location = new System.Drawing.Point(30, 0);
+      this.UnloadButton.Name = "UnloadButton";
+      this.UnloadButton.Size = new System.Drawing.Size(24, 24);
+      this.UnloadButton.TabIndex = 27;
+      this.toolTip.SetToolTip(this.UnloadButton, "Unload Job");
+      this.UnloadButton.UseVisualStyleBackColor = true;
+      this.UnloadButton.Click += new System.EventHandler(this.UnloadButton_Click);
       // 
       // refreshAutomaticallyCheckBox
       // 
       this.refreshAutomaticallyCheckBox.AutoSize = true;
-      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(30, 5);
+      this.refreshAutomaticallyCheckBox.Location = new System.Drawing.Point(70, 3);
       this.refreshAutomaticallyCheckBox.Name = "refreshAutomaticallyCheckBox";
       this.refreshAutomaticallyCheckBox.Size = new System.Drawing.Size(127, 17);
@@ -450 +484 @@
       // RefreshableHiveJobView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.UnloadButton);
       this.Controls.Add(this.searchButton);
       this.Controls.Add(this.isPrivilegedCheckBox);
@@ -484 +518 @@
     #endregion
 
-    private System.Windows.Forms.TabControl tabControl;
     private System.Windows.Forms.Button startButton;
     private System.Windows.Forms.Button stopButton;
@@ -518 +551 @@
     private MainForm.WindowsForms.ViewHost runCollectionViewHost;
     private System.Windows.Forms.Button searchButton;
+    private MainForm.WindowsForms.DragOverTabControl tabControl;
+    private System.Windows.Forms.Button UnloadButton;
 
   }

branches/OaaS/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -45 +45 @@
     private ProgressView progressView;
     private HiveResourceSelectorDialog hiveResourceSelectorDialog;
+    private bool SuppressEvents { get; set; }
+    private object runCollectionViewLocker = new object();
 
     public new RefreshableJob Content {
@@ -98 +100 @@
         progressView = null;
       }
+      DeregisterHiveExperimentEvents();
+      DeregisterHiveTasksEvents();
       base.DeregisterContentEvents();
     }
@@ -109 +113 @@
     }
 
-    private void RegisterHiveJobEvents() {
+    private void RegisterHiveTasksEvents() {
       Content.HiveTasks.ItemsAdded += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded);
       Content.HiveTasks.ItemsRemoved += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved);
       Content.HiveTasks.CollectionReset += new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset);
     }
-    private void DeregisterHiveJobEvents() {
+    private void DeregisterHiveTasksEvents() {
       Content.HiveTasks.ItemsAdded -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded);
       Content.HiveTasks.ItemsRemoved -= new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved);
@@ -122 +126 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null) {
-        nameTextBox.Text = string.Empty;
-        executionTimeTextBox.Text = string.Empty;
-        resourceNamesTextBox.Text = string.Empty;
-        isPrivilegedCheckBox.Checked = false;
-        logView.Content = null;
-        refreshAutomaticallyCheckBox.Checked = false;
-        runCollectionViewHost.Content = null;
-      } else {
-        nameTextBox.Text = Content.Job.Name;
-        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
-        resourceNamesTextBox.Text = Content.Job.ResourceNames;
-        isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
-        refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
-        logView.Content = Content.Log;
-        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      SuppressEvents = true;
+      try {
+        if (Content == null) {
+          nameTextBox.Text = string.Empty;
+          executionTimeTextBox.Text = string.Empty;
+          resourceNamesTextBox.Text = string.Empty;
+          isPrivilegedCheckBox.Checked = false;
+          refreshAutomaticallyCheckBox.Checked = false;
+          lock (runCollectionViewLocker) {
+            runCollectionViewHost.Content = null;
+          }
+          logView.Content = null;
+          jobsTreeView.Content = null;
+          hiveExperimentPermissionListView.Content = null;
+          stateLogViewHost.Content = null;
+        } else {
+          nameTextBox.Text = Content.Job.Name;
+          executionTimeTextBox.Text = Content.ExecutionTime.ToString();
+          resourceNamesTextBox.Text = Content.Job.ResourceNames;
+          isPrivilegedCheckBox.Checked = Content.IsAllowedPrivileged;
+          refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
+          logView.Content = Content.Log;
+          lock (runCollectionViewLocker) {
+            runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+          }
+        }
+      }
+      finally {
+        SuppressEvents = false;
       }
       hiveExperimentPermissionListView.Content = null; // has to be filled by refresh button
@@ -149 +166 @@
     }
 
+    protected override void OnLockedChanged() {
+      base.OnLockedChanged();
+      executionTimeTextBox.Enabled = !Locked;
+      jobsTextBox.Enabled = !Locked;
+      calculatingTextBox.Enabled = !Locked;
+      finishedTextBox.Enabled = !Locked;
+      tabControl.Enabled = !Locked;
+      nameTextBox.Enabled = !Locked;
+      resourceNamesTextBox.Enabled = !Locked;
+      searchButton.Enabled = !Locked;
+      jobsTreeView.Enabled = !Locked;
+      isPrivilegedCheckBox.Enabled = !Locked;
+      refreshAutomaticallyCheckBox.Enabled = !Locked;
+      refreshButton.Enabled = !Locked;
+      UnloadButton.Enabled = !Locked;
+      startButton.Enabled = !Locked;
+      pauseButton.Enabled = !Locked;
+      stopButton.Enabled = !Locked;
+      resetButton.Enabled = !Locked;
+    }
+
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      executionTimeTextBox.Enabled = Content != null;
-      jobsTextBox.ReadOnly = true;
-      calculatingTextBox.ReadOnly = true;
-      finishedTextBox.ReadOnly = true;
-
-      if (Content != null) {
-        bool alreadyUploaded = Content.Id != Guid.Empty;
-        bool jobsLoaded = Content.HiveTasks != null && Content.HiveTasks.All(x => x.Task.Id != Guid.Empty);
-        tabControl.Enabled = !Content.IsProgressing;
-
-        this.nameTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
-        this.resourceNamesTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
-        this.searchButton.Enabled = (Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded)) || !Content.IsProgressing;
-        this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
-
-        this.isPrivilegedCheckBox.Enabled = Content.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded) && !Content.IsProgressing;
-        this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
-        this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
-        this.Locked = !Content.IsControllable || Content.ExecutionState == ExecutionState.Started || Content.IsProgressing;
-      }
-      SetEnabledStateOfExecutableButtons();
-      tabControl_SelectedIndexChanged(this, EventArgs.Empty); // ensure sharing tabpage is disabled
+      if (!Locked) {
+        executionTimeTextBox.Enabled = Content != null;
+        jobsTextBox.ReadOnly = true;
+        calculatingTextBox.ReadOnly = true;
+        finishedTextBox.ReadOnly = true;
+
+        if (Content != null) {
+          bool alreadyUploaded = Content.Id != Guid.Empty;
+          bool jobsLoaded = Content.HiveTasks != null && Content.HiveTasks.All(x => x.Task.Id != Guid.Empty);
+          tabControl.Enabled = !Content.IsProgressing;
+
+          this.nameTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
+          this.resourceNamesTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
+          this.searchButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Prepared && !alreadyUploaded && !Content.IsProgressing;
+          this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
+
+          this.isPrivilegedCheckBox.Enabled = HiveClient.Instance.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded) && !Content.IsProgressing;
+          this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing;
+          this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing;
+
+          this.UnloadButton.Enabled = Content.HiveTasks != null && Content.HiveTasks.Count > 0 && alreadyUploaded && !Content.IsProgressing;
+        }
+        SetEnabledStateOfExecutableButtons();
+        tabControl_SelectedIndexChanged(this, EventArgs.Empty); // ensure sharing tabpage is disabled
+      }
     }
 
@@ -185 +226 @@
     #region Content Events
     void Content_TaskReceived(object sender, EventArgs e) {
-      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      lock (runCollectionViewLocker) {
+        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      }
     }
 
@@ -272 +315 @@
         if (Content != null && Content.HiveTasks != null) {
           jobsTreeView.Content = Content.HiveTasks;
-          RegisterHiveJobEvents();
+          RegisterHiveTasksEvents();
         } else {
           jobsTreeView.Content = null;
@@ -281 +324 @@
 
     void Content_Loaded(object sender, EventArgs e) {
-      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      lock (runCollectionViewLocker) {
+        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      }
     }
 
@@ -329 +374 @@
         Invoke(new EventHandler(Content_IsAllowedPrivilegedChanged), sender, e);
       else {
+        isPrivilegedCheckBox.Checked = Content.IsAllowedPrivileged;
         SetEnabledStateOfControls();
       }
@@ -357 +403 @@
         }
         resourceNamesTextBox.Text = sb.ToString();
+        if (Content.Job.ResourceNames != resourceNamesTextBox.Text)
+          Content.Job.ResourceNames = resourceNamesTextBox.Text;
       }
     }
@@ -416 +464 @@
 
     private void nameTextBox_Validated(object sender, EventArgs e) {
-      if (Content.Job.Name != nameTextBox.Text)
+      if (!SuppressEvents && Content.Job != null && Content.Job.Name != nameTextBox.Text)
         Content.Job.Name = nameTextBox.Text;
     }
 
     private void resourceNamesTextBox_Validated(object sender, EventArgs e) {
-      if (Content.Job.ResourceNames != resourceNamesTextBox.Text)
+      if (!SuppressEvents && Content.Job != null && Content.Job.ResourceNames != resourceNamesTextBox.Text)
         Content.Job.ResourceNames = resourceNamesTextBox.Text;
     }
 
     private void refreshAutomaticallyCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (Content != null) Content.RefreshAutomatically = refreshAutomaticallyCheckBox.Checked;
-    }
-
-    private void isPrivilegedCheckBox_Validated(object sender, EventArgs e) {
-      if (Content != null) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;
+      if (Content != null && !SuppressEvents) Content.RefreshAutomatically = refreshAutomaticallyCheckBox.Checked;
+    }
+
+    private void isPrivilegedCheckBox_CheckChanged(object sender, EventArgs e) {
+      if (Content != null && !SuppressEvents) Content.IsAllowedPrivileged = isPrivilegedCheckBox.Checked;
     }
 
@@ -505 +553 @@
           if (e.Effect.HasFlag(DragDropEffects.Copy)) {
             newOptimizer = (IOptimizer)optimizer.Clone();
+            newOptimizer.Runs.Clear();
           } else {
             newOptimizer = optimizer;
@@ -529 +578 @@
     private RunCollection GetAllRunsFromJob(RefreshableJob job) {
       if (job != null) {
-        RunCollection runs = new RunCollection();
+        RunCollection runs = new RunCollection() { OptimizerName = job.ItemName };
 
         foreach (HiveTask subTask in job.HiveTasks) {
           if (subTask is OptimizerHiveTask) {
             OptimizerHiveTask ohTask = subTask as OptimizerHiveTask;
-            runs.AddRange(ohTask.ItemTask.Item.Runs);
+            ohTask.ExecuteReadActionOnItemTask(new Action(delegate() {
+              runs.AddRange(ohTask.ItemTask.Item.Runs);
+            }));
           }
         }
@@ -542 +593 @@
       }
     }
+
+    private void UnloadButton_Click(object sender, EventArgs e) {
+      Content.Unload();
+      runCollectionViewHost.Content = null;
+      stateLogViewHost.Content = null;
+      hiveExperimentPermissionListView.Content = null;
+      jobsTreeView.Content = null;
+
+      SetEnabledStateOfControls();
+    }
   }
 }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages