Changeset 10150 for trunk/sources/HeuristicLab.Clients.Hive.JobManager

Timestamp:

11/22/13 14:23:56 (11 years ago)

Author:

ascheibe

Message:

#2117

• improved creation of ItemTasks from Items and moved common functionality to ItemTask
• added a MenuItem for directly uploading tasks (e.g. from experiments, batchruns,...)
• added a MenuItem for creating RefreshableHiveJobs

Location:

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3

Files:

• HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified) (1 diff)
• MenuItems/CreateHiveJobMenuItem.cs (added)
• MenuItems/RunInHiveMenuItem.cs (added)
• Views/RefreshableHiveJobView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

@@ -98 +98 @@
     <Compile Include="ExtensionMethods\TreeNodeExtensions.cs" />
     <Compile Include="ListViewItemDateComparer.cs" />
+    <Compile Include="MenuItems\CreateHiveJobMenuItem.cs" />
+    <Compile Include="MenuItems\RunInHiveMenuItem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Views\HiveJobManagerView.cs">

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading;
@@ -472 +471 @@
       Type objType = obj.GetType();
 
-      var typeHiveTaskMap = ApplicationManager.Manager.GetTypes(typeof(ItemTask))
-          .Select(t => new Tuple<PropertyInfo, Type>(t.GetProperties().Single(x => x.Name == "Item" && x.PropertyType != typeof(IItem)), t));
-
-      var hiveTaskFound = typeHiveTaskMap.Any(x => x.Item1.PropertyType.IsAssignableFrom(objType));
-
+      var hiveTaskFound = ItemTask.IsTypeSupported(objType);
       if (hiveTaskFound) {
         if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None;
@@ -486 +481 @@
     private void jobsTreeView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        var obj = e.Data.GetData(Constants.DragDropDataFormat) as IDeepCloneable;
-        Type objType = obj.GetType();
-
-        var typeHiveTaskMap = ApplicationManager.Manager.GetTypes(typeof(ItemTask))
-            .Select(t => new Tuple<PropertyInfo, Type>(t.GetProperties().Single(x => x.Name == "Item" && x.PropertyType != typeof(IItem)), t));
-
-        var hiveTaskType = typeHiveTaskMap.Single(x => x.Item1.PropertyType.IsAssignableFrom(objType)).Item2;
-
-        IDeepCloneable newObj = null;
+        var obj = e.Data.GetData(Constants.DragDropDataFormat) as IItem;
+
+        IItem newObj = null;
         if (e.Effect.HasFlag(DragDropEffects.Copy)) {
-          newObj = obj.Clone(new Cloner());
+          newObj = obj.Clone(new Cloner()) as IItem;
         } else {
           newObj = obj;
@@ -512 +501 @@
         }
 
-        ItemTask hiveTask = Activator.CreateInstance(hiveTaskType, new object[] { newObj }) as ItemTask;
+        ItemTask hiveTask = ItemTask.GetItemTaskForItem(newObj);
         Content.HiveTasks.Add(hiveTask.CreateHiveTask());
       }