gallois/Clavardage
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: gallois:21780d4c4c8ffe163cc659366753006a340d1f11
Branches Tags
gallois:master
gallois:websocket
gallois:version_2(broadcast+BD)
gallois:v1
..
compare: gallois:09dce244b5ce77fe264a75e4b35aed011c163665
Branches Tags
gallois:master
gallois:websocket
gallois:version_2(broadcast+BD)
gallois:v1

No commits in common. "21780d4c4c8ffe163cc659366753006a340d1f11" and "09dce244b5ce77fe264a75e4b35aed011c163665" have entirely different histories.
21780d4c4c ... 09dce244b5

5 changed files with 18 additions and 59 deletions
Show stats Expand all files Collapse all files

11
Application/Clavardage/src/controller/Controller.java
View file

@ -346,14 +346,15 @@ public class Controller {
/*** recup history and put it in model ***/
/*
try {
//System.out.println(this.getHistory().retrieveMessage(getMyUser(), c.getRemoteUser()));
c.addListMessage(this.getHistory().retrieveMessage(getMyUser(), c.getRemoteUser()));
System.out.println(this.getHistory().retrieveMessage(getMyUser(), c.getRemoteUser()));
String history = this.getHistory().retrieveMessage(getMyUser(), c.getRemoteUser());
} catch (SQLException e) {
System.out.println("souci avec le retrieveMsg");
e.printStackTrace();
}
//System.out.println(myUser.getChats().get(myUser.getChatIndexOf(rm)));
*/
return c;
}
public String askOpenSession(int index) {
@ -368,7 +369,7 @@ public class Controller {
}
else { // else create it
c=openSession(rm);
JOptionPane.showMessageDialog(null ,"New session with "+rm.getPseudo());
JOptionPane.showMessageDialog(null ,"New session with "+c.getRemoteUser().getPseudo());
}
// Look for history
@ -413,7 +414,7 @@ public class Controller {
// Sauvegarde dans la base de données
DateFormat dateFormat = new SimpleDateFormat("yyyy MM dd HH mm ss");
Date date=new Date();
this.getHistory().saveMessage(getMyUser(), c.getRemoteUser(),message ,dateFormat.format(date));
//this.getHistory().saveMessage(getMyUser(), c.getRemoteUser(),message ,dateFormat.format(date));
// Send message
out.println(message);

48
Application/Clavardage/src/controller/Historique.java
View file

@ -8,14 +8,10 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Calendar;
import javax.sql.rowset.JdbcRowSet;
import model.Message;
import model.Msg_Text;
public class Historique {
public void saveMessage(model.User ctr1, model.RemoteUser ctr2, String input, String date) {
@ -82,7 +78,7 @@ public class Historique {
}
public ArrayList<Message> retrieveMessage(model.LocalUser user1, model.RemoteUser user2) throws SQLException {
public String retrieveMessage(model.LocalUser user1, model.RemoteUser user2) throws SQLException {
try {
Class.forName("java.sql.Driver");
} catch (ClassNotFoundException e) {
@ -90,32 +86,12 @@ public class Historique {
e.printStackTrace();
}
Connection con=DriverManager.getConnection("jdbc:mysql://srv-bdens.insa-toulouse.fr:3306","tp_servlet_003","povu3Ma2");
Statement stat = null;
try {
stat = con.createStatement();
} catch (SQLException e2) {
// TODO Auto-generated catch block
e2.printStackTrace();
}
Statement stat2 = null;
try {
stat2 = con.createStatement();
} catch (SQLException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
Statement stat=con.createStatement();
Statement stat2=con.createStatement();
int nb_changed_rows = stat.executeUpdate("USE tp_servlet_003");
try {
nb_changed_rows = stat.executeUpdate("USE TABLE chat ( user_IPcode1 INTEGER, user_IPcode2 INTEGER ,Message VARCHAR(450) ,temps VARCHAR(450) )");
}catch (Exception e) {
e.printStackTrace();
}
nb_changed_rows = stat2.executeUpdate("USE tp_servlet_003");
try {
nb_changed_rows = stat2.executeUpdate("USE TABLE chat ( user_IPcode1 INTEGER, user_IPcode2 INTEGER ,Message VARCHAR(450) ,temps VARCHAR(450) )");
nb_changed_rows = stat.executeUpdate("CREATE TABLE chat ( user_IPcode1 INTEGER, user_IPcode2 INTEGER ,Message VARCHAR(450) ,temps VARCHAR(450) )");
}catch (Exception e) {
e.printStackTrace();
@ -125,8 +101,7 @@ public class Historique {
boolean encore1 = RSSent.next();
ResultSet RSReceived=(stat2.executeQuery("SELECT user_IPcode1, user_IPcode2, Message, temps FROM chat WHERE user_IPcode1="+user2.getIPcode()));
boolean encore2 = RSReceived.next();
ArrayList<Message> message=new ArrayList<Message>();
//String message=null;
String message=null;
String[] string1=null;
String[] string2=null;
Calendar date1=Calendar.getInstance();
@ -139,6 +114,7 @@ public class Historique {
encore1=RSSent.next();
}
string1=RSSent.getString(4).split(" ");
System.out.println(RSSent.getString(4));
date1.set(Integer.valueOf(string1[0]), Integer.valueOf(string1[1]), Integer.valueOf(string1[2]),Integer.valueOf(string1[3]), Integer.valueOf(string1[4]), Integer.valueOf(string1[5]));
//RSReceived=(stat.executeQuery("SELECT user_IPcode1, user_IPcode2, Message, temps FROM chat WHERE user_IPcode1="+user2.getIPcode()));
@ -151,15 +127,11 @@ public class Historique {
date2.set(Integer.valueOf(string2[0]), Integer.valueOf(string2[1]), Integer.valueOf(string2[2]),Integer.valueOf(string2[3]), Integer.valueOf(string2[4]), Integer.valueOf(string2[5]));
if (date1.compareTo(date2)>=0) {
Msg_Text msg =new Msg_Text(user2,RSReceived.getString(4),RSReceived.getString(3));
message.add(msg);
Msg_Text msg1 =new Msg_Text(user1,RSSent.getString(4),RSSent.getString(3));
message.add(msg1);
message=message+"\n"+RSReceived.getString(3);
message=message+"\n"+RSSent.getString(3);
}else {
Msg_Text msg1 =new Msg_Text(user1,RSSent.getString(4),RSSent.getString(3));
message.add(msg1);
Msg_Text msg =new Msg_Text(user2,RSReceived.getString(4),RSReceived.getString(3));
message.add(msg);
message=message+"\n"+RSSent.getString(3);
message=message+"\n"+RSReceived.getString(3);
}
encore1=RSSent.next();
encore2=RSReceived.next();

3
Application/Clavardage/src/model/Chat.java
View file

@ -49,9 +49,6 @@ public class Chat {
public void addMessage(Message msg) {
this.messages.add(msg);
}
public void addListMessage( ArrayList<Message> msg) {
this.messages=msg;
}
public void activate() {
this.active = true;
}

7
Application/Clavardage/src/model/Message.java
View file

@ -24,10 +24,6 @@ public abstract class Message {
DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
this.date = dateFormat.format(new Date());
}
public Message(User autor, String date) {
this.autor = autor;
this.date = date;
}
/*** GETTERS ***/
public String getDate() {
return date;
@ -40,9 +36,6 @@ public abstract class Message {
public void setAutorIP(User autor) {
this.autor = autor;
}
public void setDate(String date) {
this.date=date;
}
public abstract Object getMessage();

4
Application/Clavardage/src/model/Msg_Text.java
View file

@ -11,10 +11,6 @@ public class Msg_Text extends Message{
super(autor);
this.text = text;
}
public Msg_Text(User autor,String date, String text) {
super(autor,date);
this.text = text;
}
@Override
public String getMessage() {