|
@@ -15,28 +15,30 @@ public class Server {
|
|
|
users = new ArrayList<User>();
|
|
users = new ArrayList<User>();
|
|
|
messages = new ArrayList<Message>();
|
|
messages = new ArrayList<Message>();
|
|
|
|
|
|
|
|
- ServerSocket server = null;
|
|
|
|
|
-
|
|
|
|
|
- try {
|
|
|
|
|
- server = new ServerSocket(port);
|
|
|
|
|
- } catch (IOException e) {
|
|
|
|
|
- System.out.println("Something went wrong, abort.");
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- while(true){
|
|
|
|
|
- System.out.println("Waiting for clients...");
|
|
|
|
|
- Socket client = null;
|
|
|
|
|
- try {
|
|
|
|
|
- client = server.accept();
|
|
|
|
|
- } catch (IOException e) {
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
|
|
+ Thread clientconnect = new Thread(new Runnable() {
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void run() {
|
|
|
|
|
+ try {
|
|
|
|
|
+ ServerSocket server = new ServerSocket(port);
|
|
|
|
|
+ while(true){
|
|
|
|
|
+ System.out.println("Waiting for clients...");
|
|
|
|
|
+ try {
|
|
|
|
|
+ Socket client = server.accept();
|
|
|
|
|
+ //TODO: Check in banned list and read username and color from reply message
|
|
|
|
|
+ users.add(new User("test", Color.red, client, Server.this));
|
|
|
|
|
+ System.out.println("New client connected: " + client.getRemoteSocketAddress());
|
|
|
|
|
+ System.out.println("Total users connected: " + users.size());
|
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
|
+ System.out.println("Something went wrong, abort.");
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- //TODO: Check in banned list and read username and color from reply message
|
|
|
|
|
- users.add(new User("test", Color.red, client, this));
|
|
|
|
|
- System.out.println("New client connected: " + client.getRemoteSocketAddress());
|
|
|
|
|
- System.out.println("Total users connected: " + users.size());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ });
|
|
|
|
|
+ clientconnect.start();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public synchronized void addMessage(Message message){
|
|
public synchronized void addMessage(Message message){
|