Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Operators

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.Operators/3.3/AlgorithmOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Operator.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Operators/3.3/AlgorithmOperator.cs

@@ -32 +32 @@
   [StorableClass]
   public abstract class AlgorithmOperator : SingleSuccessorOperator {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
+    }
     public override Image ItemImage {
       get {
         if (Breakpoint) return HeuristicLab.Common.Resources.VSImageLibrary.BreakpointActive;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Module;
+        else return base.ItemImage;
       }
     }

branches/HeuristicLab.TimeSeries/HeuristicLab.Operators/3.3/Operator.cs

@@ -34 +34 @@
   [StorableClass]
   public abstract class Operator : ParameterizedNamedItem, IOperator, IStatefulItem {
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
+    }
     public override Image ItemImage {
       get {
         if (Breakpoint) return HeuristicLab.Common.Resources.VSImageLibrary.BreakpointActive;
-        else return HeuristicLab.Common.Resources.VSImageLibrary.Method;
+        else return base.ItemImage;
       }
     }