Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/ServiceClients

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItem.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/JobData.cs (deleted)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/TaskData.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/TaskData.cs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItem.cs

@@ -38 +38 @@
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Database; }
+    }
     public virtual Image ItemImage {
       get {
@@ -43 +46 @@
           return HeuristicLab.Common.Resources.VSImageLibrary.DatabaseModified;
         else
-          return HeuristicLab.Common.Resources.VSImageLibrary.Database;
+          return ItemAttribute.GetImage(this.GetType());
       }
     }

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive/3.3/ServiceClients/StateLog.cs

@@ -38 +38 @@
     }
 
+    public string TaskName { get; set; }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new StateLog(this, cloner);