Compare commits
No commits in common. "a33aeb87ed6ac6657bf9145ccece62bbfc55173b" and "a9fa3e3ef4e16787fc5cab8a52ca84ed2e46b7c8" have entirely different histories.
a33aeb87ed
...
a9fa3e3ef4
2 changed files with 5 additions and 8 deletions
|
|
@ -18,7 +18,7 @@ import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
//import javax.websocket.DeploymentException;
|
import javax.websocket.DeploymentException;
|
||||||
|
|
||||||
import model.Chat;
|
import model.Chat;
|
||||||
import model.LocalUser;
|
import model.LocalUser;
|
||||||
|
|
@ -26,7 +26,7 @@ import model.Message;
|
||||||
import model.Msg_Text;
|
import model.Msg_Text;
|
||||||
import model.RemoteUser;
|
import model.RemoteUser;
|
||||||
import view.Interface;
|
import view.Interface;
|
||||||
//import websocket.Appel;
|
import websocket.Appel;
|
||||||
|
|
||||||
public class Controller {
|
public class Controller {
|
||||||
|
|
||||||
|
|
@ -500,22 +500,19 @@ public class Controller {
|
||||||
ArrayList<Controller> lstCtr = new ArrayList<Controller>();
|
ArrayList<Controller> lstCtr = new ArrayList<Controller>();
|
||||||
|
|
||||||
// REMOTE USERS
|
// REMOTE USERS
|
||||||
/*
|
|
||||||
Controller ctr1 = new Controller(31011,portUDPlistening_remoteUsr1,31021,"Theau",histoire);
|
Controller ctr1 = new Controller(31011,portUDPlistening_remoteUsr1,31021,"Theau",histoire);
|
||||||
lstCtr.add(ctr1);
|
lstCtr.add(ctr1);
|
||||||
|
|
||||||
Controller ctr2 = new Controller(31012,portUDPlistening_remoteUsr2,31022,"Leonie",histoire);
|
Controller ctr2 = new Controller(31012,portUDPlistening_remoteUsr2,31022,"Leonie",histoire);
|
||||||
lstCtr.add(ctr2);
|
lstCtr.add(ctr2);
|
||||||
|
|
||||||
Controller ctr3 = new Controller(31013,portUDPlistening_remoteUsr3,31023,"Alexandre",histoire);
|
Controller ctr3 = new Controller(31013,portUDPlistening_remoteUsr3,31023,"Alexandre",histoire);
|
||||||
lstCtr.add(ctr3);
|
lstCtr.add(ctr3);
|
||||||
*/
|
|
||||||
// LOCAL USER
|
// LOCAL USER
|
||||||
Controller ctr = new Controller(31014,portUDPlistening_local,31024,histoire);
|
Controller ctr = new Controller(31014,portUDPlistening_local,31024,histoire);
|
||||||
lstCtr.add(ctr);
|
lstCtr.add(ctr);
|
||||||
|
|
||||||
//Appel app=new Appel();
|
Appel app=new Appel();
|
||||||
//app.test();
|
app.test();
|
||||||
|
|
||||||
/** Loop **/
|
/** Loop **/
|
||||||
Boolean running = isRunning(lstCtr);
|
Boolean running = isRunning(lstCtr);
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in a new issue