Changeset 11079 for trunk

Timestamp:

07/03/14 11:38:40 (10 years ago)

Author:

ascheibe

Message:

#2117 implemented review comments:

• fixed updating of enabled state in Hive menu items
• fixed casts in RefreshableHiveJobView
• fixed cloning call
• removed hiveTaskFound variable

Location:

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

Files:

• MenuItems/CreateHiveJobMenuItem.cs (modified) (1 diff)
• MenuItems/RunInHiveMenuItem.cs (modified) (1 diff)
• Views/RefreshableHiveJobView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs

@@ -48 +48 @@
           Type contentType = content.GetType();
           ToolStripItem.Enabled = ItemTask.IsTypeSupported(contentType);
-        } else {
-          ToolStripItem.Enabled = false;
+          return;
         }
       }
+      ToolStripItem.Enabled = false;
     }
 

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs

@@ -50 +50 @@
           Type contentType = content.GetType();
           ToolStripItem.Enabled = ItemTask.IsTypeSupported(contentType);
-        } else {
-          ToolStripItem.Enabled = false;
+          return;
         }
       }
+      ToolStripItem.Enabled = false;
     }
 

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

@@ -468 +468 @@
     private void jobsTreeView_DragEnter(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      var obj = e.Data.GetData(Constants.DragDropDataFormat) as IDeepCloneable;
+      var obj = (IDeepCloneable)e.Data.GetData(Constants.DragDropDataFormat);
+
       Type objType = obj.GetType();
-
-      var hiveTaskFound = ItemTask.IsTypeSupported(objType);
-      if (hiveTaskFound) {
+      if (ItemTask.IsTypeSupported(objType)) {
         if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None;
         else if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
@@ -481 +480 @@
     private void jobsTreeView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        var obj = e.Data.GetData(Constants.DragDropDataFormat) as IItem;
+        var obj = (IItem)e.Data.GetData(Constants.DragDropDataFormat);
 
         IItem newObj = null;
         if (e.Effect.HasFlag(DragDropEffects.Copy)) {
-          newObj = obj.Clone(new Cloner()) as IItem;
+          newObj = (IItem)obj.Clone();
         } else {
           newObj = obj;
@@ -495 +494 @@
         }
         if (newObj is IExecutable) {
-          IExecutable exec = newObj as IExecutable;
+          IExecutable exec = (IExecutable)newObj;
           if (exec.ExecutionState != ExecutionState.Prepared) {
             exec.Prepare();