Changeset 7067 for trunk

Timestamp:

11/24/11 15:48:23 (13 years ago)

Author:

ascheibe

Message:

#1673

• allow drag and drop only for new jobs
• prepare optimizers on drag and drop

File:

• trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (2 diffs)

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

@@ -436 +436 @@
       var obj = e.Data.GetData(Constants.DragDropDataFormat);
       if (obj is IOptimizer) {
-        if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
+        if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None;
+        else if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if (e.AllowedEffect.HasFlag(DragDropEffects.Copy)) e.Effect = DragDropEffects.Copy;
       }
@@ -447 +448 @@
         var optimizer = obj as IOptimizer;
         if (optimizer != null) {
-          Content.HiveTasks.Add(new OptimizerHiveTask(e.Effect.HasFlag(DragDropEffects.Copy) ? (IOptimizer)optimizer.Clone() : optimizer));
+          IOptimizer newOptimizer = null;
+          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+            newOptimizer = (IOptimizer)optimizer.Clone();
+          } else {
+            newOptimizer = optimizer;
+          }
+          if (newOptimizer.ExecutionState != ExecutionState.Prepared) {
+            newOptimizer.Prepare();
+          }
+
+          Content.HiveTasks.Add(new OptimizerHiveTask(newOptimizer));
         }
       }