farina/COO-farina-vincent
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactoring: modification de la classe User (fixed)

Browse source
This commit is contained in:
Louis Farina 2020-12-17 12:44:40 +01:00
parent 28d750584d
commit de1ffdb4a8
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/chat/NetworkClient.java
View file

@ -129,14 +129,18 @@ class ConnectionListenerThread extends Thread {
username = new String(request.getData(), 0, request.getLength()); username = new String(request.getData(), 0, request.getLength());
InetAddress clientAddress= request.getAddress(); InetAddress clientAddress= request.getAddress();
System.out.println("Received a request from " + username + "@" + clientAddress.getHostAddress()); System.out.println("Received a request from " + username + "@" + clientAddress.getHostAddress());
System.out.println("Response:");
if(known_users.indexOf(new User(username, clientAddress.getHostAddress())) != -1) for(User user:known_users)
{
System.out.println(user.getName() + ":" + user.getAddress());
}
oo.writeObject(known_users);
response1 = bStream.toByteArray();
responsePacket = new DatagramPacket(response1, response1.length, clientAddress, 1337);
responseSocket.send(responsePacket);
if(known_users.indexOf(new User(username, clientAddress.getHostAddress())) == -1)
{ {
oo.writeObject(known_users);
response1 = bStream.toByteArray();
responsePacket = new DatagramPacket(response1, response1.length, clientAddress, 1337);
responseSocket.send(responsePacket);
known_users.add(new User(username, clientAddress.getHostAddress())); known_users.add(new User(username, clientAddress.getHostAddress()));
} }
@ -146,7 +150,8 @@ class ConnectionListenerThread extends Thread {
} }
catch(Exception e) catch(Exception e)
{ {
System.out.println("nik!!"); e.printStackTrace();
System.out.println(e.getMessage());
} }
} }
} }
@ -228,13 +233,13 @@ public class NetworkClient {
System.out.println(userList.get(i).getName() + " : " + userList.get(i).getAddress()); System.out.println(userList.get(i).getName() + " : " + userList.get(i).getAddress());
known_users.add(userList.get(i)); known_users.add(userList.get(i));
} }
known_users.add(new User(username, getLocalIP())); known_users.add(new User(username, "25.67.234.235"));
connected = true; connected = true;
} }
} }
catch(SocketTimeoutException e) catch(SocketTimeoutException e)
{ {
known_users.add(new User(username, getLocalIP())); known_users.add(new User(username, "25.67.234.235"));
System.out.println("Reply timed out"); System.out.println("Reply timed out");
connected = true; connected = true;
} }
@ -252,6 +257,11 @@ public class NetworkClient {
{ {
user.setName(username); user.setName(username);
ReceiveThread t2 = new ReceiveThread(1237, chatText); ReceiveThread t2 = new ReceiveThread(1237, chatText);
for(User a:known_users)
{
System.out.println(a.getName() + ":" + a.getAddress());
}
ConnectionListenerThread t3 = new ConnectionListenerThread(known_users); ConnectionListenerThread t3 = new ConnectionListenerThread(known_users);
t2.start(); t2.start();
t3.start(); t3.start();

2
src/chat/User.java
View file

@ -3,7 +3,7 @@ package chat;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
public class User { public class User implements Serializable{
private String name; private String name;
private String address; private String address;