diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt index b3f3f28..7dddfb1 100644 --- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt +++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt @@ -1,41 +1,41 @@ -chatapp/View/ConnexionScreen.java - chatapp.View.ConnexionScreen +chatapp/Model/Utilisateur.java + chatapp.Model.Utilisateur chatapp/Launcher.java chatapp.Launcher chatapp/Model/MessageHorodate.java chatapp.Model.MessageHorodate +chatapp/Model/DataBase.java + chatapp.Model.DataBase +chatapp/Protocol/RunnerEcouteTCP.java + chatapp.Protocol.RunnerEcouteTCP chatapp/View/FenetreSession.java chatapp.View.FenetreSession chatapp.View.FenetreSession$1 -chatapp/View/View_Menu.java - chatapp.View.View_Menu -chatapp/Model/DataBase.java - chatapp.Model.DataBase +chatapp/Controller/ChatApp.java + chatapp.Controller.ChatApp chatapp/View/ChangementPseudo.java chatapp.View.ChangementPseudo -chatapp/View/Clavardage.java - chatapp.View.Clavardage - chatapp.View.Clavardage$1 -chatapp/Model/Utilisateur.java - chatapp.Model.Utilisateur -chatapp/Protocol/RunnerEcouteTCP.java - chatapp.Protocol.RunnerEcouteTCP +chatapp/Protocol/RunnerEcouteUDP.java + chatapp.Protocol.RunnerEcouteUDP +chatapp/Model/ListUtilisateurs.java + chatapp.Model.ListUtilisateurs chatapp/Protocol/UDPEchange.java chatapp.Protocol.RunnerUDP chatapp.Protocol.UDPEchange -chatapp/Controller/ChatApp.java - chatapp.Controller.ChatApp chatapp/Main.java chatapp.Main +chatapp/View/Clavardage.java + chatapp.View.Clavardage + chatapp.View.Clavardage$1 chatapp/Protocol/SessionClavardage.java chatapp.Protocol.SessionClavardage -chatapp/Protocol/RunnerEcouteUDP.java - chatapp.Protocol.RunnerEcouteUDP +chatapp/View/ConnexionScreen.java + chatapp.View.ConnexionScreen chatapp/View/View_Utilisateurs.java chatapp.View.View_Utilisateurs +chatapp/View/View_Menu.java + chatapp.View.View_Menu chatapp/Protocol/HttpEchange.java chatapp.Protocol.HttpEchange chatapp/View/DemarrerSession.java chatapp.View.DemarrerSession -chatapp/Model/ListUtilisateurs.java - chatapp.Model.ListUtilisateurs diff --git a/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java b/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java index 5733d9f..e3f20b4 100644 --- a/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java +++ b/Implementation/chatapp/src/main/java/chatapp/Protocol/SessionClavardage.java @@ -84,6 +84,7 @@ public class SessionClavardage extends Thread { this.derniersMsg = new ArrayList(); this.pcs = new PropertyChangeSupport(this); this.start(); + this.initierSession(); Platform.runLater( () -> new FenetreSession(this) ); @@ -117,6 +118,18 @@ public class SessionClavardage extends Thread { } } + public void initierSession(){ + String isExterne = "false"; + if(this.app.isExterne()){ + isExterne="true"; + } + MessageHorodate msgh = new MessageHorodate(getU2(),getApp().getMe(),isExterne,3); + try { + getOut().writeObject(msgh.toString()); + } catch (IOException e) { + //e.printStackTrace(); + } + } /** * Methode transformant prenant un string pour le transmettre sous la forme d'un message horodate a l'utilisateur distant * @param msg le texte du message a envoyer @@ -170,8 +183,12 @@ public class SessionClavardage extends Thread { } break; } + else if(msg.getType() == 3) { + System.out.println("Session Initiee"); + } + else{ derniersMsg.add(msg); - pcs.firePropertyChange("MessageRecu",false,true); + pcs.firePropertyChange("MessageRecu",false,true);} } }