Changeset 2474 for trunk/sources/HeuristicLab.Data/3.2/ConstrainedItemListView.cs

Timestamp:

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

Author:

swagner

Message:

Implemented generic EventArgs (#796)

File:

• trunk/sources/HeuristicLab.Data/3.2/ConstrainedItemListView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Data/3.2/ConstrainedItemListView.cs

@@ -27 +27 @@
 using System.Text;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -71 +72 @@
     /// </remarks>
     protected override void RemoveItemEvents() {
-      ConstrainedItemList.ItemAdded -= new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemAdded);
-      ConstrainedItemList.ItemRemoved -= new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemRemoved);
+      ConstrainedItemList.ItemAdded -= new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemAdded);
+      ConstrainedItemList.ItemRemoved -= new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemRemoved);
       ConstrainedItemList.Cleared -= new EventHandler(ConstrainedItemList_Cleared);
       base.RemoveItemEvents();
@@ -84 +85 @@
     protected override void AddItemEvents() {
       base.AddItemEvents();
-      ConstrainedItemList.ItemAdded += new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemAdded);
-      ConstrainedItemList.ItemRemoved += new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemRemoved);
+      ConstrainedItemList.ItemAdded += new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemAdded);
+      ConstrainedItemList.ItemRemoved += new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemRemoved);
       ConstrainedItemList.Cleared += new EventHandler(ConstrainedItemList_Cleared);
     }
@@ -135 +136 @@
 
     #region ConstrainedItemList changes
-    void ConstrainedItemList_ItemAdded(object sender, ItemIndexEventArgs e) {
+    void ConstrainedItemList_ItemAdded(object sender, EventArgs<IItem, int> e) {
       if (InvokeRequired)
-        Invoke(new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemAdded), sender, e);
+        Invoke(new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemAdded), sender, e);
       else {
         ListViewItem item = new ListViewItem();
-        item.Text = e.Item.ToString();
-        item.Tag = e.Item;
-        itemsListView.Items.Insert(e.Index, item);
-        e.Item.Changed += new EventHandler(Item_Changed);
-      }
-    }
-
-    void ConstrainedItemList_ItemRemoved(object sender, ItemIndexEventArgs e) {
+        item.Text = e.Value.ToString();
+        item.Tag = e.Value;
+        itemsListView.Items.Insert(e.Value2, item);
+        e.Value.Changed += new EventHandler(Item_Changed);
+      }
+    }
+
+    void ConstrainedItemList_ItemRemoved(object sender, EventArgs<IItem, int> e) {
       if (InvokeRequired)
-        Invoke(new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemRemoved), sender, e);
+        Invoke(new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemRemoved), sender, e);
       else {
-        itemsListView.Items.RemoveAt(e.Index);
-        e.Item.Changed -= new EventHandler(Item_Changed);
+        itemsListView.Items.RemoveAt(e.Value2);
+        e.Value.Changed -= new EventHandler(Item_Changed);
       }
     }