Changeset 7201 for trunk/sources/HeuristicLab.Clients.Hive

Timestamp:

12/19/11 03:17:35 (12 years ago)

Author:

swagner

Message:

Implemented static item image properties to avoid instance creation in TypeSelector and NewItemDialog (#1651)

Location:

trunk/sources/HeuristicLab.Clients.Hive/3.3

Files:

• HiveJobs/HiveTask.cs (modified) (12 diffs)
• ServiceClients/HiveItem.cs (modified) (2 diffs)
• Tasks/EngineTask.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

@@ -40 +40 @@
     protected ReaderWriterLockSlim childHiveTasksLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -52 +55 @@
           else if (task.State == TaskState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
           else if (task.State == TaskState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-          else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+          else return base.ItemImage;
         }
       }
@@ -120 +123 @@
               hiveJob.IsControllable = value;
             }
-          } finally {
+          }
+          finally {
             childHiveTasksLock.ExitReadLock();
           }
@@ -134 +138 @@
         try {
           return childHiveTasks.AsReadOnly();
-        } finally { childHiveTasksLock.ExitReadLock(); }
+        }
+        finally { childHiveTasksLock.ExitReadLock(); }
       }
     }
@@ -193 +198 @@
       try {
         this.childHiveTasks = cloner.Clone(original.childHiveTasks);
-      } finally { original.childHiveTasksLock.ExitReadLock(); }
+      }
+      finally { original.childHiveTasksLock.ExitReadLock(); }
       this.syncTasksWithOptimizers = original.syncTasksWithOptimizers;
       this.isFinishedTaskDownloaded = original.isFinishedTaskDownloaded;
@@ -242 +248 @@
       try {
         this.childHiveTasks.Add(hiveTask);
-      } finally { childHiveTasksLock.ExitWriteLock(); }
+      }
+      finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -359 +366 @@
         }
         return jobs;
-      } finally { childHiveTasksLock.ExitReadLock(); }
+      }
+      finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -373 +381 @@
         }
         return null;
-      } finally { childHiveTasksLock.ExitWriteLock(); }
+      }
+      finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -390 +399 @@
               return result;
           }
-        } finally { childHiveTasksLock.ExitReadLock(); }
+        }
+        finally { childHiveTasksLock.ExitReadLock(); }
       }
       return null;
@@ -405 +415 @@
           child.RemoveByTaskId(jobId);
         }
-      } finally { childHiveTasksLock.ExitWriteLock(); }
+      }
+      finally { childHiveTasksLock.ExitWriteLock(); }
     }
 
@@ -458 +469 @@
             HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
           }
-        } finally { childHiveTasksLock.ExitReadLock(); }
+        }
+        finally { childHiveTasksLock.ExitReadLock(); }
       } else {
         HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
@@ -471 +483 @@
             HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
           }
-        } finally { childHiveTasksLock.ExitReadLock(); }
+        }
+        finally { childHiveTasksLock.ExitReadLock(); }
       } else {
         HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));

trunk/sources/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());
       }
     }

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

@@ -152 +152 @@
     }
 
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Operator; }
     }