diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt index 7298c1b..6428c35 100644 --- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt +++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt @@ -8,15 +8,15 @@ chatapp/Model/Historique.java chatapp.Model.Historique chatapp/Model/MessageHorodate.java chatapp.Model.MessageHorodate -chatapp/Model/DataBase.java - chatapp.Model.DataBase +chatapp/View/View_Menu.java + chatapp.View.View_Menu chatapp/Protocol/RunnerEcouteTCP.java chatapp.Protocol.RunnerEcouteTCP chatapp/View/FenetreSession.java chatapp.View.FenetreSession chatapp.View.FenetreSession$1 -chatapp/Controller/ChatApp.java - chatapp.Controller.ChatApp +chatapp/View/DemarrerSession.java + chatapp.View.DemarrerSession chatapp/View/ChangementPseudo.java chatapp.View.ChangementPseudo chatapp/Protocol/RunnerEcouteUDP.java @@ -39,7 +39,7 @@ 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/View/DemarrerSession.java - chatapp.View.DemarrerSession +chatapp/Controller/ChatApp.java + chatapp.Controller.ChatApp +chatapp/Model/DataBase.java + chatapp.Model.DataBase diff --git a/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java b/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java index 7252438..108bd62 100644 --- a/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java +++ b/Implementation/chatapp/src/main/java/chatapp/Controller/ChatApp.java @@ -48,7 +48,7 @@ public class ChatApp implements PropertyChangeListener { this.actifUsers.addList(getMe()); this.main = main; - //this.db= DataBase.getInstance(); + this.db= DataBase.getInstance(); } public static synchronized ChatApp getInstance(String pseudo, Integer port, Application main){ diff --git a/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java b/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java index ef01281..92f384c 100644 --- a/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java +++ b/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java @@ -181,6 +181,12 @@ public class DataBase { * @param Pseudo pseudo actuelle de l'utilisateur */ public void ajoutUtilisateurs(String ID , String Pseudo ) { + // Verification que l'utilisateur n'existe pas + + + + + String requete= "INSERT INTO `Utilisateurs` (`ID`, `Pseudo`, `Actif`) VALUES ( ? , ? , '1')"; PreparedStatement Ps = null ; //Statement est utilisé pour envoyer une requete SQL à la base de donnee @@ -231,4 +237,15 @@ public class DataBase { } } + /* + * Methode permettant de recuperer les 20 derniers messages envoyés entre 2 utilisateurs + * @param ID Utilisateur associé a ChatApp + * @param destinataire Celui avec qui correspond ID + * @return Les 20 derniers Messages + */ + public String recup20Msg(String ID, String IDdestinataire) { + String Msg = "" ; + return Msg ; + } + }