Changeset 4320 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs

Timestamp:

08/25/10 17:46:07 (14 years ago)

Author:

cneumuel

Message:

made slave-console service configurable via xml

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs (modified) (6 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Slave.Console/3.3/HiveSlaveConsole.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Net;
-using System.ServiceModel;
 using System.Windows.Forms;
-using HeuristicLab.Hive.Slave.Console.SlaveService;
+using System.Xml.Serialization;
+using HeuristicLab.Calendar;
+using HeuristicLab.Hive.Slave.Console.SlaveConsoleService;
 using ZedGraph;
-using HeuristicLab.Hive.Contracts;
-using System.Xml.Serialization;
-using System.IO;
-using HeuristicLab.Calendar;
 
 namespace HeuristicLab.Hive.Slave.Console {
@@ -53 +49 @@
 
     #region Declarations
-
-    private const string ENDPOINTADRESS = "net.tcp://127.0.0.1:8000/SlaveConsole/SlaveConsoleCommunicator";
-
     private static bool isfired = false;
     //the logfilereader
@@ -94 +87 @@
     private void ConnectToSlave() {
       try {
-        slaveCommunicator = new SlaveConsoleCommunicatorClient(WcfSettings.GetBinding(), new EndpointAddress(ENDPOINTADRESS));
+        slaveCommunicator = new SlaveConsoleCommunicatorClient();
+
         slaveCommunicator.GetStatusInfosCompleted += new EventHandler<GetStatusInfosCompletedEventArgs>(slaveCommunicator_GetStatusInfosCompleted);
         slaveCommunicator.GetCurrentConnectionCompleted += new EventHandler<GetCurrentConnectionCompletedEventArgs>(slaveCommunicator_GetCurrentConnectionCompleted);
@@ -469 +463 @@
         ConnectionContainer curConnection = e.Result;
         tbIPAdress.Text = curConnection.IPAdress;
-        tbPort.Text = curConnection.Port.ToString();
       } else {
         ManageFatalException("Connection Error, check if Hive Slave is running!", "Connection Error", null);
@@ -504 +497 @@
         UpdateGraph(sc);
 
-        if (sc.Status == NetworkEnumWcfConnState.Connected || sc.Status == NetworkEnumWcfConnState.Loggedin) {
+        if (sc.Status == NetworkEnumWcfConnState.Connected) {
           btConnect.Enabled = false;
           btnDisconnect.Enabled = true;
@@ -546 +539 @@
     private void btConnect_Click(object sender, EventArgs e) {
       IPAddress ipAdress;
-      int port;
       ConnectionContainer cc = new ConnectionContainer();
-      if (IPAddress.TryParse(tbIPAdress.Text, out ipAdress) && int.TryParse(tbPort.Text, out port)) {
+      if (IPAddress.TryParse(tbIPAdress.Text, out ipAdress)) {
         cc.IPAdress = tbIPAdress.Text;
-        cc.Port = port;
         slaveCommunicator.SetConnectionAsync(cc);
       } else {