Changeset 2474 for trunk/sources/HeuristicLab.ES/3.2

Timestamp:

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

Author:

swagner

Message:

Implemented generic EventArgs (#796)

Location:

trunk/sources/HeuristicLab.ES/3.2

Files:

• ESEditor.cs (modified) (4 diffs)
• HeuristicLab.ES-3.2.csproj (modified) (1 diff)
• HeuristicLabESPlugin.cs (modified) (1 diff)

trunk/sources/HeuristicLab.ES/3.2/ESEditor.cs

@@ -28 +28 @@
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -110 +111 @@
     /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="EditorBase"/>.</remarks>
     protected override void RemoveItemEvents() {
-      ES.Engine.ExceptionOccurred -= new EventHandler<ExceptionEventArgs>(Engine_ExceptionOccurred);
+      ES.Engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       ES.Engine.Finished -= new EventHandler(Engine_Finished);
       ES.Changed -= new EventHandler(ES_Changed);
@@ -122 +123 @@
     protected override void AddItemEvents() {
       base.AddItemEvents();
-      ES.Engine.ExceptionOccurred += new EventHandler<ExceptionEventArgs>(Engine_ExceptionOccurred);
+      ES.Engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       ES.Engine.Finished += new EventHandler(Engine_Finished);
       ES.Changed += new EventHandler(ES_Changed);
@@ -242 +243 @@
 
     #region Engine Events
-    private delegate void OnExceptionEventDelegate(object sender, ExceptionEventArgs e);
-    private void Engine_ExceptionOccurred(object sender, ExceptionEventArgs e) {
+    private delegate void OnExceptionEventDelegate(object sender, EventArgs<Exception> e);
+    private void Engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       if (InvokeRequired)
         Invoke(new OnExceptionEventDelegate(Engine_ExceptionOccurred), sender, e);
       else
-        Auxiliary.ShowErrorMessageBox(e.Exception);
+        Auxiliary.ShowErrorMessageBox(e.Value);
     }
     private void Engine_Finished(object sender, EventArgs e) {

trunk/sources/HeuristicLab.ES/3.2/HeuristicLab.ES-3.2.csproj

@@ -104 +104 @@
   </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.Core\3.2\HeuristicLab.Core-3.2.csproj">
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>

trunk/sources/HeuristicLab.ES/3.2/HeuristicLabESPlugin.cs

@@ -31 +31 @@
   [ClassInfo(Name = "HeuristicLab.ES-3.2")]
   [PluginFile(Filename = "HeuristicLab.ES-3.2.dll", Filetype = PluginFileType.Assembly)]
+  [Dependency(Dependency = "HeuristicLab.Common-3.2")]
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
   [Dependency(Dependency = "HeuristicLab.Data-3.2")]