|
From: <car...@us...> - 2003-03-24 02:54:29
|
Update of /cvsroot/madsserv/madsserv/src/simulator
In directory sc8-pr-cvs1:/tmp/cvs-serv21811/simulator
Modified Files:
Simulator.java ThreadScript.java
Log Message:
Version stable et fonctionnelle
Index: Simulator.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/simulator/Simulator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Simulator.java 23 Mar 2003 15:12:43 -0000 1.5
--- Simulator.java 24 Mar 2003 02:54:25 -0000 1.6
***************
*** 71,75 ****
//Socket
private Socket mySocket = null;
! public DialogServer dialogServer;
public LogCenter log;
private Script interpreteScript;
--- 71,75 ----
//Socket
private Socket mySocket = null;
! public DialogServerSimu dialogServerSimu;
public LogCenter log;
private Script interpreteScript;
***************
*** 213,217 ****
String messageToSend[] = new String[1];
messageToSend[0] = "fin de la connexion";
! dialogServer.sendMessage(DECONNEXION_FROM_SIMU, messageToSend);
log.close();
System.exit(0);
--- 213,217 ----
String messageToSend[] = new String[1];
messageToSend[0] = "fin de la connexion";
! dialogServerSimu.sendMessage(DECONNEXION_FROM_SIMU, messageToSend);
log.close();
System.exit(0);
***************
*** 257,262 ****
}
! dialogServer = new DialogServer(mySocket, this);
! dialogServer.start();
if (getScript().compareTo("") != 0)
{
--- 257,262 ----
}
! dialogServerSimu = new DialogServerSimu(mySocket, this);
! dialogServerSimu.start();
if (getScript().compareTo("") != 0)
{
***************
*** 273,277 ****
addLog( ("Changement de Qualite;" + messageToSend[0]).concat(";" +
messageToSend[1]));
! dialogServer.sendMessage(UPDATE_FROM_SIMU, messageToSend);
}
}
--- 273,277 ----
addLog( ("Changement de Qualite;" + messageToSend[0]).concat(";" +
messageToSend[1]));
! dialogServerSimu.sendMessage(UPDATE_FROM_SIMU, messageToSend);
}
}
***************
*** 351,355 ****
*/
public void endConnexion() {
! dialogServer.stop();
mySocket = null;
}
--- 351,355 ----
*/
public void endConnexion() {
! dialogServerSimu.stop();
mySocket = null;
}
Index: ThreadScript.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/simulator/ThreadScript.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ThreadScript.java 23 Mar 2003 15:12:43 -0000 1.2
--- ThreadScript.java 24 Mar 2003 02:54:26 -0000 1.3
***************
*** 68,72 ****
Thread.sleep(bidule*1000); }
catch (InterruptedException e) { }
! sim.dialogServer.sendMessage(2,message);
System.out.println("j'envoie le niveau de qualite " + message[1] + " au client " + message[0]);
--- 68,72 ----
Thread.sleep(bidule*1000); }
catch (InterruptedException e) { }
! sim.dialogServerSimu.sendMessage(2,message);
System.out.println("j'envoie le niveau de qualite " + message[1] + " au client " + message[0]);
|