diff --git a/Implementation/src/Historique.class b/Implementation/src/Historique.class index 4447d37..d31579e 100644 Binary files a/Implementation/src/Historique.class and b/Implementation/src/Historique.class differ diff --git a/Implementation/src/Historique.java b/Implementation/src/Historique.java index 4419be3..81b093c 100644 --- a/Implementation/src/Historique.java +++ b/Implementation/src/Historique.java @@ -46,6 +46,8 @@ public class Historique { } public void afficher10derniers() { + System.out.println("Demarrage de l'affichage partiel de l'historique"); + System.out.println("Il y a actuellement " + HistoriqueHorodate.size() +" elements dans l'historique"); int n =10; if(HistoriqueHorodate.size()<=10) { n = HistoriqueHorodate.size(); diff --git a/Implementation/src/RunnerTCPEcoute.class b/Implementation/src/RunnerTCPEcoute.class index fc77aa9..136db83 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 344d115..d0a21d2 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 af2f31f..b89b7c0 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 f5d820a..2c67f2e 100644 --- a/Implementation/src/TCPEchange.java +++ b/Implementation/src/TCPEchange.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.net.DatagramSocket; import java.net.ServerSocket; import java.net.Socket; +import java.net.SocketException; import java.util.Scanner; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -159,7 +160,6 @@ class RunnerTCPEcoute implements Runnable { break; } - } } else if(line.split(":")[0].equals("Source")) { @@ -180,14 +180,16 @@ class RunnerTCPEcoute implements Runnable { } - System.out.println("Finishing thread"); - app.getHist(u2.getPseudo()).afficher10derniers(); - - - in.close(); - link.close(); + in.close(); + link.close(); } catch (IOException e) { - e.printStackTrace(); + //e.printStackTrace(); + } finally { + System.out.println("Finishing thread"); + System.out.println("Affichage de l'histo"); + app.getHist(u2.getPseudo()).afficher10derniers(); + + } }