Changeset 7532


Ignore:
Timestamp:
02/27/12 17:14:12 (7 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:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs

    r7259 r7532  
    2020#endregion
    2121
     22using System;
    2223using HeuristicLab.Common;
    2324
     
    4041
    4142    public override string ToString() {
    42       return string.Format("{0}-{1}", this.Name, this.Version.ToString());
     43      return string.Format("{0}-{1}", this.Name, this.Version == null ? new Version(0, 0).ToString() : this.Version.ToString());
    4344    }
    4445  }
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

    r7259 r7532  
    148148    }
    149149
    150     public override string ItemDescription {
    151       get { return Description; }
    152     }
    153 
    154150    public static new Image StaticItemImage {
    155151      get { return HeuristicLab.Common.Resources.VSImageLibrary.Operator; }
     
    159155      get { return "EngineTask"; }
    160156    }
    161 
    162     public override Version ItemVersion {
    163       get { return null; }
    164     }
    165157  }
    166158}
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

    r7530 r7532  
    9595      this.OnItemImageChanged();
    9696    }
    97 
    9897    #endregion
    9998
    10099    #region ITask Members
    101 
    102100    public abstract ExecutionState ExecutionState { get; }
    103101
     
    173171
    174172    #region IItem Members
    175     public virtual new string ItemDescription {
     173    public override string ItemDescription {
    176174      get {
    177175        if (item == null)
     
    182180    }
    183181
    184     public virtual new Image ItemImage {
     182    public override Image ItemImage {
    185183      get {
    186184        if (item == null)
     
    191189    }
    192190
    193     public virtual new string ItemName {
     191    public override string ItemName {
    194192      get {
    195193        if (item == null)
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r7519 r7532  
    192192    <Compile Include="HeuristicLab-3.3\CollectObjectGraphTest.cs" />
    193193    <Compile Include="HeuristicLab-3.3\ContentViewTests.cs" />
     194    <Compile Include="HeuristicLab-3.3\ToStringTest.cs" />
    194195    <Compile Include="HeuristicLab-3.3\DeepCloneableCloningTest.cs" />
    195196    <Compile Include="HeuristicLab-3.3\GeneticAlgorithmTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.