Skip to content
Snippets Groups Projects
Commit 8c4a9eba authored by Pierre Roussel's avatar Pierre Roussel Committed by Louis Greiner
Browse files

Porting code from data to dev

parent 328e1fb1
No related branches found
No related tags found
6 merge requests!104devV2 comm,!62Feature - Rejoindre Partie,!61Modification de la classe Comm_calls_Data_Server_Impl afin que...,!53feat : Intégration IHM-Main,!52Dev,!47Porting code from data to dev
No preview for this file type
<Application x:Class="Client.App"
<Application x:Class="Client.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Client"
Startup="App_Startup"
StartupUri="MainWindow.xaml">
<Application.Resources>
</Application.Resources>
</Application>
......@@ -34,7 +34,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
......
......@@ -6,7 +6,6 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
namespace Client.data
{
internal class DataCore
......@@ -25,4 +24,4 @@ namespace Client.data
}
}
}
\ No newline at end of file
}
......@@ -18,7 +18,7 @@ namespace Client.data
public Comm_calls_Data_Client_impl getImplInterfaceForComm()
{
return implInterfaceForComm;
return this.implInterfaceForComm;
}
}
}
......@@ -12,12 +12,12 @@ namespace Server.Data
public Data_Server_ctrl()
{
implInterfaceForComm = new Comm_calls_Data_Server_Impl();
this.implInterfaceForComm = new Comm_calls_Data_Server_Impl();
}
public Comm_calls_Data_Server_Impl getImplInterfaceForComm()
{
return implInterfaceForComm;
return this.implInterfaceForComm;
}
}
}
\ No newline at end of file
}
......@@ -4,7 +4,6 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Shared.interfaces
{
public interface Interface_Comm_calls_Data_Client
......
......@@ -3,13 +3,16 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Shared.data;
namespace Shared.interfaces
{
public interface Interface_Comm_calls_Data_Server
{
LightUser getUser();
List<LightUser> registerUser(LightUser lightUser);
void removeUser(int idJoueur);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment