diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java b/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java index fba06cb5..b7a150f2 100644 --- a/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java +++ b/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java @@ -13,7 +13,7 @@ public class CommandFactory { * @param race to receive command * @param boat to receive command in race * @param action number to select command - * @return + * @return command object corresponding to action */ public static Command createCommand(MockRace race, MockBoat boat, BoatActionEnum action) { switch(action) { diff --git a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java index 63c5b263..119cbbad 100644 --- a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java +++ b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java @@ -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) {