Changeset 7669 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/Tasks

Timestamp:

03/28/12 15:47:26 (13 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs (modified) (1 diff)

branches/HeuristicLab.Hive.Azure

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.Hive.Azure/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; }
-    }
   }
 }

branches/HeuristicLab.Hive.Azure/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

branches/HeuristicLab.Hive.Azure/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; }
     }

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user