Application/Clavardage/src/controller/Historique.java

@@ -1,7 +1,4 @@
-package controller;
-
 import java.sql.Connection;
-
 import java.sql.Date;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -11,7 +8,7 @@ import java.sql.Statement;
 import java.util.Calendar;
 
 public class Historique {
-	private model.Database bdd;
+	private Database bdd;
 	private ResultSet rs_received;
 	private ResultSet rs_sent;	
 	private ResultSetMetaData rsmd_received;
@@ -46,12 +43,12 @@ public class Historique {
 		return this.rsmd_sent;
 	}
 	
-	public void saveMessage(model.User ctr1, model.RemoteUser ctr2, String input, String date) {
+	public void saveMessage(User user1, RemoteUser user2, String input, String date) {
 		System.out.println("coucou");
 
 		int nb_changed_rows=0;
 		try {
-			nb_changed_rows = this.bdd.getStatement().executeUpdate("INSERT INTO chat values ("+ctr1.getIPcode()+","+ctr2.getIPcode()+","+input+","+date+")");
+			nb_changed_rows = this.bdd.getStatement().executeUpdate("INSERT INTO chat values ("+user1.getIPcode()+","+user2.addIP+","+input+","+date+")");
 		} catch (SQLException e) {
 			System.out.println("insertion pas établit");
 			e.printStackTrace();
@@ -62,7 +59,7 @@ public class Historique {
 		}
 	}
 	
-	public String retrieveMessage(model.User user1, model.RemoteUser user2) throws SQLException {
+	public String retrieveMessage(User user1, RemoteUser user2) throws SQLException {
 		this.setRSSent(this.bdd.getStatement().executeQuery("SELECT"+user1.getIPcode()+","+user2.getIPcode()+",? ,? FROM table"));
 		this.setRSReceived(this.bdd.getStatement().executeQuery("SELECT"+user2.getIPcode()+","+user1.getIPcode()+",?, ? FROM table"));
 		//this.setRSMDSent(this.getRSSent().getMetaData());
@@ -111,7 +108,7 @@ public class Historique {
 	//MAIN
 	public void Historique() {
 		
-		this.bdd=new model.Database();
+		this.bdd=new Database();
 		System.out.println("coucoudb");
 		
 		

Application/Clavardage/src/controller/ListeningThreadTCPConnection.java

@@ -29,6 +29,7 @@ public class ListeningThreadTCPConnection extends ListeningThread{
 		threadtcpchat.start();
 		threadtcpchat.interrupt();
 		
+		
 	}
 	
 	/* run

Application/Clavardage/src/model/Database.java

@@ -1,7 +1,4 @@
-package model;
-
 import java.sql.Connection;
-
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;

Application/Clavardage/src/model/User.java

@@ -26,7 +26,6 @@ public abstract class User {
 	protected String pseudo;
 	protected InetAddress addIP;
 	protected int portTCP;
-	protected int IPcode;
 	
 	/**
 	 *  Constructor of User (local)
@@ -43,14 +42,10 @@ public abstract class User {
 		this.pseudo = pseudo;
 		this.addIP=addIP;
 		this.portTCP=portTCP;
-		this.IPcode=addIP.hashCode();
 	}
 
 	
 	/*** GETTERS ***/
-	public int getIPcode() {
-		return IPcode;
-	}
 	public String getPseudo() {
 		return pseudo;
 	}
@@ -60,7 +55,6 @@ public abstract class User {
 	public int getPortTCP() {
 		return portTCP;
 	}
-
 	
 	/*** SETTERS ***/
 	public void setPseudo(String pseudo) {