Index: /trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs
===================================================================
--- /trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs (revision 7531)
+++ /trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Plugin.cs (revision 7532)
@@ -20,4 +20,5 @@
#endregion
+using System;
using HeuristicLab.Common;
@@ -40,5 +41,5 @@
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());
}
}
Index: /trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs
===================================================================
--- /trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (revision 7531)
+++ /trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (revision 7532)
@@ -148,8 +148,4 @@
}
- public override string ItemDescription {
- get { return Description; }
- }
-
public static new Image StaticItemImage {
get { return HeuristicLab.Common.Resources.VSImageLibrary.Operator; }
@@ -159,8 +155,4 @@
get { return "EngineTask"; }
}
-
- public override Version ItemVersion {
- get { return null; }
- }
}
}
Index: /trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs
===================================================================
--- /trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (revision 7531)
+++ /trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (revision 7532)
@@ -95,9 +95,7 @@
this.OnItemImageChanged();
}
-
#endregion
#region ITask Members
-
public abstract ExecutionState ExecutionState { get; }
@@ -173,5 +171,5 @@
#region IItem Members
- public virtual new string ItemDescription {
+ public override string ItemDescription {
get {
if (item == null)
@@ -182,5 +180,5 @@
}
- public virtual new Image ItemImage {
+ public override Image ItemImage {
get {
if (item == null)
@@ -191,5 +189,5 @@
}
- public virtual new string ItemName {
+ public override string ItemName {
get {
if (item == null)
Index: /trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/ToStringTest.cs
===================================================================
--- /trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/ToStringTest.cs (revision 7532)
+++ /trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/ToStringTest.cs (revision 7532)
@@ -0,0 +1,45 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using System.Linq;
+using HeuristicLab.Core;
+using HeuristicLab.PluginInfrastructure;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace HeuristicLab_33.Tests {
+ [TestClass]
+ public class ToStringTest {
+
+ // Use ClassInitialize to run code before running the first test in the class
+ [ClassInitialize]
+ public static void MyClassInitialize(TestContext testContext) {
+ PluginLoader.Assemblies.Any();
+ }
+
+ [TestMethod]
+ public void TestToString() {
+ // just test for all IItems that the ToString method doesn't throw an exception
+ foreach (object item in ApplicationManager.Manager.GetInstances(typeof(IItem))) {
+ item.ToString();
+ }
+ }
+ }
+}
Index: /trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj
===================================================================
--- /trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj (revision 7531)
+++ /trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj (revision 7532)
@@ -192,4 +192,5 @@
+