Changeset 3136 for trunk/sources

Timestamp:

03/20/10 02:47:56 (15 years ago)

Author:

swagner

Message:

Restructured code of changes made in r3106 (#919).

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

• LookupParameter.cs (modified) (1 diff)
• OptionalConstrainedValueParameter.cs (modified) (1 diff)
• OptionalValueParameter.cs (modified) (1 diff)
• Parameter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Parameters/3.3/LookupParameter.cs

@@ -52 +52 @@
         cachedActualValue = value;
         SetActualValue(value);
-      }
-    }
-    public override System.Drawing.Image ItemImage {
-      get {
-        if (typeof(IOperator).IsAssignableFrom(typeof(T)))
-          return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method;
-        else
-          return base.ItemImage;
       }
     }

trunk/sources/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs

@@ -69 +69 @@
           );
         Value = val;
-      }
-    }
-
-    public override System.Drawing.Image ItemImage {
-      get {
-        if (typeof(IOperator).IsAssignableFrom(typeof(T)))
-          return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method;
-        else
-          return base.ItemImage;
       }
     }

trunk/sources/HeuristicLab.Parameters/3.3/OptionalValueParameter.cs

@@ -57 +57 @@
       }
     }
-    public override System.Drawing.Image ItemImage {
-      get {
-        if (typeof(IOperator).IsAssignableFrom(typeof(T)))
-          return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method;
-        else
-          return base.ItemImage;
-      }
-    }
 
     public OptionalValueParameter()

trunk/sources/HeuristicLab.Parameters/3.3/Parameter.cs

@@ -21 +21 @@
 
 using System;
+using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -32 +33 @@
   [StorableClass]
   public abstract class Parameter : NamedItem, IParameter {
+    public override Image ItemImage {
+      get {
+        if ((dataType != null) && (typeof(IOperator).IsAssignableFrom(dataType)))
+          return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method;
+        else
+          return base.ItemImage;
+      }
+    }
     public override bool CanChangeName {
       get { return false; }