Changeset 2474 for trunk/sources/HeuristicLab.Core/3.3/OperatorBase.cs
- Timestamp:
- 11/10/09 16:50:26 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Core/3.3/OperatorBase.cs
r1823 r2474 25 25 using System.Xml; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HeuristicLab.Common; 27 28 28 29 namespace HeuristicLab.Core { … … 355 356 public virtual void AddVariable(IVariable variable) { 356 357 myVariables.Add(variable.Name, variable); 357 variable.NameChanging += new EventHandler< NameChangingEventArgs>(Variable_NameChanging);358 variable.NameChanging += new EventHandler<CancelEventArgs<string>>(Variable_NameChanging); 358 359 variable.NameChanged += new EventHandler(Variable_NameChanged); 359 360 OnVariableAdded(variable); … … 365 366 myVariables.Add(variable.Name, variable); 366 367 if (IsValid()) { 367 variable.NameChanging += new EventHandler< NameChangingEventArgs>(Variable_NameChanging);368 variable.NameChanging += new EventHandler<CancelEventArgs<string>>(Variable_NameChanging); 368 369 variable.NameChanged += new EventHandler(Variable_NameChanged); 369 370 OnVariableAdded(variable); … … 380 381 myVariables.Add(variable.Name, variable); 381 382 if (IsValid(out violatedConstraints)) { 382 variable.NameChanging += new EventHandler< NameChangingEventArgs>(Variable_NameChanging);383 variable.NameChanging += new EventHandler<CancelEventArgs<string>>(Variable_NameChanging); 383 384 variable.NameChanged += new EventHandler(Variable_NameChanged); 384 385 OnVariableAdded(variable); … … 395 396 IVariable variable; 396 397 if (myVariables.TryGetValue(name, out variable)) { 397 variable.NameChanging -= new EventHandler< NameChangingEventArgs>(Variable_NameChanging);398 variable.NameChanging -= new EventHandler<CancelEventArgs<string>>(Variable_NameChanging); 398 399 variable.NameChanged -= new EventHandler(Variable_NameChanged); 399 400 myVariables.Remove(name); … … 409 410 myVariables.Remove(name); 410 411 if (IsValid()) { 411 variable.NameChanging -= new EventHandler< NameChangingEventArgs>(Variable_NameChanging);412 variable.NameChanging -= new EventHandler<CancelEventArgs<string>>(Variable_NameChanging); 412 413 variable.NameChanged -= new EventHandler(Variable_NameChanged); 413 414 OnVariableRemoved(variable); … … 428 429 myVariables.Remove(name); 429 430 if (IsValid(out violatedConstraints)) { 430 variable.NameChanging -= new EventHandler< NameChangingEventArgs>(Variable_NameChanging);431 variable.NameChanging -= new EventHandler<CancelEventArgs<string>>(Variable_NameChanging); 431 432 variable.NameChanged -= new EventHandler(Variable_NameChanged); 432 433 OnVariableRemoved(variable); … … 440 441 return true; 441 442 } 442 private void Variable_NameChanging(object sender, NameChangingEventArgse) {443 e.Cancel = myVariables.ContainsKey(e. Name);443 private void Variable_NameChanging(object sender, CancelEventArgs<string> e) { 444 e.Cancel = myVariables.ContainsKey(e.Value); 444 445 } 445 446 private void Variable_NameChanged(object sender, EventArgs e) { … … 538 539 } 539 540 /// <inheritdoc/> 540 public event EventHandler< OperatorIndexEventArgs> SubOperatorAdded;541 public event EventHandler<EventArgs<IOperator, int>> SubOperatorAdded; 541 542 /// <summary> 542 543 /// Fires a new <c>SubOperatorAdded</c> event. … … 546 547 protected virtual void OnSubOperatorAdded(IOperator subOperator, int index) { 547 548 if (SubOperatorAdded != null) 548 SubOperatorAdded(this, new OperatorIndexEventArgs(subOperator, index));549 } 550 /// <inheritdoc/> 551 public event EventHandler< OperatorIndexEventArgs> SubOperatorRemoved;549 SubOperatorAdded(this, new EventArgs<IOperator, int>(subOperator, index)); 550 } 551 /// <inheritdoc/> 552 public event EventHandler<EventArgs<IOperator, int>> SubOperatorRemoved; 552 553 /// <summary> 553 554 /// Fires a new <c>SubOperatorRemoved</c> event. … … 557 558 protected virtual void OnSubOperatorRemoved(IOperator subOperator, int index) { 558 559 if (SubOperatorRemoved != null) 559 SubOperatorRemoved(this, new OperatorIndexEventArgs(subOperator, index));560 } 561 /// <inheritdoc/> 562 public event EventHandler< VariableInfoEventArgs> VariableInfoAdded;560 SubOperatorRemoved(this, new EventArgs<IOperator, int>(subOperator, index)); 561 } 562 /// <inheritdoc/> 563 public event EventHandler<EventArgs<IVariableInfo>> VariableInfoAdded; 563 564 /// <summary> 564 565 /// Fires a new <c>VariableInfoAdded</c> event. … … 567 568 protected virtual void OnVariableInfoAdded(IVariableInfo variableInfo) { 568 569 if (VariableInfoAdded != null) 569 VariableInfoAdded(this, new VariableInfoEventArgs(variableInfo));570 } 571 /// <inheritdoc/> 572 public event EventHandler< VariableInfoEventArgs> VariableInfoRemoved;570 VariableInfoAdded(this, new EventArgs<IVariableInfo>(variableInfo)); 571 } 572 /// <inheritdoc/> 573 public event EventHandler<EventArgs<IVariableInfo>> VariableInfoRemoved; 573 574 /// <summary> 574 575 /// Fires a new <c>VariableInfoRemoved</c> event. … … 577 578 protected virtual void OnVariableInfoRemoved(IVariableInfo variableInfo) { 578 579 if (VariableInfoRemoved != null) 579 VariableInfoRemoved(this, new VariableInfoEventArgs(variableInfo));580 } 581 /// <inheritdoc/> 582 public event EventHandler< VariableEventArgs> VariableAdded;580 VariableInfoRemoved(this, new EventArgs<IVariableInfo>(variableInfo)); 581 } 582 /// <inheritdoc/> 583 public event EventHandler<EventArgs<IVariable>> VariableAdded; 583 584 /// <summary> 584 585 /// Fires a new <c>VariableAdded</c> event. … … 587 588 protected virtual void OnVariableAdded(IVariable variable) { 588 589 if (VariableAdded != null) 589 VariableAdded(this, new VariableEventArgs(variable));590 } 591 /// <inheritdoc/> 592 public event EventHandler< VariableEventArgs> VariableRemoved;590 VariableAdded(this, new EventArgs<IVariable>(variable)); 591 } 592 /// <inheritdoc/> 593 public event EventHandler<EventArgs<IVariable>> VariableRemoved; 593 594 /// <summary> 594 595 /// Fires a new <c>VariableRemoved</c> event. … … 597 598 protected virtual void OnVariableRemoved(IVariable variable) { 598 599 if (VariableRemoved != null) 599 VariableRemoved(this, new VariableEventArgs(variable));600 VariableRemoved(this, new EventArgs<IVariable>(variable)); 600 601 } 601 602 /// <inheritdoc/>
Note: See TracChangeset
for help on using the changeset viewer.