ClientsData updated

rhabban · rhabban · commit b9170dba0f13 · 2017-03-05T17:05:27.000+01:00
diff --git a/src/client/ClientThread.java b/src/client/ClientThread.java
@@ -50,6 +50,9 @@ public synchronized void run() {
 				} else {
 					streamOut.writeObject(new Message( Message._NAME_, "Bonjour " + clientName + " et bienvenue dans le chat. Pour communiquer avec les utilisateurs, il est nécessaire de se positionner à leur portée", clientName, 0, 0, null));
 				}
+				ArrayList<Client> clients = getClients();
+				
+				
 				//streamOut.flush();
 			}				
 
@@ -86,10 +89,12 @@ public synchronized void run() {
 	}
 	
 	public synchronized void sendMessages(ArrayList<Message> messages){
+		ArrayList<Client> clients = getClients();
 
 		for(ClientThread thread : threads){
 			for(Message message : messages){
 				try {
+					message.clients = clients;
 					/*MessageValidator val = new MessageValidator(this.clientData, thread.clientData);
 					if(this == thread || val.isClientsNear() == true)
 						thread.streamOut.writeObject(message);
@@ -108,7 +113,6 @@ public synchronized void sendMessage(Message message){
 		messages.add(message);
 		sendMessages(messages);
 		
-		//TODO : Le message est sensé contenir la listes des clients lq cette méthode est appelée par refreshClientData
 		System.out.println("ClientThread.sendMessage :" + messages);
 	}
 	
@@ -117,14 +121,12 @@ public synchronized void refreshClientData(String name, int posX, int posY){
 		this.clientData.setX(posX);
 		this.clientData.setY(posY);
 		
-		System.out.println("ClientThread.refreshClientData :"+this.clientData);
 		System.out.println(name+" position has been updated");
-		
+	}
+	
+	public synchronized Message createClientsMessage(){
 		ArrayList<Client> clients = getClients();
-
-		System.out.println("ClientThread.refreshClientData getClients() :"+ clients);
-		
-		sendMessage(new Message(Message._CLIENTS_, "", "", 0, 0, clients));
+		return (new Message(Message._CLIENTS_, clients));
 	}
 	
 	public ArrayList<Client> getClients(){
diff --git a/src/client/ReceivingThread.java b/src/client/ReceivingThread.java
@@ -32,12 +32,9 @@ public void run()
 				if(msg.type == Message._NAME_){
 					this.client.setName(msg.clientName);
 				}
-				if(msg.type == Message._CLIENTS_){
-					this.client.setClientsData(msg.clients);
-					continue;
-				}				
+				this.client.setClientsData(msg.clients);
 				this.client.notifyObservers("<"+msg.clientName+">"+msg.text);
-				System.out.println("ReceivingThread.run thisClients : "+this.client.getClientsData());
+				System.out.println("ReceivingThread.run Message :" + msg);
         	}
 
         } catch (IOException | ClassNotFoundException e) {
diff --git a/src/model/Message.java b/src/model/Message.java
@@ -15,6 +15,7 @@ public class Message implements Serializable {
 	public final static int _CLIENTS_ = 2;
 	public final static int _DISCONNECT_ = 3;
 	public final static int _POSITION_ = 4;
+	public final static int _CONNECT_ = 5;
 	
 	public int type;
 	public String text;
@@ -33,6 +34,11 @@ public Message(int type, String text, String clientName, int posX, int posY, Arr
 		this.posY = posY;
 		this.clients = clients;
 	}
+	
+	public Message(int type, ArrayList<Client> clients){
+		this.type = type;
+		this.clients = clients;
+	}
 
 	@Override
 	public String toString() {

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,9 @@ public void run()`
`32`	`32`	`if(msg.type == Message._NAME_){`
`33`	`33`	`this.client.setName(msg.clientName);`
`34`	`34`	`}`
`35`		`- if(msg.type == Message._CLIENTS_){`
`36`		`- this.client.setClientsData(msg.clients);`
`37`		`- continue;`
`38`		`- }`
	`35`	`+ this.client.setClientsData(msg.clients);`
`39`	`36`	`this.client.notifyObservers("<"+msg.clientName+">"+msg.text);`
`40`		`- System.out.println("ReceivingThread.run thisClients : "+this.client.getClientsData());`
	`37`	`+ System.out.println("ReceivingThread.run Message :" + msg);`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`} catch (IOException \| ClassNotFoundException e) {`