Changeset 2932 for trunk/sources/HeuristicLab.Parameters/3.3

Timestamp:

03/05/10 03:07:12 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• replaced Changed in IItem by ToStringChanged

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

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

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

@@ -156 +156 @@
       if (ActualNameChanged != null)
         ActualNameChanged(this, EventArgs.Empty);
-      OnChanged();
+      OnToStringChanged();
     }
 

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

@@ -50 +50 @@
         if (value != this.value) {
           if ((value != null) && !validValues.Contains(value)) throw new ArgumentException("Invalid value.");
+          if (this.value != null) this.value.ToStringChanged -= new EventHandler(Value_ToStringChanged);
           this.value = value;
+          if (this.value != null) this.value.ToStringChanged += new EventHandler(Value_ToStringChanged);
           OnValueChanged();
         }
       }
     }
+
     IItem IValueParameter.Value {
       get { return Value; }
@@ -121 +124 @@
       if (ValueChanged != null)
         ValueChanged(this, EventArgs.Empty);
-      OnChanged();
+      OnToStringChanged();
     }
 
@@ -129 +132 @@
         validValues.ItemsRemoved += new CollectionItemsChangedEventHandler<T>(ValidValues_ItemsRemoved);
         validValues.CollectionReset += new CollectionItemsChangedEventHandler<T>(ValidValues_CollectionReset);
-        validValues.Changed += new ChangedEventHandler(ValidValues_Changed);
       }
     }
@@ -138 +140 @@
         validValues.ItemsRemoved -= new CollectionItemsChangedEventHandler<T>(ValidValues_ItemsRemoved);
         validValues.CollectionReset -= new CollectionItemsChangedEventHandler<T>(ValidValues_CollectionReset);
-        validValues.Changed -= new ChangedEventHandler(ValidValues_Changed);
       }
     }
@@ -149 +150 @@
       if ((Value != null) && !validValues.Contains(Value)) Value = null;
     }
-    protected virtual void ValidValues_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
+    protected virtual void Value_ToStringChanged(object sender, EventArgs e) {
+      OnToStringChanged();
     }
   }

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

@@ -37 +37 @@
       set {
         if (value != this.value) {
-          if (this.value != null) this.value.Changed -= new ChangedEventHandler(Value_Changed);
+          if (this.value != null) this.value.ToStringChanged -= new EventHandler(Value_ToStringChanged);
           this.value = value;
-          if (this.value != null) this.value.Changed += new ChangedEventHandler(Value_Changed);
+          if (this.value != null) this.value.ToStringChanged += new EventHandler(Value_ToStringChanged);
           OnValueChanged();
         }
@@ -96 +96 @@
       if (ValueChanged != null)
         ValueChanged(this, EventArgs.Empty);
-      OnChanged();
+      OnToStringChanged();
     }
-    private void Value_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
+    private void Value_ToStringChanged(object sender, EventArgs e) {
+      OnToStringChanged();
     }
   }

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

@@ -37 +37 @@
       set {
         if (value != this.value) {
-          if (this.value != null) this.value.Changed -= new ChangedEventHandler(Value_Changed);
+          if (this.value != null) this.value.ToStringChanged -= new EventHandler(Value_ToStringChanged);
           this.value = value;
-          if (this.value != null) this.value.Changed += new ChangedEventHandler(Value_Changed);
+          if (this.value != null) this.value.ToStringChanged += new EventHandler(Value_ToStringChanged);
           OnValueChanged();
         }
@@ -89 +89 @@
       if (ValueChanged != null)
         ValueChanged(this, EventArgs.Empty);
-      OnChanged();
+      OnToStringChanged();
     }
-    private void Value_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
+    private void Value_ToStringChanged(object sender, EventArgs e) {
+      OnToStringChanged();
     }
   }