Changeset 993 for trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

Timestamp:

12/15/08 19:13:28 (16 years ago)

Author:

kgrading

Message:

refactored for #437

File:

• trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -41 +41 @@
 using HeuristicLab.Hive.Client.Core.ClientConsoleService;
 using HeuristicLab.Hive.Client.Core.ConfigurationManager;
+using HeuristicLab.Hive.Client.Communication.ServerService;
 
 
@@ -51 +52 @@
     Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
 
+    private ClientCommunicatorClient ccc;
     private WcfService wcfService;
 
@@ -66 +68 @@
         wcfService.Connect(cc.IPAdress, cc.Port);
       }
+
       wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
       wcfService.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(wcfService_PullJobCompleted);
-      wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
+      wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);      
       wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
       wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
-
-      wcfService.LoginAsync(ConfigManager.Instance.GetClientInfo());
-
+       
       Heartbeat beat = new Heartbeat { Interval = 10000 };
       beat.StartHeartbeat();     
@@ -120 +121 @@
       
       JobResult jobResult = new JobResult { JobId = jId, Result = sJob, Client = ConfigManager.Instance.GetClientInfo() };
-      wcfService.SendJobResultAsync(jobResult, true);
+      wcfService.SendJobResultAsync(jobResult, true);      
     }
 
@@ -180 +181 @@
       appDomains = new Dictionary<long, AppDomain>();
       engines = new Dictionary<long, Executor>();
+      wcfService.LoginAsync(ConfigManager.Instance.GetClientInfo());
     }