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

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

@@ -6 +6 @@
 using System.Text;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -75 +76 @@
     /// </remarks>
     protected override void RemoveItemEvents() {
-      ItemDictionary.ItemAdded -= new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemInserted);
-      ItemDictionary.ItemRemoved -= new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemRemoved);
+      ItemDictionary.ItemAdded -= new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemInserted);
+      ItemDictionary.ItemRemoved -= new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemRemoved);
       ItemDictionary.Cleared -= new EventHandler(ItemDictionary_Cleared);
       base.RemoveItemEvents();
@@ -88 +89 @@
     protected override void AddItemEvents() {
       base.AddItemEvents();
-      ItemDictionary.ItemAdded += new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemInserted);
-      ItemDictionary.ItemRemoved += new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemRemoved);
+      ItemDictionary.ItemAdded += new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemInserted);
+      ItemDictionary.ItemRemoved += new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemRemoved);
       ItemDictionary.Cleared += new EventHandler(ItemDictionary_Cleared);
     }
@@ -119 +120 @@
 
     #region Item and ItemDictionary Events
-    private void ItemDictionary_ItemInserted(object sender, KeyValueEventArgs e) {
+    private void ItemDictionary_ItemInserted(object sender, EventArgs<IItem, IItem> e) {
       if (InvokeRequired)
-        Invoke(new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemInserted), sender, e);
+        Invoke(new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemInserted), sender, e);
       else {
-        ListViewItem item = CreateListViewItem((K) e.Key, (V) e.Value);
+        ListViewItem item = CreateListViewItem((K) e.Value, (V) e.Value2);
         listView.Items.Insert(listView.Items.Count, item);
-        item.Name = e.Key.ToString();
+        item.Name = e.Value.ToString();
+        e.Value2.Changed += new EventHandler(Item_Changed);
         e.Value.Changed += new EventHandler(Item_Changed);
-        e.Key.Changed += new EventHandler(Item_Changed);
-      }
-    }
-
-    private void ItemDictionary_ItemRemoved(object sender, KeyValueEventArgs e) {
+      }
+    }
+
+    private void ItemDictionary_ItemRemoved(object sender, EventArgs<IItem, IItem> e) {
       if (InvokeRequired)
-        Invoke(new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemRemoved), sender, e);
+        Invoke(new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemRemoved), sender, e);
       else {
-        int index = listView.Items.IndexOfKey(e.Key.ToString());
+        int index = listView.Items.IndexOfKey(e.Value.ToString());
         listView.Items.RemoveAt(index);
-        e.Key.Changed -= new EventHandler(Item_Changed);
-        e.Value.Changed += new EventHandler(Item_Changed);
+        e.Value.Changed -= new EventHandler(Item_Changed);
+        e.Value2.Changed += new EventHandler(Item_Changed);
       }
     }