|
|
|
|
@ -30,19 +30,15 @@ public class ControllerServer extends Observable implements Runnable {
|
|
|
|
|
* Last received boat action
|
|
|
|
|
*/
|
|
|
|
|
private BoatActionEnum action;
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
private RaceLogic rc;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Initialise server-side controller with live client socket
|
|
|
|
|
* @param socket to client
|
|
|
|
|
* @param race logic loop observing controls
|
|
|
|
|
*/
|
|
|
|
|
public ControllerServer(Socket socket, RaceLogic rc) {
|
|
|
|
|
public ControllerServer(Socket socket, RaceLogic race) {
|
|
|
|
|
this.socket = socket;
|
|
|
|
|
this.rc = rc;
|
|
|
|
|
this.addObserver(rc);
|
|
|
|
|
this.addObserver(race);
|
|
|
|
|
try {
|
|
|
|
|
this.inputStream = new DataInputStream(this.socket.getInputStream());
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
|