# HG changeset patch
# User sl
# Date 1411298152 -7200
# Node ID b5ed2e29be233b94bd43869bf1f637732f356426
# Parent  fdda7642776af07fdf9751308535ad4930613160
Renaming stuff.

diff -r fdda7642776a -r b5ed2e29be23 Client/Client.cs
--- a/Client/Client.cs	Mon Sep 01 19:23:36 2014 +0200
+++ b/Client/Client.cs	Sun Sep 21 13:15:52 2014 +0200
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using SharpDisplayInterface;
+using SharpDisplay;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 
@@ -15,7 +15,7 @@
     ///
     /// </summary>
     [ServiceBehavior(ConcurrencyMode = ConcurrencyMode.Multiple)]
-    public class Callback : IDisplayServiceCallback, IDisposable
+    public class Callback : ICallback, IDisposable
     {
         private MainForm MainForm { get; set; }
 
@@ -55,7 +55,7 @@
     ///
     /// </summary>
     [ServiceBehavior(ConcurrencyMode = ConcurrencyMode.Multiple)]
-    public class Client : DuplexClientBase<IDisplayService>
+    public class Client : DuplexClientBase<IService>
     {
         public string Name { get; set; }
         public string SessionId { get { return InnerChannel.SessionId; } }
diff -r fdda7642776a -r b5ed2e29be23 Client/MainForm.cs
--- a/Client/MainForm.cs	Mon Sep 01 19:23:36 2014 +0200
+++ b/Client/MainForm.cs	Sun Sep 21 13:15:52 2014 +0200
@@ -10,7 +10,7 @@
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.Diagnostics;
-using SharpDisplayInterface;
+using SharpDisplay;
 
 
 namespace SharpDisplayClient
diff -r fdda7642776a -r b5ed2e29be23 Interface/Interface.cs
--- a/Interface/Interface.cs	Mon Sep 01 19:23:36 2014 +0200
+++ b/Interface/Interface.cs	Sun Sep 21 13:15:52 2014 +0200
@@ -9,7 +9,7 @@
 using System.Runtime.Serialization;
 
 
-namespace SharpDisplayInterface
+namespace SharpDisplay
 {
     [DataContract]
     public class TextField
@@ -39,9 +39,8 @@
     }
 
 
-    [ServiceContract(   CallbackContract = typeof(IDisplayServiceCallback),
-                        SessionMode = SessionMode.Required)]
-    public interface IDisplayService
+    [ServiceContract(   CallbackContract = typeof(ICallback), SessionMode = SessionMode.Required)]
+    public interface IService
     {
         /// <summary>
         /// Set the name of this client.
@@ -78,7 +77,7 @@
     }
 
 
-    public interface IDisplayServiceCallback
+    public interface ICallback
     {
         [OperationContract(IsOneWay = true)]
         void OnConnected();
diff -r fdda7642776a -r b5ed2e29be23 Server/MainForm.cs
--- a/Server/MainForm.cs	Mon Sep 01 19:23:36 2014 +0200
+++ b/Server/MainForm.cs	Sun Sep 21 13:15:52 2014 +0200
@@ -14,9 +14,8 @@
 using System.Threading;
 using System.Diagnostics;
 //
-using SharpDisplayInterface;
 using SharpDisplayClient;
-
+using SharpDisplay;
 
 namespace SharpDisplayManager
 {
@@ -490,11 +489,11 @@
         {
             iServiceHost = new ServiceHost
                 (
-                    typeof(DisplayServer),
+                    typeof(Session),
                     new Uri[] { new Uri("net.tcp://localhost:8001/") }
                 );
 
-            iServiceHost.AddServiceEndpoint(typeof(IDisplayService), new NetTcpBinding(SecurityMode.None,true), "DisplayService");
+            iServiceHost.AddServiceEndpoint(typeof(IService), new NetTcpBinding(SecurityMode.None, true), "DisplayService");
             iServiceHost.Open();
         }
 
@@ -583,7 +582,7 @@
         }
 
         //Delegates are used for our thread safe method
-        public delegate void AddClientDelegate(string aSessionId, IDisplayServiceCallback aCallback);
+        public delegate void AddClientDelegate(string aSessionId, ICallback aCallback);
         public delegate void RemoveClientDelegate(string aSessionId);
         public delegate void SetTextDelegate(string SessionId, TextField aTextField);
         public delegate void SetTextsDelegate(string SessionId, System.Collections.Generic.IList<TextField> aTextFields);
@@ -595,7 +594,7 @@
         /// </summary>
         /// <param name="aSessionId"></param>
         /// <param name="aCallback"></param>
-        public void AddClientThreadSafe(string aSessionId, IDisplayServiceCallback aCallback)
+        public void AddClientThreadSafe(string aSessionId, ICallback aCallback)
         {
             if (this.InvokeRequired)
             {
@@ -948,7 +947,7 @@
     /// </summary>
     public class ClientData
     {
-        public ClientData(string aSessionId, IDisplayServiceCallback aCallback)
+        public ClientData(string aSessionId, ICallback aCallback)
         {
             SessionId = aSessionId;
             Name = "";
@@ -959,6 +958,6 @@
         public string SessionId { get; set; }
         public string Name { get; set; }
         public List<TextField> Texts { get; set; }
-        public IDisplayServiceCallback Callback { get; set; }
+        public ICallback Callback { get; set; }
     }
 }
diff -r fdda7642776a -r b5ed2e29be23 Server/Servers.cs
--- a/Server/Servers.cs	Mon Sep 01 19:23:36 2014 +0200
+++ b/Server/Servers.cs	Sun Sep 21 13:15:52 2014 +0200
@@ -4,58 +4,58 @@
 using System.ServiceModel;
 using System.Collections.Generic;
 using System.Linq;
-using SharpDisplayInterface;
 using System.Diagnostics;
+using SharpDisplay;
 
-namespace SharpDisplayManager
+namespace SharpDisplay
 {
     /// <summary>
-    /// Implement our display service.
-    /// This class is instantiated anew whenever a client send a request.
+    /// Implement our display services.
+    /// Each client connection has such a session object server side.
     /// </summary>
     [ServiceBehavior(   
                         ConcurrencyMode = ConcurrencyMode.Multiple,
                         InstanceContextMode = InstanceContextMode.PerSession                       
                     )]
-    class DisplayServer : IDisplayService, IDisposable
+    class Session : IService, IDisposable
     {
         public string SessionId { get; set; }
         public string Name { get; set; }
 
-        DisplayServer()
+        Session()
         {
             Trace.TraceInformation("Server session opening.");
             //First save our session ID. It will be needed in Dispose cause our OperationContxt won't be available then.
             SessionId = OperationContext.Current.SessionId;
-            IDisplayServiceCallback callback = OperationContext.Current.GetCallbackChannel<IDisplayServiceCallback>();
+            ICallback callback = OperationContext.Current.GetCallbackChannel<ICallback>();
             //
-            Program.iMainForm.AddClientThreadSafe(SessionId,callback);
+            SharpDisplayManager.Program.iMainForm.AddClientThreadSafe(SessionId,callback);
 
         }
 
         public void Dispose()
         {
             Trace.TraceInformation("Server session closing.");
-            Program.iMainForm.RemoveClientThreadSafe(SessionId);
+            SharpDisplayManager.Program.iMainForm.RemoveClientThreadSafe(SessionId);
         }
         
         //From IDisplayService
         public void SetTexts(System.Collections.Generic.IList<TextField> aTextFields)
         {
-            Program.iMainForm.SetTextsThreadSafe(SessionId, aTextFields);
+            SharpDisplayManager.Program.iMainForm.SetTextsThreadSafe(SessionId, aTextFields);
         }
 
         //
         public void SetText(TextField aTextField)
         {
-            Program.iMainForm.SetTextThreadSafe(SessionId, aTextField);
+            SharpDisplayManager.Program.iMainForm.SetTextThreadSafe(SessionId, aTextField);
         }
 
         //
         public void SetName(string aClientName)
         {
             Name = aClientName;
-            Program.iMainForm.SetClientNameThreadSafe(SessionId, Name);
+            SharpDisplayManager.Program.iMainForm.SetClientNameThreadSafe(SessionId, Name);
             //Disconnect(aClientName);
 
             //Register our client and its callback interface
@@ -69,7 +69,7 @@
         ///
         public int ClientCount()
         {
-            return Program.iMainForm.iClients.Count;
+            return SharpDisplayManager.Program.iMainForm.iClients.Count;
         }