Changeset 7615 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

Timestamp:

03/15/12 09:11:17 (12 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries/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 {
-      get { return item.ItemDescription; }
-    }
-
-    public virtual new Image ItemImage
-    {
-      get { return item.ItemImage; }
-    }
-
-    public virtual new string ItemName
-    {
-      get { return item.ItemName; }
-    }
-
-    public virtual new Version ItemVersion
-    {
-      get { return item.ItemVersion; }
+    public override string ItemDescription {
+      get {
+        if (item == null)
+          return string.Empty;
+        else
+          return item.ItemDescription;
+      }
+    }
+
+    public override Image ItemImage {
+      get {
+        if (item == null)
+          return HeuristicLab.Common.Resources.VSImageLibrary.Class;
+        else
+          return item.ItemImage;
+      }
+    }
+
+    public override string ItemName {
+      get {
+        if (item == null)
+          return string.Empty;
+        else
+          return item.ItemName;
+      }
+    }
+
+    public virtual new Version ItemVersion {
+      get {
+        if (item == null)
+          return ItemAttribute.GetVersion(this.GetType());
+        else
+          return item.ItemVersion;
+      }
     }
     #endregion