Changeset 2474 for trunk/sources/HeuristicLab.Core/3.2/ScopeView.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/ScopeView.cs (modified) (5 diffs)

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

@@ -28 +28 @@
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
@@ -103 +104 @@
       scopeExpandedTable.Add(scope, false);
       if (myAutomaticUpdating) {
-        scope.SubScopeAdded += new EventHandler<ScopeIndexEventArgs>(Scope_SubScopeAdded);
-        scope.SubScopeRemoved += new EventHandler<ScopeIndexEventArgs>(Scope_SubScopeRemoved);
+        scope.SubScopeAdded += new EventHandler<EventArgs<IScope, int>>(Scope_SubScopeAdded);
+        scope.SubScopeRemoved += new EventHandler<EventArgs<IScope, int>>(Scope_SubScopeRemoved);
         scope.SubScopesReordered += new EventHandler(Scope_SubScopesReordered);
       }
@@ -119 +120 @@
         scopeNodeTable.Remove(scope);
         scopeExpandedTable.Remove(scope);
-        scope.SubScopeAdded -= new EventHandler<ScopeIndexEventArgs>(Scope_SubScopeAdded);
-        scope.SubScopeRemoved -= new EventHandler<ScopeIndexEventArgs>(Scope_SubScopeRemoved);
+        scope.SubScopeAdded -= new EventHandler<EventArgs<IScope, int>>(Scope_SubScopeAdded);
+        scope.SubScopeRemoved -= new EventHandler<EventArgs<IScope, int>>(Scope_SubScopeRemoved);
         scope.SubScopesReordered -= new EventHandler(Scope_SubScopesReordered);
       }
@@ -209 +210 @@
     private delegate void ScopeDelegate(IScope scope);
     private delegate void ScopeScopeIndexDelegate(IScope scope, IScope subScope, int index);
-    private void Scope_SubScopeAdded(object sender, ScopeIndexEventArgs e) {
+    private void Scope_SubScopeAdded(object sender, EventArgs<IScope, int> e) {
       IScope scope = (IScope)sender;
       TreeNode node = scopeNodeTable[scope];
       if (scopeExpandedTable[scope] || (scope.SubScopes.Count == 1))
-        AddSubScope(scope, e.Scope, e.Index);
+        AddSubScope(scope, e.Value, e.Value2);
     }
     private void AddSubScope(IScope scope, IScope subScope, int index) {
@@ -228 +229 @@
       }
     }
-    private void Scope_SubScopeRemoved(object sender, ScopeIndexEventArgs e) {
+    private void Scope_SubScopeRemoved(object sender, EventArgs<IScope, int> e) {
       IScope scope = (IScope)sender;
       TreeNode node = scopeNodeTable[scope];
       if (scopeExpandedTable[scope] || (scope.SubScopes.Count == 0))
-        RemoveSubScope(scope, e.Scope, e.Index);
+        RemoveSubScope(scope, e.Value, e.Value2);
     }
     private void RemoveSubScope(IScope scope, IScope subScope, int index) {