From 65c729b9aa52fc6008639b13f976350be199fc3e Mon Sep 17 00:00:00 2001 From: Nabzzz Date: Sun, 20 Dec 2020 14:42:40 +0100 Subject: [PATCH] Gestion des fenetres de clavardage --- Implementation/src/Controller/ChatApp.java | 4 ++-- Implementation/src/Protocoles/UDPEchange.java | 1 + Implementation/src/View/View_Accueil.java | 7 ++++++- Implementation/src/View/View_Menu.java | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Implementation/src/Controller/ChatApp.java b/Implementation/src/Controller/ChatApp.java index ff0cabe..2aad060 100644 --- a/Implementation/src/Controller/ChatApp.java +++ b/Implementation/src/Controller/ChatApp.java @@ -199,8 +199,7 @@ public class ChatApp { public static void main (String[] args) throws IOException { ChatApp app = new ChatApp(args[0],Integer.parseInt(args[1])) ; - - + System.out.println("On lance le chatapp"); ExecutorService execUDP = Executors.newFixedThreadPool(1000); @@ -211,6 +210,7 @@ public class ChatApp { e.printStackTrace(); } ExecutorService execTCP = Executors.newFixedThreadPool(1000); + System.out.println("On lance l'écoute TCP de chatapp"); execTCP.submit(new RunnerEcouteTCP(app)); try { Thread.sleep(5000); diff --git a/Implementation/src/Protocoles/UDPEchange.java b/Implementation/src/Protocoles/UDPEchange.java index 4652a0d..9fbb3ac 100644 --- a/Implementation/src/Protocoles/UDPEchange.java +++ b/Implementation/src/Protocoles/UDPEchange.java @@ -27,6 +27,7 @@ public class UDPEchange { private static Boolean Connecte = true; // True si l'utilisateur peut se connecter avec ce nom d'utilisateur , False sinon + private static Boolean EcouteEnCours = false; /** * Getter * @return le boolean connecte (True s'il peut se connecter avec ce nom d'utilisateur , False sinon) diff --git a/Implementation/src/View/View_Accueil.java b/Implementation/src/View/View_Accueil.java index 3f349cb..92b24f1 100644 --- a/Implementation/src/View/View_Accueil.java +++ b/Implementation/src/View/View_Accueil.java @@ -88,10 +88,15 @@ public class View_Accueil implements ActionListener{ // on recupere le texte entree dans la zone de saisie String pseudo = pseudofield.getText(); // On crée un objet de type ChatApp - ChatApp app = new ChatApp(pseudo, 3000) ; + System.out.println("Lancement du ChatApp"); + ChatApp app = new ChatApp(pseudo, 1234) ; // on crée un thread qui va ecouter les connexions entrantes ExecutorService execUDP = Executors.newFixedThreadPool(1000); + System.out.println("Lancement de UDP"); execUDP.submit(new RunnerEcouteUDP(app)); + ExecutorService execTCP = Executors.newFixedThreadPool(1000); + System.out.println("On lance l'écoute TCP de chatapp"); + execTCP.submit(new RunnerEcouteTCP(app)); Boolean connexion = false ; try { // on tente une connexion avec ce pseudo diff --git a/Implementation/src/View/View_Menu.java b/Implementation/src/View/View_Menu.java index 3ffea35..7bed0a4 100644 --- a/Implementation/src/View/View_Menu.java +++ b/Implementation/src/View/View_Menu.java @@ -35,6 +35,7 @@ import javax.swing.JTextField; import javax.swing.SwingConstants; import src.Controller.*; +import src.Protocoles.SessionClavardage; import java.awt.Font; import java.awt.Color; @@ -186,7 +187,8 @@ public class View_Menu { cb.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) { Object selected = cb.getSelectedItem(); - new View_Clavardage(app, selected.toString()); + SessionClavardage session = new SessionClavardage(Utilisateur.stringToUtilisateur(selected.toString()),app); + new ViewSession(session); } });