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

recuperer historique OK

Browse source
This commit is contained in:
Auriane Lartigue 2020-12-29 15:44:43 +04:00
parent 9bcef6bfb4
commit b14c6854ca
3 changed files with 56 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,39 +1,39 @@
chatapp/View/DemarrerSession.java
chatapp.View.DemarrerSession
chatapp/Protocol/RunnerEcouteUDP.java
chatapp.Protocol.RunnerEcouteUDP
chatapp/Model/Utilisateur.java
chatapp.Model.Utilisateur
chatapp/View/ConnexionScreen.java
chatapp.View.ConnexionScreen
chatapp/Controller/ChatApp.java
chatapp.Controller.ChatApp
chatapp/View/View_Utilisateurs.java
chatapp.View.View_Utilisateurs
chatapp/Protocol/RunnerEcouteTCP.java
chatapp.Protocol.RunnerEcouteTCP
chatapp/View/DemarrerSession.java
chatapp.View.DemarrerSession
chatapp/Controller/ChatApp.java
chatapp.Controller.ChatApp
chatapp/Model/DataBase.java
chatapp.Model.DataBase
chatapp/View/ChangementPseudo.java
chatapp.View.ChangementPseudo
chatapp/Protocol/RunnerEcouteUDP.java
chatapp.Protocol.RunnerEcouteUDP
chatapp/Launcher.java
chatapp.Launcher
chatapp/Model/ListUtilisateurs.java
chatapp.Model.ListUtilisateurs
chatapp/View/View_Menu.java
chatapp.View.View_Menu
chatapp/Model/MessageHorodate.java
chatapp.Model.MessageHorodate
chatapp/View/Clavardage.java
chatapp.View.Clavardage
chatapp.View.Clavardage$1
chatapp/Protocol/UDPEchange.java
chatapp.Protocol.RunnerUDP
chatapp.Protocol.UDPEchange
chatapp/Model/DataBase.java
chatapp.Model.DataBase
chatapp/Model/MessageHorodate.java
chatapp.Model.MessageHorodate
chatapp/Main.java
chatapp.Main
chatapp/View/View_Menu.java
chatapp.View.View_Menu
chatapp/Protocol/SessionClavardage.java
chatapp.Protocol.SessionClavardage
chatapp/View/ConnexionScreen.java
chatapp.View.ConnexionScreen
chatapp/View/View_Utilisateurs.java
chatapp.View.View_Utilisateurs
chatapp/Model/Utilisateur.java
chatapp.Model.Utilisateur
chatapp/View/FenetreSession.java
chatapp.View.FenetreSession
chatapp.View.FenetreSession$1
chatapp/Main.java
chatapp.Main
chatapp/Protocol/SessionClavardage.java
chatapp.Protocol.SessionClavardage
chatapp/View/ChangementPseudo.java
chatapp.View.ChangementPseudo
chatapp/Launcher.java
chatapp.Launcher
chatapp/View/Clavardage.java
chatapp.View.Clavardage
chatapp.View.Clavardage$1

18
Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java
View file

@ -54,7 +54,7 @@ public class DataBase {
// Nabil : DECOMMENTER CETTE LIGNE
//this.connection = DriverManager.getConnection("jdbc:mysql://localhost/POO_AL_NM?allowPublicKeyRetrieval=true&useSSL=false", "root", "1234");
// Auriane : DECOMMENTER CETTE LIGNE
this.connection = DriverManager.getConnection("jdbc:mysql://localhost/POO_AL_NM?allowPublicKeyRetrieval=true&useSSL=false", "root", "1234");
this.connection = DriverManager.getConnection("jdbc:mysql://localhost:8889/POO_AL_NM?allowPublicKeyRetrieval=true&useSSL=false", "root", "root");
//this.connection = DriverManager.getConnection(this.DBurl,login,pswd);
System.out.println("Connexion Etablie");
} catch (SQLException e) {
@ -463,4 +463,20 @@ public class DataBase {
existe = (!rs.equals(null));
return existe;
}
public String getNomTable(Utilisateur U1, Utilisateur U2){
String petit;
String grand;
int comparaison;
comparaison = U1.getId().compareTo(U2.getId());
if (comparaison < 0) {
petit = U1.getId();
grand = U2.getId();
}
else {
petit = U2.getId() ;
grand = U1.getId() ;
}
return "Chat_" + petit + "_" + grand ;
}
}

21
Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java
View file

@ -4,6 +4,8 @@ package chatapp.View;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.net.URL;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.ResourceBundle;
@ -47,8 +49,7 @@ public class Clavardage implements Initializable, PropertyChangeListener {
private Utilisateur u2;
private SessionClavardage session;
private Integer Indice = 0 ;
private String nomTable;
@FXML
/**
* <p>Handler gerant l'envoi du message contenu dans le TextField AEnvoyer et sur pression du bouton EnvoyerButton</p>
@ -59,9 +60,9 @@ public class Clavardage implements Initializable, PropertyChangeListener {
if(!msg.equals("")) {
session.envoiMsg(msg);
Date d = new Date();
msg = "Moi (" + d.toString() + ") : " + msg + "\n";
DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:0");
msg = "Moi (" + format.format(d).toString() + ") : " + msg + "\n";
ChatText.appendText(msg);
Indice++;
}
}
@ -90,12 +91,12 @@ public class Clavardage implements Initializable, PropertyChangeListener {
switch (evt.getPropertyName()){
case "MessageRecu" :
MessageHorodate msgh = session.getDernierMsg();
DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:0");
Date d = new Date();
String msg = u2.getPseudo();
msg += " ("+ d.toString() +") ";
msg += " ("+ format.format(d).toString() +") ";
msg+=": "+msgh.getMessage();
ChatText.appendText(msg);
Indice++;
break;
case "FinDeLaSession" :
this.session.arretSession();
@ -130,11 +131,9 @@ public class Clavardage implements Initializable, PropertyChangeListener {
* @param actionEvent
*/
public void ajouterMessagesHistorique(ActionEvent actionEvent) {
String historique = this.session.getApp().getDb().recupMsg(session.getApp().getMe().getId(),this.u2.getId(), Indice , Indice + 5);
//String auxiliaire = ChatText.getText();
//ChatText.clear();
this.nomTable = this.session.getApp().getDb().getNomTable(u2,this.session.getApp().getMe());
String historique = this.session.getApp().getDb().recupNMsg(session.getApp().getMe().getId(),this.u2.getId(), this.session.getApp().getDb().tailleBDD("Chat_mbp-de-auriane.home_mbp-de-auriane.home"));
ChatText.clear();
ChatText.insertText(0,historique);
//ChatText.insertText(0,auxiliaire);
Indice +=5;
}
}