Merge branch Nabil
This commit is contained in:
commit
fdea8b4c30
12 changed files with 165 additions and 83 deletions
Binary file not shown.
|
|
@ -27,6 +27,7 @@ public class ChatApp {
|
|||
|
||||
/* Map on l'on stocke localement les historiques des messages */
|
||||
private Map<String,Historique> mapHistorique ;
|
||||
private boolean historiqueAvailable = true;
|
||||
|
||||
/* ChatApp est associe a un utilisateur */
|
||||
private Utilisateur me;
|
||||
|
|
@ -53,11 +54,28 @@ public class ChatApp {
|
|||
* @param pseudo Pseudo de l'utilisateur
|
||||
* @param h nouvel Historique entre les deux utilisateurs
|
||||
*/
|
||||
public void majHistorique(String pseudo,Historique h) {
|
||||
public synchronized void majHistorique(Historique h) {
|
||||
getMapHistorique().put(h.getUser2().getPseudo(),h);
|
||||
}
|
||||
|
||||
|
||||
/*public void majHistorique2(MessageHorodate mh, String pseudo) {
|
||||
Historique h = getMapHistorique().get(pseudo);
|
||||
//h.addMessage(mh);
|
||||
getMapHistorique().put(h.getUser2().getPseudo(),h);
|
||||
}*/
|
||||
|
||||
public void majHistorique2(String mh, String pseudo) {
|
||||
Historique h = getMapHistorique().get(pseudo);
|
||||
MessageHorodate msghor = new MessageHorodate(this.getMe(),this.getMe(),"rien",1);
|
||||
System.out.println(">>"+mh+"<<");
|
||||
System.out.print(msghor.getDateHorodatage());
|
||||
System.out.println(msghor.getDestinataire());
|
||||
System.out.println(msghor.getSource());
|
||||
System.out.println(msghor.getType());
|
||||
|
||||
h.addMessage(msghor);
|
||||
getMapHistorique().put(h.getUser2().getPseudo(),h);
|
||||
}
|
||||
|
||||
/**
|
||||
* Modification du pseudo de l'utilisateur
|
||||
|
|
@ -165,7 +183,7 @@ public class ChatApp {
|
|||
* @param pseudo Pseudo de l'utilisateur dont on souhaite obtenir l'historique
|
||||
* @return Un historique
|
||||
*/
|
||||
public Historique getHist(String pseudo) {
|
||||
public synchronized Historique getHist(String pseudo) {
|
||||
Historique h = this.mapHistorique.get(pseudo);
|
||||
if( h != null) {
|
||||
return h ;
|
||||
|
|
@ -207,6 +225,14 @@ public class ChatApp {
|
|||
|
||||
}
|
||||
|
||||
public boolean isHistoriqueAvailable() {
|
||||
return historiqueAvailable;
|
||||
}
|
||||
|
||||
public void setHistoriqueAvailable(boolean historiqueAvailable) {
|
||||
this.historiqueAvailable = historiqueAvailable;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class RunnerEcouteUDP implements Runnable {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -53,7 +53,7 @@ public class Historique {
|
|||
n = HistoriqueHorodate.size();
|
||||
}
|
||||
for(int i = 0; i<n;i++) {
|
||||
String exp = HistoriqueHorodate.get(i).getSource().toString();
|
||||
String exp = HistoriqueHorodate.get(i).getSource().getPseudo();
|
||||
String payload = HistoriqueHorodate.get(i).getMessage();
|
||||
System.out.println(exp+" : "+payload);
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -27,12 +27,12 @@ public class MessageHorodate {
|
|||
this.setDestinataire(destinataire) ;
|
||||
this.setSource(source) ;
|
||||
this.setMessage(Message) ;
|
||||
this.dateHorodatage = new Date();
|
||||
this.setDateHorodatage(new Date());
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public void setDate(Date d) {
|
||||
this.dateHorodatage=d;
|
||||
this.setDateHorodatage(d);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -44,11 +44,11 @@ public class MessageHorodate {
|
|||
@Override
|
||||
public String toString() {
|
||||
String Msg = "";
|
||||
Msg += ("Destinataire:" + this.getDestinataire() + "\n") ;
|
||||
Msg += ("Source:" + this.getSource()+ "\n") ;
|
||||
Msg += ("Type:"+ this.type+ "\n");
|
||||
Msg += ("Date:" + this.dateToString() + "\n") ;
|
||||
Msg += ("Message:" + this.getMessage() + "\n" );
|
||||
Msg += ("Destinataire::" + this.getDestinataire() + "\n") ;
|
||||
Msg += ("Source::" + this.getSource()+ "\n") ;
|
||||
Msg += ("Type::"+ this.type+ "\n");
|
||||
Msg += ("Date::" + this.dateToString() + "\n") ;
|
||||
Msg += ("Message::" + this.getMessage() + "\n" );
|
||||
return Msg ;
|
||||
}
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ public class MessageHorodate {
|
|||
*/
|
||||
public String dateToString() {
|
||||
DateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||
return format.format(this.dateHorodatage);
|
||||
return format.format(this.getDateHorodatage());
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -73,23 +73,26 @@ public class MessageHorodate {
|
|||
public static MessageHorodate stringToMessageHorodate(String s) {
|
||||
|
||||
String mots[] = s.split("\n");
|
||||
Utilisateur destinataire = Utilisateur.stringToUtilisateur(mots[0].split(":")[1]);
|
||||
Utilisateur source = Utilisateur.stringToUtilisateur(mots[1].split(":")[1]);
|
||||
int type = Integer.parseInt(mots[2].split(":")[1]);
|
||||
Utilisateur destinataire = Utilisateur.stringToUtilisateur(mots[0].split("::")[1]);
|
||||
Utilisateur source = Utilisateur.stringToUtilisateur(mots[1].split("::")[1]);
|
||||
int type = Integer.parseInt(mots[2].split("::")[1]);
|
||||
DateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
|
||||
Date date = new Date();
|
||||
try {
|
||||
date = format.parse(mots[3].split(":")[1]);
|
||||
} catch (ParseException e) {
|
||||
/*try {
|
||||
date = format.parse(mots[3].split("::")[1]);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}*/
|
||||
String payload = "";
|
||||
for(int i=4; i< mots.length; i++) {
|
||||
if(mots[i].startsWith("Message::")) {
|
||||
mots[i]=mots[i].split("::")[1];
|
||||
}
|
||||
payload += mots[i]+"\n";
|
||||
}
|
||||
|
||||
MessageHorodate mh = new MessageHorodate(destinataire, source, payload, type);
|
||||
mh.setDate(date);
|
||||
//mh.setDate(date);
|
||||
|
||||
return mh ;
|
||||
}
|
||||
|
|
@ -126,4 +129,12 @@ public class MessageHorodate {
|
|||
this.type = type;
|
||||
}
|
||||
|
||||
public Date getDateHorodatage() {
|
||||
return dateHorodatage;
|
||||
}
|
||||
|
||||
public void setDateHorodatage(Date dateHorodatage) {
|
||||
this.dateHorodatage = dateHorodatage;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -6,6 +6,7 @@ import java.net.DatagramSocket;
|
|||
import java.net.ServerSocket;
|
||||
import java.net.Socket;
|
||||
import java.net.SocketException;
|
||||
import java.util.NoSuchElementException;
|
||||
import java.util.Scanner;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
|
@ -19,12 +20,12 @@ import java.io.InputStreamReader;
|
|||
* </p>
|
||||
*/
|
||||
public class TCPEchange {
|
||||
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Equivalent a un handshake.
|
||||
* Equivalent a un handshake.
|
||||
* L'utilisateur associé a app souhaite entamé une discussion avec User2
|
||||
* @param app L'app associé à l'utilisateur qui souhaite entamé la discussion
|
||||
* @param app L'app associé à l'utilisateur qui souhaite entamé la discussion
|
||||
* @param User2 Le destinataire
|
||||
* </p>
|
||||
*/
|
||||
|
|
@ -32,25 +33,33 @@ public class TCPEchange {
|
|||
System.out.println("Demmarrage d'une session de clavardage");
|
||||
Socket s = new Socket(User2.getIp(),5000);
|
||||
System.out.println("Socket de demarrage d'une session cree");
|
||||
ExecutorService exec = Executors.newFixedThreadPool(1000);
|
||||
// On lance un thread d'ecoute pour recevoir les messages de USER2
|
||||
exec.submit(new RunnerTCPEcoute(s,app));
|
||||
// On lance un thread d'envoi pour continuer d'envoyer des messages avec USER2
|
||||
exec.submit(new RunnerTCPEnvoi(s,app,User2,false));
|
||||
|
||||
//ExecutorService exec = Executors.newFixedThreadPool(1000);
|
||||
Thread t1 = new Thread(new RunnerTCPEcoute(s,app));
|
||||
Thread t2 = new Thread(new RunnerTCPEnvoi(s,app,User2,false));
|
||||
t1.start();
|
||||
t2.start();
|
||||
try {
|
||||
t1.join();
|
||||
t2.join();
|
||||
}catch(InterruptedException e) {
|
||||
System.out.println("Un thread s'est arrete brusquement");
|
||||
}
|
||||
System.out.println("Tout s'est passe creme");
|
||||
app.getHist(User2.getPseudo()).afficher10derniers();
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*public static void envoiTCP(ChatApp app,Utilisateur User2, String Msg, int type ) {
|
||||
// On cree un messagehorodate
|
||||
MessageHorodate mh = new MessageHorodate(app.getMe(), User2, Msg, type);
|
||||
if( type == 1 ) {
|
||||
// on ajoute le msg à son historique
|
||||
// on ajoute le msg à son historique
|
||||
Historique h = app.getHist(User2.getPseudo());
|
||||
h.addMessage(mh);
|
||||
// on update la liste des historiques de app
|
||||
app.majHistorique(User2.getPseudo(), h);
|
||||
// on update la liste des historiques de app
|
||||
app.majHistorique(h);
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
Socket s = new Socket(User2.getIp(), User2.getPort());
|
||||
PrintStream output = new PrintStream(s.getOutputStream());
|
||||
|
|
@ -61,8 +70,8 @@ public class TCPEchange {
|
|||
e.printStackTrace();
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Méthode pour qu'un objet de la classe ChatApp soit constamment en écoute de potentielles connexions
|
||||
|
|
@ -76,13 +85,13 @@ public class TCPEchange {
|
|||
try {
|
||||
ss = new ServerSocket(5000); // On ecoute sur le port 5000
|
||||
System.out.println("Socket d'ecoute cree");
|
||||
while(true) { // Ecoute en boucle
|
||||
while(true) { // Ecoute en boucle
|
||||
System.out.println("Attente Session de clavardage");
|
||||
Socket link = ss.accept(); // Blocante
|
||||
exec.submit(new RunnerTCPEcoute(link,app)); // On crée un thread qui va gerer la connexion recu
|
||||
System.out.println("L'ecoute TCP continue apres le premier thread demarre");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
@ -92,7 +101,7 @@ public class TCPEchange {
|
|||
|
||||
/**
|
||||
* <p>
|
||||
* Classe representant les threads s'occupant de l'envoie de messages en utilisant le protocole TCP.
|
||||
* Classe representant les threads s'occupant de l'envoie de messages en utilisant le protocole TCP.
|
||||
* Cette classe implemente l'interface Runnable.
|
||||
* </p>
|
||||
*/
|
||||
|
|
@ -108,7 +117,7 @@ class RunnerTCPEnvoi implements Runnable {
|
|||
/**
|
||||
* <p>
|
||||
* Constructeur de la classe RunnerTCPEnvoi
|
||||
* @param link
|
||||
* @param link
|
||||
* @param app Un objet ChatApp dont l'utilisateur associé souhaite entame une discussion
|
||||
* @param user2 Destinataire
|
||||
* @param bonjour Boolean true si c'est le debut d'une connexion, false sinon
|
||||
|
|
@ -120,14 +129,14 @@ class RunnerTCPEnvoi implements Runnable {
|
|||
this.Destinataire = user2;
|
||||
this.out = new PrintWriter(link.getOutputStream());
|
||||
this.in = new BufferedReader (new InputStreamReader (link.getInputStream()));
|
||||
this.bonjourEnvoye = bonjour;
|
||||
this.bonjourEnvoye = bonjour;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
System.out.println("Creation d'un thread d'envoi");
|
||||
String msg;
|
||||
|
||||
|
||||
while(true){
|
||||
if(!bonjourEnvoye) { // bonjourEnvoye est a false si c'est le debut d'une communication
|
||||
MessageHorodate mh = new MessageHorodate(Destinataire,app.getMe(),"Bonjour",2);
|
||||
|
|
@ -136,16 +145,36 @@ class RunnerTCPEnvoi implements Runnable {
|
|||
out.println(mh);
|
||||
out.flush();
|
||||
}
|
||||
else { // Nous sommes dans le cas ou la connexion a deja ete etablie
|
||||
else {
|
||||
try {
|
||||
msg = sc.nextLine();
|
||||
}catch(NoSuchElementException e) {
|
||||
break;
|
||||
}
|
||||
MessageHorodate mh = new MessageHorodate(Destinataire,app.getMe(),msg,1);
|
||||
if(msg.equals("--STOP--")) {
|
||||
mh = new MessageHorodate(Destinataire,app.getMe(),msg,0);
|
||||
mh = new MessageHorodate(Destinataire,app.getMe(),msg,0); // ENVOYER JUSTE --STOP-- SUFFIT
|
||||
out.println(mh);
|
||||
out.flush();
|
||||
break;
|
||||
}
|
||||
out.println(mh); // Envoi du message
|
||||
/* while(!app.isHistoriqueAvailable()) {
|
||||
try{wait();
|
||||
}catch(InterruptedException e) {}
|
||||
}*/
|
||||
//app.setHistoriqueAvailable(false);
|
||||
synchronized( this.app.getMapHistorique()) {
|
||||
Historique h = app.getHist(Destinataire.getPseudo());
|
||||
h.addMessage(mh);
|
||||
app.majHistorique(h);
|
||||
}
|
||||
|
||||
// on update la liste des historiques de app
|
||||
|
||||
//app.majHistorique2(mh.toString(),Destinataire.getPseudo());
|
||||
//app.setHistoriqueAvailable(false);
|
||||
//notifyAll();
|
||||
out.println(mh);
|
||||
System.out.println("Envoi d'un mesage");
|
||||
out.flush();
|
||||
}
|
||||
|
|
@ -158,13 +187,14 @@ class RunnerTCPEnvoi implements Runnable {
|
|||
// Gestion de l'exception de la fermeture de la socket
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Classe representant les threads s'occupant de la reception de messages en utilisant le protocole TCP.
|
||||
* Classe representant les threads s'occupant de la reception de messages en utilisant le protocole TCP.
|
||||
* Cette classe implemente l'interface Runnable.
|
||||
* </p>
|
||||
*/
|
||||
|
|
@ -172,17 +202,11 @@ class RunnerTCPEcoute implements Runnable {
|
|||
final Socket link;
|
||||
private ChatApp app ;
|
||||
private Utilisateur u2;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* Constructeur de la classe RunnerTCPEnvoi
|
||||
* @param link
|
||||
* @param app Un objet ChatApp dont l'utilisateur associé souhaite entame une discussion
|
||||
* </p>
|
||||
*/
|
||||
private boolean u2Initialise;
|
||||
public RunnerTCPEcoute(Socket link,ChatApp app ) {
|
||||
this.link = link; // fait le lien entre l'utilisateur associé a app et un autre utilisateur
|
||||
this.app = app; // Source
|
||||
this.link = link;
|
||||
this.app = app;
|
||||
this.u2Initialise=false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -192,7 +216,7 @@ class RunnerTCPEcoute implements Runnable {
|
|||
PrintStream output = new PrintStream(link.getOutputStream());
|
||||
//InputStream is = link.getInputStream();
|
||||
BufferedReader in = new BufferedReader (new InputStreamReader (link.getInputStream()));
|
||||
|
||||
|
||||
String line = "";
|
||||
String dest = "";
|
||||
String src = "";
|
||||
|
|
@ -200,57 +224,80 @@ class RunnerTCPEcoute implements Runnable {
|
|||
String date = "";
|
||||
String payload = "";
|
||||
String msg = "";
|
||||
line = in.readLine();
|
||||
while (line != null) {
|
||||
|
||||
line = in.readLine();
|
||||
|
||||
if(line.split(":")[0].equals("Destinataire")) {
|
||||
|
||||
|
||||
if(line.split("::")[0].equals("Destinataire")) {
|
||||
if(msg.equals("")) {
|
||||
dest = line+"\n";
|
||||
msg=".";
|
||||
}
|
||||
else {
|
||||
msg=dest+src+type+date+payload;
|
||||
payload = "";
|
||||
MessageHorodate mh = MessageHorodate.stringToMessageHorodate(msg);
|
||||
System.out.println("Type du message:"+mh.getType());
|
||||
if(mh.getType()==1) {
|
||||
/*while(!app.isHistoriqueAvailable()) {
|
||||
try{wait();
|
||||
}catch(InterruptedException e) {}
|
||||
}
|
||||
app.setHistoriqueAvailable(false);*/
|
||||
System.out.println("Historique mis à jour lors de la reception");
|
||||
Historique h = app.getHist(mh.getSource().getPseudo());
|
||||
h.addMessage(mh);
|
||||
|
||||
app.majHistorique(mh.getSource().getPseudo(), h);
|
||||
app.majHistorique(h);
|
||||
//app.setHistoriqueAvailable(true);
|
||||
//notifyAll();
|
||||
//app.majHistorique2(mh,mh.getSource().getPseudo());
|
||||
}
|
||||
else if(mh.getType()==0) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
else if(line.split(":")[0].equals("Source")) {
|
||||
else if(line.split("::")[0].equals("Source")) {
|
||||
src = line+"\n";
|
||||
if(!u2Initialise) {
|
||||
u2=Utilisateur.stringToUtilisateur(src.split("::")[1].replaceAll("\n", ""));
|
||||
System.out.println("u2Initialise !");
|
||||
u2Initialise = true;
|
||||
}
|
||||
}
|
||||
else if(line.split(":")[0].equals("Type")) {
|
||||
if(line.split(":")[1].equals("2")) {
|
||||
else if(line.split("::")[0].equals("Type")) {
|
||||
if(line.split("::")[1].equals("2")) {
|
||||
System.out.println("Bonjour recu!");
|
||||
//System.out.println(src.split(":")[1].replaceAll("\n", ""));
|
||||
u2=Utilisateur.stringToUtilisateur(src.split(":")[1].replaceAll("\n", ""));
|
||||
//System.out.println(src.split("::")[1].replaceAll("\n", ""));
|
||||
u2=Utilisateur.stringToUtilisateur(src.split("::")[1].replaceAll("\n", ""));
|
||||
u2Initialise = true;
|
||||
System.out.println("Pseudo du poto: >>"+u2.getPseudo()+"<<");
|
||||
Thread t = new Thread(new RunnerTCPEnvoi(link,app,u2,true));
|
||||
t.start();
|
||||
|
||||
System.out.println("Thread d'envoi envoye");
|
||||
}
|
||||
type = line+"\n";
|
||||
}
|
||||
else if(line.split(":")[0].equals("Date")) {
|
||||
else if(line.split("::")[0].equals("Date")) {
|
||||
date = line+"\n";
|
||||
}
|
||||
else if(line.split("::")[0].equals("Message")){
|
||||
payload = line+"\n";
|
||||
|
||||
}
|
||||
else {
|
||||
payload += line+"\n";
|
||||
}
|
||||
|
||||
|
||||
System.out.println("Received: "+ line);
|
||||
|
||||
|
||||
|
||||
line = in.readLine();
|
||||
|
||||
|
||||
}
|
||||
System.out.println("Affichage de l'histo");
|
||||
System.out.println("Pseudo du poto: >>"+u2.getPseudo()+"<<");
|
||||
app.getHist(u2.getPseudo()).afficher10derniers();
|
||||
in.close();
|
||||
link.close();
|
||||
} catch (IOException e) {
|
||||
|
|
@ -258,13 +305,11 @@ class RunnerTCPEcoute implements Runnable {
|
|||
} finally {
|
||||
System.out.println("Finishing thread");
|
||||
System.out.println("Affichage de l'histo");
|
||||
app.getHist(u2.getPseudo()).afficher10derniers();
|
||||
|
||||
|
||||
System.out.println("Pseudo du poto: >>"+u2.getPseudo()+"<<");
|
||||
app.getHist(u2.getPseudo()).afficher10derniers();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue