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

WIP1

Browse source
This commit is contained in:
Louis Farina 2021-01-11 18:12:34 +01:00
parent b91f7a1c10
commit e78d5e444c
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/chat/NetworkClient.java
View file

@ -78,6 +78,9 @@ class ReceiveThread extends Thread {
try try
{ {
link = servSocket.accept(); link = servSocket.accept();
ReceiveThread next = new ReceiveThread(port+1, displayArea, known_users, knownUsersPanel);
next.start();
connected = true; connected = true;
while(!exit) while(!exit)
@ -119,7 +122,7 @@ class ReceiveThread extends Thread {
} }
catch(IOException e) catch(IOException e)
{ {
System.out.println("nik2 !"); e.printStackTrace();
} }
} }
} }
@ -174,7 +177,7 @@ class ConnectionListenerThread extends Thread {
response += ";"; response += ";";
for(Socket s:dest_sockets) for(Socket s:dest_sockets)
{ {
response += s.getInetAddress() + " "; response += s.getInetAddress().getHostAddress() + " ";
} }
System.out.println("Response :" + response); System.out.println("Response :" + response);
responseBytes = response.getBytes(); responseBytes = response.getBytes();
@ -188,9 +191,6 @@ class ConnectionListenerThread extends Thread {
} }
if(accepted) if(accepted)
{ {
ReceiveThread next = new ReceiveThread(1237, displayArea, known_users, knownUsersPanel);
next.start();
known_users.add(new User(username)); known_users.add(new User(username));
Collections.sort(known_users); Collections.sort(known_users);
@ -204,10 +204,6 @@ class ConnectionListenerThread extends Thread {
knownUsersPanel.append(" " + a.getName() + " \n"); knownUsersPanel.append(" " + a.getName() + " \n");
} }
} }
else
{
System.out.println("Username already taken");
}
} }
catch(SocketTimeoutException e) {} catch(SocketTimeoutException e) {}
} }
@ -304,7 +300,7 @@ public class NetworkClient {
} }
for(String a:addressList) for(String a:addressList)
{ {
dest_sockets.add(new Socket(a, 1237)); dest_sockets.add(new Socket(a, 1237+(known_users.size())));
} }
Collections.sort(known_users); Collections.sort(known_users);
connected = true; connected = true;
@ -331,9 +327,7 @@ public class NetworkClient {
if(connected) if(connected)
{ {
user.setName(username); ReceiveThread t2 = new ReceiveThread(1237+(known_users.size()), chatText, known_users, knownUsersPanel);
known_users.add(new User(username));
ReceiveThread t2 = new ReceiveThread(1237, chatText, known_users, knownUsersPanel);
ConnectionListenerThread t3 = new ConnectionListenerThread(known_users, dest_sockets, chatText, knownUsersPanel); ConnectionListenerThread t3 = new ConnectionListenerThread(known_users, dest_sockets, chatText, knownUsersPanel);
t2.start(); t2.start();
@ -341,10 +335,13 @@ public class NetworkClient {
try try
{ {
dest_sockets.add(new Socket("25.67.234.235", 1237)); dest_sockets.add(new Socket("25.67.234.235", 1237+(known_users.size())));
} }
catch(IOException e){} catch(IOException e){}
user.setName(username);
known_users.add(new User(username));
chatText.append(username + " has joined the chat.\n"); chatText.append(username + " has joined the chat.\n");
chatText.setCaretPosition(chatText.getDocument().getLength()); chatText.setCaretPosition(chatText.getDocument().getLength());