alartigu/ChatApp-AL-NM
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

SendPost fonctionnelle

Browse source
This commit is contained in:
Nabzzz 2021-01-17 11:31:47 +01:00
parent f0de008617
commit e6b7722471
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
View file

@ -1,24 +1,24 @@
chatapp/Launcher.java chatapp/Launcher.java
chatapp.Launcher chatapp.Launcher
chatapp/Model/Utilisateur.java chatapp/Model/ListUtilisateurs.java
chatapp.Model.Utilisateur chatapp.Model.ListUtilisateurs
chatapp/Model/MessageHorodate.java chatapp/Model/MessageHorodate.java
chatapp.Model.MessageHorodate chatapp.Model.MessageHorodate
chatapp/Model/DataBase.java chatapp/Model/DataBase.java
chatapp.Model.DataBase chatapp.Model.DataBase
chatapp/Model/Utilisateur.java
chatapp.Model.Utilisateur
chatapp/Protocol/RunnerEcouteTCP.java chatapp/Protocol/RunnerEcouteTCP.java
chatapp.Protocol.RunnerEcouteTCP chatapp.Protocol.RunnerEcouteTCP
chatapp/View/FenetreSession.java chatapp/View/FenetreSession.java
chatapp.View.FenetreSession chatapp.View.FenetreSession
chatapp.View.FenetreSession$1 chatapp.View.FenetreSession$1
chatapp/Controller/ChatApp.java chatapp/View/DemarrerSession.java
chatapp.Controller.ChatApp chatapp.View.DemarrerSession
chatapp/View/ChangementPseudo.java chatapp/View/ChangementPseudo.java
chatapp.View.ChangementPseudo chatapp.View.ChangementPseudo
chatapp/Protocol/RunnerEcouteUDP.java chatapp/Protocol/RunnerEcouteUDP.java
chatapp.Protocol.RunnerEcouteUDP chatapp.Protocol.RunnerEcouteUDP
chatapp/Model/ListUtilisateurs.java
chatapp.Model.ListUtilisateurs
chatapp/Protocol/UDPEchange.java chatapp/Protocol/UDPEchange.java
chatapp.Protocol.RunnerUDP chatapp.Protocol.RunnerUDP
chatapp.Protocol.UDPEchange chatapp.Protocol.UDPEchange
@ -35,5 +35,7 @@ chatapp/View/View_Utilisateurs.java
chatapp.View.View_Utilisateurs chatapp.View.View_Utilisateurs
chatapp/View/View_Menu.java chatapp/View/View_Menu.java
chatapp.View.View_Menu chatapp.View.View_Menu
chatapp/View/DemarrerSession.java chatapp/Controller/ChatApp.java
chatapp.View.DemarrerSession chatapp.Controller.ChatApp
chatapp/Protocol/HttpEchange.java
chatapp.Protocol.HttpEchange

20
Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java
View file

@ -3,10 +3,7 @@ package chatapp.Controller;
import chatapp.Model.DataBase; import chatapp.Model.DataBase;
import chatapp.Model.ListUtilisateurs; import chatapp.Model.ListUtilisateurs;
import chatapp.Model.Utilisateur; import chatapp.Model.Utilisateur;
import chatapp.Protocol.RunnerEcouteTCP; import chatapp.Protocol.*;
import chatapp.Protocol.RunnerEcouteUDP;
import chatapp.Protocol.SessionClavardage;
import chatapp.Protocol.UDPEchange;
import javafx.application.Application; import javafx.application.Application;
import javafx.application.Platform; import javafx.application.Platform;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
@ -32,6 +29,7 @@ public class ChatApp implements PropertyChangeListener {
private ListUtilisateurs actifUsers ; private ListUtilisateurs actifUsers ;
private boolean isExterne; // TRUE si l'utilisateur est externe au reseau FALSE s'il est interne private boolean isExterne; // TRUE si l'utilisateur est externe au reseau FALSE s'il est interne
private HttpEchange externeEchange;
/* ChatApp est associe a un utilisateur */ /* ChatApp est associe a un utilisateur */
private Utilisateur me; private Utilisateur me;
@ -60,10 +58,10 @@ public class ChatApp implements PropertyChangeListener {
InetAddress ip = UDPEchange.getCurrentIp(); InetAddress ip = UDPEchange.getCurrentIp();
this.me = new Utilisateur(pseudo,port,ip); this.me = new Utilisateur(pseudo,port,ip);
this.actifUsers.addList(getMe()); this.actifUsers.addList(getMe());
this.main = main; this.main = main;
this.db= DataBase.getInstance(); this.db= DataBase.getInstance();
this.connecte=false; this.connecte=false;
this.externeEchange = new HttpEchange(this);
} }
/** /**
@ -162,7 +160,14 @@ public class ChatApp implements PropertyChangeListener {
*/ */
public boolean connexion(String pseudo) throws IOException{ public boolean connexion(String pseudo) throws IOException{
if(this.isExterne()){ if(this.isExterne()){
try {
System.out.println("Demande de connexion distante");
return this.connexionExterne(pseudo); return this.connexionExterne(pseudo);
} catch (InterruptedException e) {
e.printStackTrace();
return false;
}
} }
else{ else{
return connexionInterne(pseudo); return connexionInterne(pseudo);
@ -176,8 +181,9 @@ public class ChatApp implements PropertyChangeListener {
* @return False si Connexion a echoue, True sinon * @return False si Connexion a echoue, True sinon
* @throws IOException * @throws IOException
*/ */
private boolean connexionExterne(String pseudo) { private boolean connexionExterne(String pseudo) throws IOException, InterruptedException{
return false; this.me.setPseudo(pseudo);
return externeEchange.sendPost("Connexion");
} }