Changeset 7530

Timestamp:

02/27/12 15:26:12 (13 years ago)

Author:

ascheibe

Message:

#1778 check if the item in ItemTask and OptimizerTask is null

Location:

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

Files:

• ItemTask.cs (modified) (1 diff)
• OptimizerTask.cs (modified) (1 diff)

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

@@ -174 +174 @@
     #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; }
+      get {
+        if (item == null)
+          return string.Empty;
+        else
+          return item.ItemDescription;
+      }
+    }
+
+    public virtual new Image ItemImage {
+      get {
+        if (item == null)
+          return HeuristicLab.Common.Resources.VSImageLibrary.Class;
+        else
+          return item.ItemImage;
+      }
+    }
+
+    public virtual new 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

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

@@ -180 +180 @@
     #region INamedItem Members
     public override bool CanChangeDescription {
-      get { return Item.CanChangeDescription; }
+      get {
+        if (Item == null)
+          return false;
+        else
+          return Item.CanChangeDescription;
+      }
     }
 
     public override bool CanChangeName {
-      get { return Item.CanChangeName; }
+      get {
+        if (Item == null)
+          return false;
+        else
+          return Item.CanChangeName;
+      }
     }
 
     public override string Description {
-      get { return Item.Description; }
+      get {
+        if (Item == null)
+          return string.Empty;
+        else
+          return Item.Description;
+      }
       set { Item.Description = value; }
     }
 
     public override string Name {
-      get { return Item.Name; }
+      get {
+        if (Item == null)
+          return string.Empty;
+        else
+          return Item.Name;
+      }
       set { Item.Name = value; }
     }