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

outdoor users(9)

Browse source
This commit is contained in:
Louis Farina 2021-02-14 21:53:37 +01:00
parent 8802af0f51
commit 6aba42871c
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/chat/NetworkClient.java
View file

@ -437,6 +437,7 @@ public class NetworkClient {
DatagramPacket responsePacket; DatagramPacket responsePacket;
String[] usernameList; String[] usernameList;
String[] outdoorUsernameList;
String[] addressList; String[] addressList;
int portNumber = 1237; int portNumber = 1237;
@ -472,8 +473,9 @@ public class NetworkClient {
String[] response = new String(responsePacket.getData()).trim().split(";"); String[] response = new String(responsePacket.getData()).trim().split(";");
usernameList = response[0].split(" "); usernameList = response[0].split(" ");
addressList = response[1].split(" "); outdoorUsernameList = response[1].split(" ");
portNumber = Integer.parseInt(response[2]); addressList = response[2].split(" ");
portNumber = Integer.parseInt(response[3]);
connectionSocket.close(); connectionSocket.close();
userListSocket.close(); userListSocket.close();
@ -486,8 +488,9 @@ public class NetworkClient {
out.println(username); out.println(username);
String[] response = in.readLine().split(";"); String[] response = in.readLine().split(";");
usernameList = response[0].split(" "); usernameList = response[0].split(" ");
outdoorUsernameList = response[1].split(" ");
addressList = new String[0]; addressList = new String[0];
portNumber = Integer.parseInt(response[2]); portNumber = Integer.parseInt(response[3]);
} }
for(String u:usernameList) for(String u:usernameList)
@ -566,18 +569,26 @@ public class NetworkClient {
} }
user.setName(username); user.setName(username);
if(!outdoor)
known_users.add(new User(username)); known_users.add(new User(username));
else
known_outdoor_users.add(new User(username));
Collections.sort(known_users); Collections.sort(known_users);
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());
knownUsersPanel.setText(""); knownUsersPanel.setText("");
knownUsersPanel.append(" Online :\n"); knownUsersPanel.append("Indoor users:\n");
for(User a:known_users) for(User a:known_users)
{ {
knownUsersPanel.append(" " + a.getName() + " \n"); knownUsersPanel.append(" " + a.getName() + " \n");
} }
knownUsersPanel.append("\nOutdoor users:\n");
for(User a:known_outdoor_users)
{
knownUsersPanel.append(" " + a.getName() + " \n");
}
} }
return connected; return connected;