diff --git a/Implementation/src/ChatApp.class b/Implementation/src/ChatApp.class index be374c0..416b24c 100644 Binary files a/Implementation/src/ChatApp.class and b/Implementation/src/ChatApp.class differ diff --git a/Implementation/src/ChatApp.java b/Implementation/src/ChatApp.java index b903eb2..bef047b 100644 --- a/Implementation/src/ChatApp.java +++ b/Implementation/src/ChatApp.java @@ -191,9 +191,13 @@ public class ChatApp { e.printStackTrace(); } - if(app.getMe().getPseudo()=="Marvel") { + if(app.getMe().getPseudo().equals("Marvel")) { + System.out.println("Tentative de connexion avec Doudou"); TCPEchange.demarrerSession(app, app.actifUsers.getPseudoList("Doudou")); } + else { + System.out.println("Je ne m'appelle pas Marvel!!!"); + } //app.modifierPseudo("Jean"); } diff --git a/Implementation/src/MessageHorodate.class b/Implementation/src/MessageHorodate.class index c3f2839..0e27976 100644 Binary files a/Implementation/src/MessageHorodate.class and b/Implementation/src/MessageHorodate.class differ diff --git a/Implementation/src/Runner.class b/Implementation/src/Runner.class index 3f6e0cc..27df8ff 100644 Binary files a/Implementation/src/Runner.class and b/Implementation/src/Runner.class differ diff --git a/Implementation/src/RunnerTCPEcoute.class b/Implementation/src/RunnerTCPEcoute.class index 56d8944..c2603f8 100644 Binary files a/Implementation/src/RunnerTCPEcoute.class and b/Implementation/src/RunnerTCPEcoute.class differ diff --git a/Implementation/src/RunnerTCPEnvoi.class b/Implementation/src/RunnerTCPEnvoi.class index 172fdf8..374db4d 100644 Binary files a/Implementation/src/RunnerTCPEnvoi.class and b/Implementation/src/RunnerTCPEnvoi.class differ diff --git a/Implementation/src/TCPEchange.class b/Implementation/src/TCPEchange.class index 32179a5..af2f31f 100644 Binary files a/Implementation/src/TCPEchange.class and b/Implementation/src/TCPEchange.class differ diff --git a/Implementation/src/TCPEchange.java b/Implementation/src/TCPEchange.java index 6088a46..405b5f7 100644 --- a/Implementation/src/TCPEchange.java +++ b/Implementation/src/TCPEchange.java @@ -20,7 +20,9 @@ import java.io.InputStreamReader; public class TCPEchange { public static void demarrerSession(ChatApp app,Utilisateur User2 ) throws IOException { + System.out.println("Demmarrage d'une session de clavardage"); Socket s = new Socket(User2.getIp(),5000); + System.out.println("Socket de demarrage d'une session cree"); ExecutorService exec = Executors.newFixedThreadPool(1000); exec.submit(new RunnerTCPEcoute(s,app)); exec.submit(new RunnerTCPEnvoi(s,app,app.getMe())); @@ -52,8 +54,10 @@ public class TCPEchange { public static void ecouteTCP(ChatApp app) { ServerSocket ss = null; ExecutorService exec = Executors.newFixedThreadPool(1000); + System.out.println("Ecoute TCP activee"); try { ss = new ServerSocket(5000); + System.out.println("Socket d'ecoute cree"); while(true) { System.out.println("Attente Session de clavardage"); Socket link = ss.accept(); @@ -87,7 +91,7 @@ class RunnerTCPEnvoi implements Runnable { } @Override public void run() { - System.out.println("Thread started"); + System.out.println("Creation d'un thread d'envoi"); String msg; while(true){ msg = sc.nextLine(); @@ -102,7 +106,7 @@ class RunnerTCPEnvoi implements Runnable { class RunnerTCPEcoute implements Runnable { final Socket link; private ChatApp app ; - + public RunnerTCPEcoute(Socket link,ChatApp app ) { this.link = link; this.app = app; @@ -110,7 +114,7 @@ class RunnerTCPEcoute implements Runnable { @Override public void run() { - System.out.println("Thread started"); + System.out.println("Creation d'un thread d'ecoute"); try { PrintStream output = new PrintStream(link.getOutputStream()); //InputStream is = link.getInputStream();