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

WIP4

Browse source
This commit is contained in:
Louis Farina 2021-01-11 19:55:29 +01:00
parent d477d4b4ae
commit 7e9db0d86d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/chat/NetworkClient.java
View file

@ -72,7 +72,6 @@ class ReceiveThread extends Thread {
{ {
while(!exit) while(!exit)
{ {
System.out.println(socket);
System.out.println("Waiting for a message"); System.out.println("Waiting for a message");
ObjectInputStream in = new ObjectInputStream(socket.getInputStream()); ObjectInputStream in = new ObjectInputStream(socket.getInputStream());
System.out.println("Received a message"); System.out.println("Received a message");
@ -172,7 +171,7 @@ class ConnectionListenerThread extends Thread {
if(accepted) if(accepted)
{ {
Socket s = (new ServerSocket(1237+(known_users.size()))).accept(); Socket s = (new ServerSocket(1237+(known_users.size()))).accept();
ReceiveThread t2 = new ReceiveThread(s, displayArea, known_users, knownUsersPanel, dest_sockets); (new ReceiveThread(s, displayArea, known_users, knownUsersPanel, dest_sockets)).start();
dest_sockets.add(s); dest_sockets.add(s);
known_users.add(new User(username)); known_users.add(new User(username));
@ -303,10 +302,11 @@ public class NetworkClient {
} }
for(String a:addressList) for(String a:addressList)
{ {
System.out.println("Connecting to " + a + " on port " + (1237+usernameList.length)); System.out.println("Connecting to " + a);
Socket s = new Socket(a, 1237+usernameList.length); System.out.println(" on port " + String.valueOf((1237+usernameList.length)));
ReceiveThread t2 = new ReceiveThread(s, chatText, known_users, knownUsersPanel, dest_sockets); Socket s = new Socket(a, (1237+usernameList.length));
dest_sockets.add(s); dest_sockets.add(s);
(new ReceiveThread(s, chatText, known_users, knownUsersPanel, dest_sockets)).start();
} }
Collections.sort(known_users); Collections.sort(known_users);
connected = true; connected = true;
@ -377,7 +377,7 @@ public class NetworkClient {
{ {
try try
{ {
// System.out.println(s); System.out.println(s);
ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream()); ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
out.writeObject(new Message(user.getName(), message)); out.writeObject(new Message(user.getName(), message));
} }