Changeset 2474 for trunk/sources/HeuristicLab.Data/3.3
- Timestamp:
- 11/10/09 16:50:26 (15 years ago)
- Location:
- trunk/sources/HeuristicLab.Data/3.3
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Data/3.3/ConstrainedItemList.cs
r1823 r2474 27 27 using HeuristicLab.Core; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HeuristicLab.Common; 29 30 30 31 namespace HeuristicLab.Data { … … 273 274 /// Occurs when a new item is added. 274 275 /// </summary> 275 public event EventHandler< ItemIndexEventArgs> ItemAdded;276 public event EventHandler<EventArgs<IItem, int>> ItemAdded; 276 277 /// <summary> 277 278 /// Fires a new <c>ItemAdded</c> event. … … 282 283 protected virtual void OnItemAdded(IItem item, int index) { 283 284 if (ItemAdded != null) 284 ItemAdded(this, new ItemIndexEventArgs(item, index));285 ItemAdded(this, new EventArgs<IItem, int>(item, index)); 285 286 OnChanged(); 286 287 } … … 288 289 /// Occurs when an element is removed from the current instance. 289 290 /// </summary> 290 public event EventHandler< ItemIndexEventArgs> ItemRemoved;291 public event EventHandler<EventArgs<IItem, int>> ItemRemoved; 291 292 /// <summary> 292 293 /// Fires a new <c>ItemRemoved</c> event. … … 297 298 protected virtual void OnItemRemoved(IItem item, int index) { 298 299 if (ItemRemoved != null) 299 ItemRemoved(this, new ItemIndexEventArgs(item, index));300 ItemRemoved(this, new EventArgs<IItem, int>(item, index)); 300 301 OnChanged(); 301 302 } -
trunk/sources/HeuristicLab.Data/3.3/ConstrainedItemListView.cs
r1529 r2474 28 28 using System.Windows.Forms; 29 29 using HeuristicLab.Core; 30 using HeuristicLab.Common; 30 31 31 32 namespace HeuristicLab.Data { … … 71 72 /// </remarks> 72 73 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); 75 76 ConstrainedItemList.Cleared -= new EventHandler(ConstrainedItemList_Cleared); 76 77 base.RemoveItemEvents(); … … 84 85 protected override void AddItemEvents() { 85 86 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); 88 89 ConstrainedItemList.Cleared += new EventHandler(ConstrainedItemList_Cleared); 89 90 } … … 135 136 136 137 #region ConstrainedItemList changes 137 void ConstrainedItemList_ItemAdded(object sender, ItemIndexEventArgse) {138 void ConstrainedItemList_ItemAdded(object sender, EventArgs<IItem, int> e) { 138 139 if (InvokeRequired) 139 Invoke(new EventHandler< ItemIndexEventArgs>(ConstrainedItemList_ItemAdded), sender, e);140 Invoke(new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemAdded), sender, e); 140 141 else { 141 142 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, ItemIndexEventArgse) {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) { 150 151 if (InvokeRequired) 151 Invoke(new EventHandler< ItemIndexEventArgs>(ConstrainedItemList_ItemRemoved), sender, e);152 Invoke(new EventHandler<EventArgs<IItem, int>>(ConstrainedItemList_ItemRemoved), sender, e); 152 153 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); 155 156 } 156 157 } -
trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj
r1669 r2474 237 237 </ItemGroup> 238 238 <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> 239 243 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj"> 240 244 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project> -
trunk/sources/HeuristicLab.Data/3.3/HeuristicLabDataPlugin.cs
r1674 r2474 31 31 [ClassInfo(Name = "HeuristicLab.Data-3.3")] 32 32 [PluginFile(Filename = "HeuristicLab.Data-3.3.dll", Filetype = PluginFileType.Assembly)] 33 [Dependency(Dependency = "HeuristicLab.Common-3.2")] 33 34 [Dependency(Dependency = "HeuristicLab.Core-3.3")] 34 35 [Dependency(Dependency = "HeuristicLab.Persistence-3.3")] -
trunk/sources/HeuristicLab.Data/3.3/ItemDictionaryView_T.cs
r1529 r2474 7 7 using System.Windows.Forms; 8 8 using HeuristicLab.Core; 9 using HeuristicLab.Common; 9 10 10 11 namespace HeuristicLab.Data { … … 75 76 /// </remarks> 76 77 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); 79 80 ItemDictionary.Cleared -= new EventHandler(ItemDictionary_Cleared); 80 81 base.RemoveItemEvents(); … … 88 89 protected override void AddItemEvents() { 89 90 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); 92 93 ItemDictionary.Cleared += new EventHandler(ItemDictionary_Cleared); 93 94 } … … 119 120 120 121 #region Item and ItemDictionary Events 121 private void ItemDictionary_ItemInserted(object sender, KeyValueEventArgse) {122 private void ItemDictionary_ItemInserted(object sender, EventArgs<IItem, IItem> e) { 122 123 if (InvokeRequired) 123 Invoke(new EventHandler< KeyValueEventArgs>(ItemDictionary_ItemInserted), sender, e);124 Invoke(new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemInserted), sender, e); 124 125 else { 125 ListViewItem item = CreateListViewItem((K) e. Key, (V) e.Value);126 ListViewItem item = CreateListViewItem((K) e.Value, (V) e.Value2); 126 127 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); 128 130 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) { 134 135 if (InvokeRequired) 135 Invoke(new EventHandler< KeyValueEventArgs>(ItemDictionary_ItemRemoved), sender, e);136 Invoke(new EventHandler<EventArgs<IItem, IItem>>(ItemDictionary_ItemRemoved), sender, e); 136 137 else { 137 int index = listView.Items.IndexOfKey(e. Key.ToString());138 int index = listView.Items.IndexOfKey(e.Value.ToString()); 138 139 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); 141 142 } 142 143 } -
trunk/sources/HeuristicLab.Data/3.3/ItemDictionary_T.cs
r1823 r2474 6 6 using HeuristicLab.Core; 7 7 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 8 using HeuristicLab.Common; 8 9 9 10 namespace HeuristicLab.Data { … … 231 232 /// Occurs when a new item is added to the dictionary. 232 233 /// </summary> 233 public event EventHandler< KeyValueEventArgs> ItemAdded;234 public event EventHandler<EventArgs<IItem, IItem>> ItemAdded; 234 235 /// <summary> 235 236 /// Fires a new <c>ItemAdded</c> event. … … 240 241 protected virtual void OnItemAdded(K key, V value) { 241 242 if (ItemAdded != null) 242 ItemAdded(this, new KeyValueEventArgs(key, value));243 ItemAdded(this, new EventArgs<IItem, IItem>(key, value)); 243 244 OnChanged(); 244 245 } … … 247 248 /// Occurs when an item is removed from the dictionary. 248 249 /// </summary> 249 public event EventHandler< KeyValueEventArgs> ItemRemoved;250 public event EventHandler<EventArgs<IItem, IItem>> ItemRemoved; 250 251 /// <summary> 251 252 /// Fires a new <c>ItemRemoved</c> event. … … 256 257 protected virtual void OnItemRemoved(K key, V value) { 257 258 if (ItemRemoved != null) 258 ItemRemoved(this, new KeyValueEventArgs(key, value));259 ItemRemoved(this, new EventArgs<IItem, IItem>(key, value)); 259 260 OnChanged(); 260 261 } -
trunk/sources/HeuristicLab.Data/3.3/ItemListView_T.cs
r1609 r2474 28 28 using System.Windows.Forms; 29 29 using HeuristicLab.Core; 30 using HeuristicLab.Common; 30 31 31 32 namespace HeuristicLab.Data { … … 71 72 /// </remarks> 72 73 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); 75 76 ItemList.Cleared -= new EventHandler(ItemList_Cleared); 76 77 base.RemoveItemEvents(); … … 83 84 protected override void AddItemEvents() { 84 85 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); 87 88 ItemList.Cleared += new EventHandler(ItemList_Cleared); 88 89 } … … 226 227 227 228 #region Item and Item List Events 228 private void ItemList_ItemInserted(object sender, ItemIndexEventArgse) {229 private void ItemList_ItemInserted(object sender, EventArgs<IItem, int> e) { 229 230 if(InvokeRequired) 230 Invoke(new EventHandler< ItemIndexEventArgs>(ItemList_ItemInserted), sender, e);231 Invoke(new EventHandler<EventArgs<IItem, int>>(ItemList_ItemInserted), sender, e); 231 232 else { 232 233 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, ItemIndexEventArgse) {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) { 240 241 if(InvokeRequired) 241 Invoke(new EventHandler< ItemIndexEventArgs>(ItemList_ItemRemoved), sender, e);242 Invoke(new EventHandler<EventArgs<IItem, int>>(ItemList_ItemRemoved), sender, e); 242 243 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); 245 246 } 246 247 } -
trunk/sources/HeuristicLab.Data/3.3/ItemList_T.cs
r1823 r2474 27 27 using HeuristicLab.Core; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HeuristicLab.Common; 29 30 30 31 namespace HeuristicLab.Data { … … 333 334 /// Occurs where a new item is added to the list. 334 335 /// </summary> 335 public event EventHandler< ItemIndexEventArgs> ItemAdded;336 public event EventHandler<EventArgs<IItem, int>> ItemAdded; 336 337 /// <summary> 337 338 /// Fires a new <c>ItemAdded</c> event. … … 342 343 protected virtual void OnItemAdded(IItem item, int index) { 343 344 if (ItemAdded != null) 344 ItemAdded(this, new ItemIndexEventArgs(item, index));345 ItemAdded(this, new EventArgs<IItem, int>(item, index)); 345 346 OnChanged(); 346 347 } … … 348 349 /// Occurs when an element is deleted from the list. 349 350 /// </summary> 350 public event EventHandler< ItemIndexEventArgs> ItemRemoved;351 public event EventHandler<EventArgs<IItem, int>> ItemRemoved; 351 352 /// <summary> 352 353 /// Fires a new <c>ItemRemoved</c> event. … … 357 358 protected virtual void OnItemRemoved(IItem item, int index) { 358 359 if (ItemRemoved != null) 359 ItemRemoved(this, new ItemIndexEventArgs(item, index));360 ItemRemoved(this, new EventArgs<IItem, int>(item, index)); 360 361 OnChanged(); 361 362 }
Note: See TracChangeset
for help on using the changeset viewer.