Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/server/ClientHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private boolean connectClient() {

}

public void messageToAll(String message, String name) {
public void message(String message, String name) {
pw.println("MESSAGE#" + name + "#" + message);
}

Expand Down
51 changes: 25 additions & 26 deletions src/main/java/server/MessageHandler.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package server;




import java.util.NoSuchElementException;
import java.util.concurrent.ConcurrentHashMap;

Expand Down Expand Up @@ -47,9 +45,6 @@ public boolean commandHandler(String msg, String myName) {
}
break;




}
default:
myClientHandler.writeToClient("unknown command");
Expand All @@ -59,35 +54,39 @@ public boolean commandHandler(String msg, String myName) {
}
return true;
}
public void sendToUsers (String message, String sender, String[]receivers){

for (int i = 0; i < receivers.length; i++) {
if (userList.containsKey(receivers[i])) {
public void sendToUsers(String message, String sender, String[] receivers) {

for (int i = 0; i < receivers.length; i++) {
if (userList.containsKey(receivers[i])) {

userList.get(receivers[i]).messageToAll(message, sender);
userList.get(receivers[i]).message(message, sender);

}
}
}
myClientHandler.writeToClient("Message Sent to " + receivers.length + "users.");
}

public void sendToAllUser (String message, String name){
userList.values().forEach(clientHandler -> {
clientHandler.messageToAll(message, name);
});
}
public void sendToAllUser(String message, String name) {
userList.values().forEach(clientHandler -> {
clientHandler.message(message, name);
});
myClientHandler.writeToClient("Message Sent to all users.");
}

public void sendOnlineMessage () {
public void sendOnlineMessage() {

userList.values().forEach(clientHandler -> {
clientHandler.sendOnlineMesage();
});
}
userList.values().forEach(clientHandler -> {
clientHandler.sendOnlineMesage();
});
}

public void sendToSpecificUser (String message, String name, String user){
if (userList.containsKey(user)) {
userList.get(user).messageToAll(message, name);
} else {
throw new NoSuchElementException();
}
public void sendToSpecificUser(String message, String name, String user) {
if (userList.containsKey(user)) {
userList.get(user).message(message, name);
} else {
myClientHandler.writeToClient("User does not exist");
}
myClientHandler.writeToClient("Message Sent to " + user);
}
}