Changeset 13656 for branches/WebJobManager/HeuristicLab.Clients.Hive/3.3

Timestamp:

03/07/16 10:18:05 (9 years ago)

Author:

ascheibe

Message:

#2582 created branch for Hive Web Job Manager

Location:

branches/WebJobManager

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs (modified) (10 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItem.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (modified) (4 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

@@ -41 +41 @@
     protected ReaderWriterLockSlim itemTaskLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
-    }
-    public override Image ItemImage {
-      get {
+
+    public override Image ItemImage
+    {
+      get
+      {
         if (task.Id == Guid.Empty) { // not yet uploaded
           return HeuristicLab.Common.Resources.VSImageLibrary.Event;
@@ -63 +63 @@
     [Storable]
     protected Task task;
-    public Task Task {
+    public Task Task
+    {
       get { return task; }
-      set {
+      set
+      {
         if (task != value) {
           DeregisterTaskEvents();
@@ -80 +82 @@
     [Storable]
     protected ItemTask itemTask;
-    public ItemTask ItemTask {
+    public ItemTask ItemTask
+    {
       get { return itemTask; }
-      set {
+      set
+      {
         if (itemTask != null && syncTasksWithOptimizers) {
           childHiveTasksLock.EnterWriteLock();
@@ -108 +112 @@
     [Storable]
     private bool isFinishedTaskDownloaded = false;
-    public bool IsFinishedTaskDownloaded {
+    public bool IsFinishedTaskDownloaded
+    {
       get { return isFinishedTaskDownloaded; }
-      set {
+      set
+      {
         if (value != isFinishedTaskDownloaded) {
           this.isFinishedTaskDownloaded = value;
@@ -122 +128 @@
     // if true, all control buttons should be enabled. otherwise disabled
     private bool isControllable = true;
-    public bool IsControllable {
+    public bool IsControllable
+    {
       get { return isControllable; }
-      set {
+      set
+      {
         if (value != isControllable) {
           isControllable = value;
@@ -143 +151 @@
     [Storable]
     protected ItemList<HiveTask> childHiveTasks;
-    public virtual ReadOnlyItemList<HiveTask> ChildHiveTasks {
-      get {
+    public virtual ReadOnlyItemList<HiveTask> ChildHiveTasks
+    {
+      get
+      {
         childHiveTasksLock.EnterReadLock();
         try {
@@ -156 +166 @@
     protected bool syncTasksWithOptimizers = true;
 
-    public StateLogList StateLog {
-      get {
+    public StateLogList StateLog
+    {
+      get
+      {
         var list = new StateLogList(this.task.StateLog);
         list.ForEach(s => { s.TaskName = itemTask.Name; });
@@ -164 +176 @@
     }
 
-    public StateLogListList ChildStateLogList {
+    public StateLogListList ChildStateLogList
+    {
       get { return new StateLogListList(this.childHiveTasks.Select(x => x.StateLog)); }
     }
@@ -515 +528 @@
     }
 
-    public ICollection<IItemTreeNodeAction<HiveTask>> Actions {
-      get {
+    public ICollection<IItemTreeNodeAction<HiveTask>> Actions
+    {
+      get
+      {
         return new List<IItemTreeNodeAction<HiveTask>>();
       }
@@ -544 +559 @@
   public class HiveTask<T> : HiveTask where T : ItemTask {
 
-    public new T ItemTask {
+    public new T ItemTask
+    {
       get { return (T)base.ItemTask; }
       set { base.ItemTask = value; }

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

@@ -29 +29 @@
 namespace HeuristicLab.Clients.Hive {
   public partial class HiveItem : IHiveItem {
-    public string ItemName {
+    public string ItemName
+    {
       get { return ItemAttribute.GetName(this.GetType()); }
     }
-    public string ItemDescription {
+    public string ItemDescription
+    {
       get { return ItemAttribute.GetDescription(this.GetType()); }
     }
-    public Version ItemVersion {
+    public Version ItemVersion
+    {
       get { return ItemAttribute.GetVersion(this.GetType()); }
     }
-    public static Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Database; }
+    public static Image StaticItemImage
+    {
+      get { return new Bitmap(25, 25); }
     }
-    public virtual Image ItemImage {
-      get {
+    public virtual Image ItemImage
+    {
+      get
+      {
         if (Modified)
           return HeuristicLab.Common.Resources.VSImageLibrary.DatabaseModified;
@@ -51 +57 @@
 
     private bool modified;
-    public bool Modified {
+    public bool Modified
+    {
       get { return modified; }
-      internal set {
+      internal set
+      {
         if (value != modified) {
           modified = value;

branches/WebJobManager/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

@@ -21 +21 @@
 
 using System;
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -36 +35 @@
     [Storable]
     protected IOperation initialOperation;
-    public IOperation InitialOperation {
+    public IOperation InitialOperation
+    {
       get { return initialOperation; }
       set { initialOperation = value; }
     }
 
-    public new IEngine Item {
+    public new IEngine Item
+    {
       get { return (IEngine)base.Item; }
       set { base.Item = value; }
     }
 
-    public override TimeSpan ExecutionTime {
+    public override TimeSpan ExecutionTime
+    {
       get { return Item.ExecutionTime; }
     }
 
-    public override ExecutionState ExecutionState {
+    public override ExecutionState ExecutionState
+    {
       get { return Item.ExecutionState; }
     }
@@ -73 +76 @@
     #endregion
 
-    public override bool IsParallelizable {
+    public override bool IsParallelizable
+    {
       get { return false; }
     }
@@ -136 +140 @@
     }
 
-    public override bool CanChangeDescription {
+    public override bool CanChangeDescription
+    {
       get { return false; }
     }
 
-    public override bool CanChangeName {
+    public override bool CanChangeName
+    {
       get { return false; }
     }
 
-    public override string Description {
+    public override string Description
+    {
       get { return string.Empty; }
       set { throw new NotSupportedException(); }
     }
 
-    public override string Name {
+    public override string Name
+    {
       get { return Item != null ? Item.ToString() : "Engine Task"; }
       set { throw new NotSupportedException(); }
     }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Operator; }
-    }
 
-    public override string ItemName {
+
+    public override string ItemName
+    {
       get { return "Engine Task"; }
     }