Changeset 2474 for trunk/sources/HeuristicLab.Data/3.2/ItemListView_T.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/ItemListView_T.cs (modified) (4 diffs)

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

@@ -27 +27 @@
 using System.Text;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -71 +72 @@
     /// </remarks>
     protected override void RemoveItemEvents() {
-      ItemList.ItemAdded -= new EventHandler<ItemIndexEventArgs>(ItemList_ItemInserted);
-      ItemList.ItemRemoved -= new EventHandler<ItemIndexEventArgs>(ItemList_ItemRemoved);
+      ItemList.ItemAdded -= new EventHandler<EventArgs<IItem, int>>(ItemList_ItemInserted);
+      ItemList.ItemRemoved -= new EventHandler<EventArgs<IItem, int>>(ItemList_ItemRemoved);
       ItemList.Cleared -= new EventHandler(ItemList_Cleared);
       base.RemoveItemEvents();
@@ -83 +84 @@
     protected override void AddItemEvents() {
       base.AddItemEvents();
-      ItemList.ItemAdded += new EventHandler<ItemIndexEventArgs>(ItemList_ItemInserted);
-      ItemList.ItemRemoved += new EventHandler<ItemIndexEventArgs>(ItemList_ItemRemoved);
+      ItemList.ItemAdded += new EventHandler<EventArgs<IItem, int>>(ItemList_ItemInserted);
+      ItemList.ItemRemoved += new EventHandler<EventArgs<IItem, int>>(ItemList_ItemRemoved);
       ItemList.Cleared += new EventHandler(ItemList_Cleared);
     }
@@ -226 +227 @@
 
     #region Item and Item List Events
-    private void ItemList_ItemInserted(object sender, ItemIndexEventArgs e) {
+    private void ItemList_ItemInserted(object sender, EventArgs<IItem, int> e) {
       if(InvokeRequired)
-        Invoke(new EventHandler<ItemIndexEventArgs>(ItemList_ItemInserted), sender, e);
+        Invoke(new EventHandler<EventArgs<IItem, int>>(ItemList_ItemInserted), 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);
-      }
-    }
-    private void ItemList_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);
+      }
+    }
+    private void ItemList_ItemRemoved(object sender, EventArgs<IItem, int> e) {
       if(InvokeRequired)
-        Invoke(new EventHandler<ItemIndexEventArgs>(ItemList_ItemRemoved), sender, e);
+        Invoke(new EventHandler<EventArgs<IItem, int>>(ItemList_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);
       }
     }