Changeset 2474 for trunk/sources/HeuristicLab.Core/3.2/OperatorBase.cs

Timestamp:

11/10/09 16:50:26 (15 years ago)

Author:

swagner

Message:

Implemented generic EventArgs (#796)

File:

• trunk/sources/HeuristicLab.Core/3.2/OperatorBase.cs (modified) (15 diffs)

trunk/sources/HeuristicLab.Core/3.2/OperatorBase.cs

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
@@ -335 +336 @@
     public virtual void AddVariable(IVariable variable) {
       myVariables.Add(variable.Name, variable);
-      variable.NameChanging += new EventHandler<NameChangingEventArgs>(Variable_NameChanging);
+      variable.NameChanging += new EventHandler<CancelEventArgs<string>>(Variable_NameChanging);
       variable.NameChanged += new EventHandler(Variable_NameChanged);
       OnVariableAdded(variable);
@@ -345 +346 @@
       myVariables.Add(variable.Name, variable);
       if (IsValid()) {
-        variable.NameChanging += new EventHandler<NameChangingEventArgs>(Variable_NameChanging);
+        variable.NameChanging += new EventHandler<CancelEventArgs<string>>(Variable_NameChanging);
         variable.NameChanged += new EventHandler(Variable_NameChanged);
         OnVariableAdded(variable);
@@ -360 +361 @@
       myVariables.Add(variable.Name, variable);
       if (IsValid(out violatedConstraints)) {
-        variable.NameChanging += new EventHandler<NameChangingEventArgs>(Variable_NameChanging);
+        variable.NameChanging += new EventHandler<CancelEventArgs<string>>(Variable_NameChanging);
         variable.NameChanged += new EventHandler(Variable_NameChanged);
         OnVariableAdded(variable);
@@ -375 +376 @@
       IVariable variable;
       if (myVariables.TryGetValue(name, out variable)) {
-        variable.NameChanging -= new EventHandler<NameChangingEventArgs>(Variable_NameChanging);
+        variable.NameChanging -= new EventHandler<CancelEventArgs<string>>(Variable_NameChanging);
         variable.NameChanged -= new EventHandler(Variable_NameChanged);
         myVariables.Remove(name);
@@ -389 +390 @@
         myVariables.Remove(name);
         if (IsValid()) {
-          variable.NameChanging -= new EventHandler<NameChangingEventArgs>(Variable_NameChanging);
+          variable.NameChanging -= new EventHandler<CancelEventArgs<string>>(Variable_NameChanging);
           variable.NameChanged -= new EventHandler(Variable_NameChanged);
           OnVariableRemoved(variable);
@@ -408 +409 @@
         myVariables.Remove(name);
         if (IsValid(out violatedConstraints)) {
-          variable.NameChanging -= new EventHandler<NameChangingEventArgs>(Variable_NameChanging);
+          variable.NameChanging -= new EventHandler<CancelEventArgs<string>>(Variable_NameChanging);
           variable.NameChanged -= new EventHandler(Variable_NameChanged);
           OnVariableRemoved(variable);
@@ -420 +421 @@
       return true;
     }
-    private void Variable_NameChanging(object sender, NameChangingEventArgs e) {
-      e.Cancel = myVariables.ContainsKey(e.Name);
+    private void Variable_NameChanging(object sender, CancelEventArgs<string> e) {
+      e.Cancel = myVariables.ContainsKey(e.Value);
     }
     private void Variable_NameChanged(object sender, EventArgs e) {
@@ -518 +519 @@
     }
     /// <inheritdoc/>
-    public event EventHandler<OperatorIndexEventArgs> SubOperatorAdded;
+    public event EventHandler<EventArgs<IOperator, int>> SubOperatorAdded;
     /// <summary>
     /// Fires a new <c>SubOperatorAdded</c> event.
@@ -526 +527 @@
     protected virtual void OnSubOperatorAdded(IOperator subOperator, int index) {
       if (SubOperatorAdded != null)
-        SubOperatorAdded(this, new OperatorIndexEventArgs(subOperator, index));
-    }
-    /// <inheritdoc/>
-    public event EventHandler<OperatorIndexEventArgs> SubOperatorRemoved;
+        SubOperatorAdded(this, new EventArgs<IOperator, int>(subOperator, index));
+    }
+    /// <inheritdoc/>
+    public event EventHandler<EventArgs<IOperator, int>> SubOperatorRemoved;
     /// <summary>
     /// Fires a new <c>SubOperatorRemoved</c> event.
@@ -537 +538 @@
     protected virtual void OnSubOperatorRemoved(IOperator subOperator, int index) {
       if (SubOperatorRemoved != null)
-        SubOperatorRemoved(this, new OperatorIndexEventArgs(subOperator, index));
-    }
-    /// <inheritdoc/>
-    public event EventHandler<VariableInfoEventArgs> VariableInfoAdded;
+        SubOperatorRemoved(this, new EventArgs<IOperator, int>(subOperator, index));
+    }
+    /// <inheritdoc/>
+    public event EventHandler<EventArgs<IVariableInfo>> VariableInfoAdded;
     /// <summary>
     /// Fires a new <c>VariableInfoAdded</c> event.
@@ -547 +548 @@
     protected virtual void OnVariableInfoAdded(IVariableInfo variableInfo) {
       if (VariableInfoAdded != null)
-        VariableInfoAdded(this, new VariableInfoEventArgs(variableInfo));
-    }
-    /// <inheritdoc/>
-    public event EventHandler<VariableInfoEventArgs> VariableInfoRemoved;
+        VariableInfoAdded(this, new EventArgs<IVariableInfo>(variableInfo));
+    }
+    /// <inheritdoc/>
+    public event EventHandler<EventArgs<IVariableInfo>> VariableInfoRemoved;
     /// <summary>
     /// Fires a new <c>VariableInfoRemoved</c> event.
@@ -557 +558 @@
     protected virtual void OnVariableInfoRemoved(IVariableInfo variableInfo) {
       if (VariableInfoRemoved != null)
-        VariableInfoRemoved(this, new VariableInfoEventArgs(variableInfo));
-    }
-    /// <inheritdoc/>
-    public event EventHandler<VariableEventArgs> VariableAdded;
+        VariableInfoRemoved(this, new EventArgs<IVariableInfo>(variableInfo));
+    }
+    /// <inheritdoc/>
+    public event EventHandler<EventArgs<IVariable>> VariableAdded;
     /// <summary>
     /// Fires a new <c>VariableAdded</c> event.
@@ -567 +568 @@
     protected virtual void OnVariableAdded(IVariable variable) {
       if (VariableAdded != null)
-        VariableAdded(this, new VariableEventArgs(variable));
-    }
-    /// <inheritdoc/>
-    public event EventHandler<VariableEventArgs> VariableRemoved;
+        VariableAdded(this, new EventArgs<IVariable>(variable));
+    }
+    /// <inheritdoc/>
+    public event EventHandler<EventArgs<IVariable>> VariableRemoved;
     /// <summary>
     /// Fires a new <c>VariableRemoved</c> event.
@@ -577 +578 @@
     protected virtual void OnVariableRemoved(IVariable variable) {
       if (VariableRemoved != null)
-        VariableRemoved(this, new VariableEventArgs(variable));
+        VariableRemoved(this, new EventArgs<IVariable>(variable));
     }
     /// <inheritdoc/>