Changeset 7201 for trunk/sources/HeuristicLab.Optimization/3.3

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.Optimization/3.3

Files:

• Algorithms/Algorithm.cs (modified) (2 diffs)
• BatchRun.cs (modified) (2 diffs)
• Experiment.cs (modified) (2 diffs)
• Problems/Problem.cs (modified) (1 diff)
• Problems/UserDefinedProblem.cs (modified) (2 diffs)
• ResultCollection.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -37 +37 @@
   [StorableClass]
   public abstract class Algorithm : ParameterizedNamedItem, IAlgorithm {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -43 +46 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }

trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -39 +39 @@
     public string Filename { get; set; }
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -45 +48 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunPaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.BatchRunStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }

trunk/sources/HeuristicLab.Optimization/3.3/Experiment.cs

@@ -39 +39 @@
     public string Filename { get; set; }
 
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Event; }
+    }
     public override Image ItemImage {
       get {
@@ -45 +48 @@
         else if (ExecutionState == ExecutionState.Paused) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentPaused;
         else if (ExecutionState == ExecutionState.Stopped) return HeuristicLab.Common.Resources.VSImageLibrary.ExperimentStopped;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
+        else return base.ItemImage;
       }
     }

trunk/sources/HeuristicLab.Optimization/3.3/Problems/Problem.cs

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

trunk/sources/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

@@ -43 +43 @@
     public string Filename { get; set; }
 
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
     }
@@ -263 +263 @@
       #endregion
 
-      public override Image ItemImage {
+      public static new Image StaticItemImage {
         get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
       }

trunk/sources/HeuristicLab.Optimization/3.3/ResultCollection.cs

@@ -41 +41 @@
     }
 
-    public override System.Drawing.Image ItemImage {
+    public static new System.Drawing.Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
     }