Changeset 7532

Timestamp:

02/27/12 17:14:12 (13 years ago)

Author:

ascheibe

Message:

#1778

• tried to clean up ItemTask/EngineTask overrides without breaking anything
• added a unit test to check if ToString methods of IItems work
• fixed ToString method of the Hive Plugin dto

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (modified) (4 diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/ToStringTest.cs (added)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 
@@ -40 +41 @@
 
     public override string ToString() {
-      return string.Format("{0}-{1}", this.Name, this.Version.ToString());
+      return string.Format("{0}-{1}", this.Name, this.Version == null ? new Version(0, 0).ToString() : this.Version.ToString());
     }
   }

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

@@ -148 +148 @@
     }
 
-    public override string ItemDescription {
-      get { return Description; }
-    }
-
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Operator; }
@@ -159 +155 @@
       get { return "EngineTask"; }
     }
-
-    public override Version ItemVersion {
-      get { return null; }
-    }
   }
 }

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

@@ -95 +95 @@
       this.OnItemImageChanged();
     }
-
     #endregion
 
     #region ITask Members
-
     public abstract ExecutionState ExecutionState { get; }
 
@@ -173 +171 @@
 
     #region IItem Members
-    public virtual new string ItemDescription {
+    public override string ItemDescription {
       get {
         if (item == null)
@@ -182 +180 @@
     }
 
-    public virtual new Image ItemImage {
+    public override Image ItemImage {
       get {
         if (item == null)
@@ -191 +189 @@
     }
 
-    public virtual new string ItemName {
+    public override string ItemName {
       get {
         if (item == null)

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -192 +192 @@
     <Compile Include="HeuristicLab-3.3\CollectObjectGraphTest.cs" />
     <Compile Include="HeuristicLab-3.3\ContentViewTests.cs" />
+    <Compile Include="HeuristicLab-3.3\ToStringTest.cs" />
     <Compile Include="HeuristicLab-3.3\DeepCloneableCloningTest.cs" />
     <Compile Include="HeuristicLab-3.3\GeneticAlgorithmTest.cs" />