Changeset 5206 for trunk/sources/HeuristicLab.Parameters

Timestamp:

01/04/11 02:09:55 (14 years ago)

Author:

cneumuel

Message:

#1361 fixed deregistration of events on parameter values

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

• OptionalConstrainedValueParameter.cs (modified) (2 diffs)
• OptionalValueParameter.cs (modified) (2 diffs)
• ValueLookupParameter.cs (modified) (2 diffs)

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

@@ -54 +54 @@
         if (value != this.value) {
           if ((value != null) && !validValues.Contains(value)) throw new ArgumentException("Invalid value.");
+          OnValueChanging();
           DeregisterValueEvents();
           this.value = value;
@@ -205 +206 @@
     }
 
+    public event EventHandler ValueChanging;
+    protected virtual void OnValueChanging() {
+      EventHandler handler = ValueChanging;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler ValueChanged;
     protected virtual void OnValueChanged() {

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

@@ -46 +46 @@
       set {
         if (value != this.value) {
+          OnValueChanging();
           DeregisterValueEvents();
           this.value = value;
@@ -187 +188 @@
       ((IValueParameter)this).Value = value;
     }
-
+    
+    public event EventHandler ValueChanging;
+    protected virtual void OnValueChanging() {
+      EventHandler handler = ValueChanging;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler ValueChanged;
     protected virtual void OnValueChanged() {

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

@@ -46 +46 @@
       set {
         if (value != this.value) {
+          OnValueChanging();
           DeregisterValueEvents();
           this.value = value;
@@ -159 +160 @@
     }
 
+    public event EventHandler ValueChanging;
+    protected virtual void OnValueChanging() {
+      EventHandler handler = ValueChanging;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler ValueChanged;
     protected virtual void OnValueChanged() {