Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/10/09 16:50:26 (15 years ago)
Author:
swagner
Message:

Implemented generic EventArgs (#796)

Location:
trunk/sources/HeuristicLab.Data/3.3
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Data/3.3/ConstrainedItemList.cs

    r1823 r2474  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Common;
    2930
    3031namespace HeuristicLab.Data {
    … …  
    273274    /// Occurs when a new item is added.
    274275    /// </summary>
    275     public event EventHandler<ItemIndexEventArgs> ItemAdded;
     276    public event EventHandler<EventArgs<IItem, int>> ItemAdded;
    276277    /// <summary>
    277278    /// Fires a new <c>ItemAdded</c> event.
    … …  
    282283    protected virtual void OnItemAdded(IItem item, int index) {
    283284      if (ItemAdded != null)
    284         ItemAdded(this, new ItemIndexEventArgs(item, index));
     285        ItemAdded(this, new EventArgs<IItem, int>(item, index));
    285286      OnChanged();
    286287    }
    … …  
    288289    /// Occurs when an element is removed from the current instance.
    289290    /// </summary>
    290     public event EventHandler<ItemIndexEventArgs> ItemRemoved;
     291    public event EventHandler<EventArgs<IItem, int>> ItemRemoved;
    291292    /// <summary>
    292293    /// Fires a new <c>ItemRemoved</c> event.
    … …  
    297298    protected virtual void OnItemRemoved(IItem item, int index) {
    298299      if (ItemRemoved != null)
    299         ItemRemoved(this, new ItemIndexEventArgs(item, index));
     300        ItemRemoved(this, new EventArgs<IItem, int>(item, index));
    300301      OnChanged();
    301302    }

  • trunk/sources/HeuristicLab.Data/3.3/ConstrainedItemListView.cs

    r1529 r2474  
    2828using System.Windows.Forms;
    2929using HeuristicLab.Core;
     30using HeuristicLab.Common;
    3031
    3132namespace HeuristicLab.Data {
    … …  
    7172    /// </remarks>
    7273    protected override void RemoveItemEvents() {
    73       ConstrainedItemList.ItemAdded -= new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemAdded);
    74       ConstrainedItemList.ItemRemoved -= new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemRemoved);
     74      ConstrainedItemList.ItemAdded -= new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemAdded);
     75      ConstrainedItemList.ItemRemoved -= new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemRemoved);
    7576      ConstrainedItemList.Cleared -= new EventHandler(ConstrainedItemList_Cleared);
    7677      base.RemoveItemEvents();
    … …  
    8485    protected override void AddItemEvents() {
    8586      base.AddItemEvents();
    86       ConstrainedItemList.ItemAdded += new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemAdded);
    87       ConstrainedItemList.ItemRemoved += new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemRemoved);
     87      ConstrainedItemList.ItemAdded += new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemAdded);
     88      ConstrainedItemList.ItemRemoved += new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemRemoved);
    8889      ConstrainedItemList.Cleared += new EventHandler(ConstrainedItemList_Cleared);
    8990    }
    … …  
    135136
    136137    #region ConstrainedItemList changes
    137     void ConstrainedItemList_ItemAdded(object sender, ItemIndexEventArgs e) {
     138    void ConstrainedItemList_ItemAdded(object sender, EventArgs<IItem, int> e) {
    138139      if (InvokeRequired)
    139         Invoke(new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemAdded), sender, e);
     140        Invoke(new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemAdded), sender, e);
    140141      else {
    141142        ListViewItem item = new ListViewItem();
    142         item.Text = e.Item.ToString();
    143         item.Tag = e.Item;
    144         itemsListView.Items.Insert(e.Index, item);
    145         e.Item.Changed += new EventHandler(Item_Changed);
    146       }
    147     }
    148 
    149     void ConstrainedItemList_ItemRemoved(object sender, ItemIndexEventArgs e) {
     143        item.Text = e.Value.ToString();
     144        item.Tag = e.Value;
     145        itemsListView.Items.Insert(e.Value2, item);
     146        e.Value.Changed += new EventHandler(Item_Changed);
     147      }
     148    }
     149
     150    void ConstrainedItemList_ItemRemoved(object sender, EventArgs<IItem, int> e) {
    150151      if (InvokeRequired)
    151         Invoke(new EventHandler<ItemIndexEventArgs>(ConstrainedItemList_ItemRemoved), sender, e);
     152        Invoke(new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemRemoved), sender, e);
    152153      else {
    153         itemsListView.Items.RemoveAt(e.Index);
    154         e.Item.Changed -= new EventHandler(Item_Changed);
     154        itemsListView.Items.RemoveAt(e.Value2);
     155        e.Value.Changed -= new EventHandler(Item_Changed);
    155156      }
    156157    }

  • trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

    r1669 r2474  
    237237  </ItemGroup>
    238238  <ItemGroup>
     239    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
     240      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
     241      <Name>HeuristicLab.Common-3.2</Name>
     242    </ProjectReference>
    239243    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    240244      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>

  • trunk/sources/HeuristicLab.Data/3.3/HeuristicLabDataPlugin.cs

    r1674 r2474  
    3131  [ClassInfo(Name = "HeuristicLab.Data-3.3")]
    3232  [PluginFile(Filename = "HeuristicLab.Data-3.3.dll", Filetype = PluginFileType.Assembly)]
     33  [Dependency(Dependency = "HeuristicLab.Common-3.2")]
    3334  [Dependency(Dependency = "HeuristicLab.Core-3.3")]
    3435  [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]

  • trunk/sources/HeuristicLab.Data/3.3/ItemDictionaryView_T.cs

    r1529 r2474  
    77using System.Windows.Forms;
    88using HeuristicLab.Core;
     9using HeuristicLab.Common;
    910
    1011namespace HeuristicLab.Data {
    … …  
    7576    /// </remarks>
    7677    protected override void RemoveItemEvents() {
    77       ItemDictionary.ItemAdded -= new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemInserted);
    78       ItemDictionary.ItemRemoved -= new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemRemoved);
     78      ItemDictionary.ItemAdded -= new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemInserted);
     79      ItemDictionary.ItemRemoved -= new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemRemoved);
    7980      ItemDictionary.Cleared -= new EventHandler(ItemDictionary_Cleared);
    8081      base.RemoveItemEvents();
    … …  
    8889    protected override void AddItemEvents() {
    8990      base.AddItemEvents();
    90       ItemDictionary.ItemAdded += new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemInserted);
    91       ItemDictionary.ItemRemoved += new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemRemoved);
     91      ItemDictionary.ItemAdded += new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemInserted);
     92      ItemDictionary.ItemRemoved += new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemRemoved);
    9293      ItemDictionary.Cleared += new EventHandler(ItemDictionary_Cleared);
    9394    }
    … …  
    119120
    120121    #region Item and ItemDictionary Events
    121     private void ItemDictionary_ItemInserted(object sender, KeyValueEventArgs e) {
     122    private void ItemDictionary_ItemInserted(object sender, EventArgs<IItem, IItem> e) {
    122123      if (InvokeRequired)
    123         Invoke(new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemInserted), sender, e);
     124        Invoke(new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemInserted), sender, e);
    124125      else {
    125         ListViewItem item = CreateListViewItem((K) e.Key, (V) e.Value);
     126        ListViewItem item = CreateListViewItem((K) e.Value, (V) e.Value2);
    126127        listView.Items.Insert(listView.Items.Count, item);
    127         item.Name = e.Key.ToString();
     128        item.Name = e.Value.ToString();
     129        e.Value2.Changed += new EventHandler(Item_Changed);
    128130        e.Value.Changed += new EventHandler(Item_Changed);
    129         e.Key.Changed += new EventHandler(Item_Changed);
    130       }
    131     }
    132 
    133     private void ItemDictionary_ItemRemoved(object sender, KeyValueEventArgs e) {
     131      }
     132    }
     133
     134    private void ItemDictionary_ItemRemoved(object sender, EventArgs<IItem, IItem> e) {
    134135      if (InvokeRequired)
    135         Invoke(new EventHandler<KeyValueEventArgs>(ItemDictionary_ItemRemoved), sender, e);
     136        Invoke(new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemRemoved), sender, e);
    136137      else {
    137         int index = listView.Items.IndexOfKey(e.Key.ToString());
     138        int index = listView.Items.IndexOfKey(e.Value.ToString());
    138139        listView.Items.RemoveAt(index);
    139         e.Key.Changed -= new EventHandler(Item_Changed);
    140         e.Value.Changed += new EventHandler(Item_Changed);
     140        e.Value.Changed -= new EventHandler(Item_Changed);
     141        e.Value2.Changed += new EventHandler(Item_Changed);
    141142      }
    142143    }

  • trunk/sources/HeuristicLab.Data/3.3/ItemDictionary_T.cs

    r1823 r2474  
    66using HeuristicLab.Core;
    77using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     8using HeuristicLab.Common;
    89
    910namespace HeuristicLab.Data {
    … …  
    231232    /// Occurs when a new item is added to the dictionary.
    232233    /// </summary>
    233     public event EventHandler<KeyValueEventArgs> ItemAdded;
     234    public event EventHandler<EventArgs<IItem, IItem>> ItemAdded;
    234235    /// <summary>
    235236    /// Fires a new <c>ItemAdded</c> event.
    … …  
    240241    protected virtual void OnItemAdded(K key, V value) {
    241242      if (ItemAdded != null)
    242         ItemAdded(this, new KeyValueEventArgs(key, value));
     243        ItemAdded(this, new EventArgs<IItem, IItem>(key, value));
    243244      OnChanged();
    244245    }
    … …  
    247248    /// Occurs when an item is removed from the dictionary.
    248249    /// </summary>
    249     public event EventHandler<KeyValueEventArgs> ItemRemoved;
     250    public event EventHandler<EventArgs<IItem, IItem>> ItemRemoved;
    250251    /// <summary>
    251252    /// Fires a new <c>ItemRemoved</c> event.
    … …  
    256257    protected virtual void OnItemRemoved(K key, V value) {
    257258      if (ItemRemoved != null)
    258         ItemRemoved(this, new KeyValueEventArgs(key, value));
     259        ItemRemoved(this, new EventArgs<IItem, IItem>(key, value));
    259260      OnChanged();
    260261    }

  • trunk/sources/HeuristicLab.Data/3.3/ItemListView_T.cs

    r1609 r2474  
    2828using System.Windows.Forms;
    2929using HeuristicLab.Core;
     30using HeuristicLab.Common;
    3031
    3132namespace HeuristicLab.Data {
    … …  
    7172    /// </remarks>
    7273    protected override void RemoveItemEvents() {
    73       ItemList.ItemAdded -= new EventHandler<ItemIndexEventArgs>(ItemList_ItemInserted);
    74       ItemList.ItemRemoved -= new EventHandler<ItemIndexEventArgs>(ItemList_ItemRemoved);
     74      ItemList.ItemAdded -= new EventHandler<EventArgs<IItem, int>>(ItemList_ItemInserted);
     75      ItemList.ItemRemoved -= new EventHandler<EventArgs<IItem, int>>(ItemList_ItemRemoved);
    7576      ItemList.Cleared -= new EventHandler(ItemList_Cleared);
    7677      base.RemoveItemEvents();
    … …  
    8384    protected override void AddItemEvents() {
    8485      base.AddItemEvents();
    85       ItemList.ItemAdded += new EventHandler<ItemIndexEventArgs>(ItemList_ItemInserted);
    86       ItemList.ItemRemoved += new EventHandler<ItemIndexEventArgs>(ItemList_ItemRemoved);
     86      ItemList.ItemAdded += new EventHandler<EventArgs<IItem, int>>(ItemList_ItemInserted);
     87      ItemList.ItemRemoved += new EventHandler<EventArgs<IItem, int>>(ItemList_ItemRemoved);
    8788      ItemList.Cleared += new EventHandler(ItemList_Cleared);
    8889    }
    … …  
    226227
    227228    #region Item and Item List Events
    228     private void ItemList_ItemInserted(object sender, ItemIndexEventArgs e) {
     229    private void ItemList_ItemInserted(object sender, EventArgs<IItem, int> e) {
    229230      if(InvokeRequired)
    230         Invoke(new EventHandler<ItemIndexEventArgs>(ItemList_ItemInserted), sender, e);
     231        Invoke(new EventHandler<EventArgs<IItem, int>>(ItemList_ItemInserted), sender, e);
    231232      else {
    232233        ListViewItem item = new ListViewItem();
    233         item.Text = e.Item.ToString();
    234         item.Tag = e.Item;
    235         itemsListView.Items.Insert(e.Index, item);
    236         e.Item.Changed += new EventHandler(Item_Changed);
    237       }
    238     }
    239     private void ItemList_ItemRemoved(object sender, ItemIndexEventArgs e) {
     234        item.Text = e.Value.ToString();
     235        item.Tag = e.Value;
     236        itemsListView.Items.Insert(e.Value2, item);
     237        e.Value.Changed += new EventHandler(Item_Changed);
     238      }
     239    }
     240    private void ItemList_ItemRemoved(object sender, EventArgs<IItem, int> e) {
    240241      if(InvokeRequired)
    241         Invoke(new EventHandler<ItemIndexEventArgs>(ItemList_ItemRemoved), sender, e);
     242        Invoke(new EventHandler<EventArgs<IItem, int>>(ItemList_ItemRemoved), sender, e);
    242243      else {
    243         itemsListView.Items.RemoveAt(e.Index);
    244         e.Item.Changed -= new EventHandler(Item_Changed);
     244        itemsListView.Items.RemoveAt(e.Value2);
     245        e.Value.Changed -= new EventHandler(Item_Changed);
    245246      }
    246247    }

  • trunk/sources/HeuristicLab.Data/3.3/ItemList_T.cs

    r1823 r2474  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Common;
    2930
    3031namespace HeuristicLab.Data {
    … …  
    333334    /// Occurs where a new item is added to the list.
    334335    /// </summary>
    335     public event EventHandler<ItemIndexEventArgs> ItemAdded;
     336    public event EventHandler<EventArgs<IItem, int>> ItemAdded;
    336337    /// <summary>
    337338    /// Fires a new <c>ItemAdded</c> event.
    … …  
    342343    protected virtual void OnItemAdded(IItem item, int index) {
    343344      if (ItemAdded != null)
    344         ItemAdded(this, new ItemIndexEventArgs(item, index));
     345        ItemAdded(this, new EventArgs<IItem, int>(item, index));
    345346      OnChanged();
    346347    }
    … …  
    348349    /// Occurs when an element is deleted from the list.
    349350    /// </summary>
    350     public event EventHandler<ItemIndexEventArgs> ItemRemoved;
     351    public event EventHandler<EventArgs<IItem, int>> ItemRemoved;
    351352    /// <summary>
    352353    /// Fires a new <c>ItemRemoved</c> event.
    … …  
    357358    protected virtual void OnItemRemoved(IItem item, int index) {
    358359      if (ItemRemoved != null)
    359         ItemRemoved(this, new ItemIndexEventArgs(item, index));
     360        ItemRemoved(this, new EventArgs<IItem, int>(item, index));
    360361      OnChanged();
    361362    }
Note: See TracChangeset for help on using the changeset viewer.