Changeset 4254 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

Timestamp:

08/18/10 17:23:09 (14 years ago)

Author:

cneumuel

Message:

some small refactorings (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs (modified) (7 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Communication/3.3/WcfService.cs

@@ -66 +66 @@
     public event EventHandler Connected;
 
-    public ClientFacadeClient proxy = null;
+    public SlaveFacadeClient proxy = null;
 
     /// <summary>
@@ -87 +87 @@
 
         Logger.Debug("Creating the new connection proxy");
-        proxy = new ClientFacadeClient(
+        proxy = new SlaveFacadeClient(
           HeuristicLab.Hive.Contracts.WcfSettings.GetStreamedBinding(),
           new EndpointAddress("net.tcp://" + ServerIP + ":" + ServerPort + "/HiveServer/ClientCommunicator")
@@ -204 +204 @@
     /// </summary>
     #region PullJob
-    public event System.EventHandler<SendJobCompletedEventArgs> SendJobCompleted;
+    public event System.EventHandler<GetJobCompletedEventArgs> SendJobCompleted;
     public void SendJobAsync(Guid guid) {
       if (ConnState == NetworkEnum.WcfConnState.Loggedin) {
@@ -223 +223 @@
           //first deserialize the response
           BinaryFormatter formatter = new BinaryFormatter();
-          ResponseJob response = (ResponseJob)formatter.Deserialize(stream);
+          ResponseObject<JobDto> response = (ResponseObject<JobDto>)formatter.Deserialize(stream);
 
           //second deserialize the BLOB
@@ -236 +236 @@
           memStream.Close();
 
-          SendJobCompletedEventArgs completedEventArgs = new SendJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
+          GetJobCompletedEventArgs completedEventArgs = new GetJobCompletedEventArgs(new object[] { response, memStream.GetBuffer() }, e.Error, e.Cancelled, e.UserState);
           SendJobCompleted(sender, completedEventArgs);
         } catch (Exception ex) {
@@ -390 +390 @@
     }
 
-    public List<HeuristicLab.PluginInfrastructure.CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
+    public IEnumerable<CachedHivePluginInfoDto> RequestPlugins(List<HivePluginInfoDto> requestedPlugins) {
       try {
         Logger.Debug("STARTED: Requesting Plugins for Job");
@@ -396 +396 @@
         Stream stream = proxy.SendStreamedPlugins(requestedPlugins.ToArray());
         Logger.Debug("ENDED: Getting the stream");
-        BinaryFormatter formatter =
-          new BinaryFormatter();
+        BinaryFormatter formatter = new BinaryFormatter();
         Logger.Debug("STARTED: Deserializing the stream");
-        ResponsePlugin response = (ResponsePlugin)formatter.Deserialize(stream);
+        ResponseList<CachedHivePluginInfoDto> response = (ResponseList<CachedHivePluginInfoDto>)formatter.Deserialize(stream);
         Logger.Debug("ENDED: Deserializing the stream");
         if (stream != null)
           stream.Dispose();
-        return response.Plugins;
+        return response.List;
       } catch (Exception e) {
         HandleNetworkError(e);