Changeset 3341 for trunk/sources/HeuristicLab.Core/3.3

Timestamp:

04/14/10 05:09:59 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893).

File:

• trunk/sources/HeuristicLab.Core/3.3/Variable.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Core/3.3/Variable.cs

@@ -21 +21 @@
 
 using System;
+using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +32 @@
   [StorableClass]
   public sealed class Variable : NamedItem, IVariable {
+    public override Image ItemImage {
+      get {
+        if (value != null) return value.ItemImage;
+        else return base.ItemImage;
+      }
+    }
+
     [Storable]
     private IItem value;
@@ -39 +47 @@
       set {
         if (this.value != value) {
-          if (this.value != null) this.value.ToStringChanged -= new EventHandler(Value_ToStringChanged);
+          DeregisterValueEvents();
           this.value = value;
-          if (this.value != null) this.value.ToStringChanged += new EventHandler(Value_ToStringChanged);
+          RegisterValueEvents();
           OnValueChanged();
         }
@@ -84 +92 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      if (value != null) value.ToStringChanged += new EventHandler(Value_ToStringChanged);
+      RegisterValueEvents();
     }
 
@@ -120 +128 @@
       if (ValueChanged != null)
         ValueChanged(this, EventArgs.Empty);
+      OnItemImageChanged();
       OnToStringChanged();
     }
 
+    private void RegisterValueEvents() {
+      if (value != null) {
+        value.ItemImageChanged += new EventHandler(Value_ItemImageChanged);
+        value.ToStringChanged += new EventHandler(Value_ToStringChanged);
+      }
+    }
+    private void DeregisterValueEvents() {
+      if (value != null) {
+        value.ItemImageChanged -= new EventHandler(Value_ItemImageChanged);
+        value.ToStringChanged -= new EventHandler(Value_ToStringChanged);
+      }
+    }
+    private void Value_ItemImageChanged(object sender, EventArgs e) {
+      OnItemImageChanged();
+    }
     private void Value_ToStringChanged(object sender, EventArgs e) {
       OnToStringChanged();