|
@@ -18,7 +18,7 @@ import java.util.Calendar;
|
18
|
18
|
import java.util.Date;
|
19
|
19
|
|
20
|
20
|
import javax.swing.JOptionPane;
|
21
|
|
-import javax.websocket.DeploymentException;
|
|
21
|
+//import javax.websocket.DeploymentException;
|
22
|
22
|
|
23
|
23
|
import model.Chat;
|
24
|
24
|
import model.LocalUser;
|
|
@@ -26,7 +26,7 @@ import model.Message;
|
26
|
26
|
import model.Msg_Text;
|
27
|
27
|
import model.RemoteUser;
|
28
|
28
|
import view.Interface;
|
29
|
|
-import websocket.Appel;
|
|
29
|
+//import websocket.Appel;
|
30
|
30
|
|
31
|
31
|
public class Controller {
|
32
|
32
|
|
|
@@ -500,19 +500,22 @@ public class Controller {
|
500
|
500
|
ArrayList<Controller> lstCtr = new ArrayList<Controller>();
|
501
|
501
|
|
502
|
502
|
// REMOTE USERS
|
|
503
|
+/*
|
503
|
504
|
Controller ctr1 = new Controller(31011,portUDPlistening_remoteUsr1,31021,"Theau",histoire);
|
504
|
505
|
lstCtr.add(ctr1);
|
|
506
|
+
|
505
|
507
|
Controller ctr2 = new Controller(31012,portUDPlistening_remoteUsr2,31022,"Leonie",histoire);
|
506
|
508
|
lstCtr.add(ctr2);
|
|
509
|
+
|
507
|
510
|
Controller ctr3 = new Controller(31013,portUDPlistening_remoteUsr3,31023,"Alexandre",histoire);
|
508
|
511
|
lstCtr.add(ctr3);
|
509
|
|
-
|
|
512
|
+*/
|
510
|
513
|
// LOCAL USER
|
511
|
514
|
Controller ctr = new Controller(31014,portUDPlistening_local,31024,histoire);
|
512
|
515
|
lstCtr.add(ctr);
|
513
|
516
|
|
514
|
|
- Appel app=new Appel();
|
515
|
|
- app.test();
|
|
517
|
+ //Appel app=new Appel();
|
|
518
|
+ //app.test();
|
516
|
519
|
|
517
|
520
|
/** Loop **/
|
518
|
521
|
Boolean running = isRunning(lstCtr);
|