Changeset 993 for trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

Timestamp:

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

Author:

kgrading

Message:

refactored for #437

File:

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

trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

@@ -8 +8 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Client.Common;
+using HeuristicLab.Hive.Client.Communication.ServerService;
 
 namespace HeuristicLab.Hive.Client.Communication {
@@ -29 +30 @@
     public event EventHandler ServerChanged;    
 
-    private ClientCommunicatorClient proxy = null;
+    public ClientCommunicatorClient proxy = null;
 
     private WcfService() {
@@ -51 +52 @@
           ConnectionRestored(this, new EventArgs());
         ConnState = NetworkEnum.WcfConnState.Connected;
-        ConnectedSince = DateTime.Now;
+        ConnectedSince = DateTime.Now;        
       }
       catch (Exception ex) {
@@ -59 +60 @@
 
     public void Connect(String serverIP, int serverPort) {
-      if(this.ServerIP != serverIP || this.ServerPort != ServerPort)
-        ServerChanged(this, new EventArgs());
+      String oldIp = this.ServerIP;
+      int oldPort = this.ServerPort;
       this.ServerIP = serverIP;
       this.ServerPort = serverPort;      
       Connect();
+      if (oldIp != serverIP || oldPort != ServerPort)
+        ServerChanged(this, new EventArgs());
     }
 
@@ -107 +110 @@
     public void SendJobResultAsync(JobResult result, bool finished) {
       if (ConnState == NetworkEnum.WcfConnState.Connected)
-        proxy.SendJobResult(result, finished);
+        proxy.SendJobResultAsync(result, finished);
     }
     private void proxy_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {