Changeset 9819

Timestamp:

07/30/13 17:35:04 (11 years ago)

Author:

ascheibe

Message:

#1099 adapted Hive NamedItems

Location:

trunk/sources/HeuristicLab.Clients.Hive/3.3

Files:

• HiveTasks/HiveTask.cs (modified) (1 diff)
• Tasks/EngineTask.cs (modified) (3 diffs)
• Tasks/OptimizerTask.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

@@ -172 +172 @@
     protected HiveTask(bool deserializing) { }
 
-    public HiveTask() {
+    public HiveTask()
+      : base() {
+      Name = "Hive Task";
       this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 128 };
       task.State = TaskState.Offline;

trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

@@ -50 +50 @@
 
     #region constructors and cloning
-    public EngineTask() { }
     public EngineTask(IOperation initialOperation, IEngine engine) {
       this.initialOperation = initialOperation;
@@ -144 +143 @@
 
     public override string Name {
-      get { return Item != null ? Item.ToString() : null; }
+      get { return Item != null ? Item.ToString() : "Engine Task"; }
       set { throw new NotSupportedException(); }
     }
@@ -153 +152 @@
 
     public override string ItemName {
-      get { return "EngineTask"; }
+      get { return "Engine Task"; }
     }
   }

trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

@@ -46 +46 @@
     }
 
-    public OptimizerTask() : base() { }
-    public OptimizerTask(IOptimizer optimizer)
-      : this() {
+    public OptimizerTask(IOptimizer optimizer) {
       this.Item = optimizer;
 
@@ -210 +208 @@
       get {
         if (Item == null)
-          return string.Empty;
+          return "Optimizer Task";
         else
           return Item.Name;