Changeset 2474 for trunk/sources/HeuristicLab.GP

Timestamp:

11/10/09 16:50:26 (14 years ago)

Author:

swagner

Message:

Implemented generic EventArgs (#796)

Location:

trunk/sources/HeuristicLab.GP/3.4

Files:

• GPOperatorGroup.cs (modified) (2 diffs)
• GPOperatorLibraryEditor.cs (modified) (4 diffs)
• HeuristicLab.GP-3.4.csproj (modified) (1 diff)
• HeuristicLabGPPlugin.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP/3.4/GPOperatorGroup.cs

@@ -30 +30 @@
 using HeuristicLab.Constraints;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.GP {
@@ -207 +208 @@
     }
 
-    public event EventHandler OperatorAdded;
-    public event EventHandler OperatorRemoved;
+    public event EventHandler<EventArgs<IOperator>> OperatorAdded;
+    public event EventHandler<EventArgs<IOperator>> OperatorRemoved;
 
     protected virtual void OnOperatorAdded(IOperator op) {
       if(OperatorAdded != null) {
-        OperatorAdded(this, new OperatorEventArgs(op));
+        OperatorAdded(this, new EventArgs<IOperator>(op));
       }
     }
     protected virtual void OnOperatorRemoved(IOperator op) {
       if(OperatorRemoved != null) {
-        OperatorRemoved(this, new OperatorEventArgs(op));
-      }
-    }
-  }
-
-  internal class OperatorEventArgs : EventArgs {
-    public IOperator op;
-
-    public OperatorEventArgs(IOperator op) {
-      this.op = op;
+        OperatorRemoved(this, new EventArgs<IOperator>(op));
+      }
     }
   }

trunk/sources/HeuristicLab.GP/3.4/GPOperatorLibraryEditor.cs

@@ -33 +33 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Random;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.GP {
@@ -47 +48 @@
       operatorLibraryEditor.OperatorLibrary = library;
 
-      library.GPOperatorGroup.OperatorAdded += new EventHandler(GPOperatorLibraryView_OperatorAdded);
-      library.GPOperatorGroup.OperatorRemoved += new EventHandler(GPOperatorGroup_OperatorRemoved);
+      library.GPOperatorGroup.OperatorAdded += new EventHandler<EventArgs<IOperator>>(GPOperatorLibraryView_OperatorAdded);
+      library.GPOperatorGroup.OperatorRemoved += new EventHandler<EventArgs<IOperator>>(GPOperatorGroup_OperatorRemoved);
 
       mutationVariableView.Enabled = false;
@@ -72 +73 @@
 
 
-    private void GPOperatorLibraryView_OperatorAdded(object sender, EventArgs e) {
-      IOperator op = ((OperatorEventArgs)e).op;
+    private void GPOperatorLibraryView_OperatorAdded(object sender, EventArgs<IOperator> e) {
+      IOperator op = e.Value;
       if(op.GetVariable(FunctionBase.MANIPULATION) != null) {
         ListViewItem operatorMutationItem = new ListViewItem();
@@ -113 +114 @@
 
 
-    private void GPOperatorGroup_OperatorRemoved(object sender, EventArgs e) {
-      IOperator op = ((OperatorEventArgs)e).op;
+    private void GPOperatorGroup_OperatorRemoved(object sender, EventArgs<IOperator> e) {
+      IOperator op = e.Value;
 
       foreach(ListViewItem item in mutationListView.Items) {

trunk/sources/HeuristicLab.GP/3.4/HeuristicLab.GP-3.4.csproj

@@ -128 +128 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
+      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
+      <Name>HeuristicLab.Common-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Constraints\3.3\HeuristicLab.Constraints-3.3.csproj">
       <Project>{19C1E42A-4B48-4EFD-B697-899016F1C198}</Project>

trunk/sources/HeuristicLab.GP/3.4/HeuristicLabGPPlugin.cs

@@ -28 +28 @@
   [ClassInfo(Name = "HeuristicLab.GP-3.4")]
   [PluginFile(Filename = "HeuristicLab.GP-3.4.dll", Filetype = PluginFileType.Assembly)]
+  [Dependency(Dependency = "HeuristicLab.Common-3.2")]
   [Dependency(Dependency = "HeuristicLab.Constraints-3.3")]
   [Dependency(Dependency = "HeuristicLab.Core-3.3")]