fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some merge issues.

Browse Source
This commit is contained in:
fjc40
2017-08-10 13:16:53 +12:00
parent 805c12bf41
commit 130ffcbf07
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class ConnectionAcceptor implements Runnable {
DataOutputStream outToVisualiser = new DataOutputStream(mockSocket.getOutputStream()); DataOutputStream outToVisualiser = new DataOutputStream(mockSocket.getOutputStream());
MockOutput mockOutput = new MockOutput(latestMessages, outToVisualiser); MockOutput mockOutput = new MockOutput(latestMessages, outToVisualiser);
ControllerServer controllerServer = new ControllerServer(mockSocket); //TODO probably pass assigned boat source ID into ControllerServer. ControllerServer controllerServer = new ControllerServer(mockSocket, this.rl); //TODO probably pass assigned boat source ID into ControllerServer.
new Thread(mockOutput, "ConnectionAcceptor.run()->MockOutput thread" + mockOutput).start(); new Thread(mockOutput, "ConnectionAcceptor.run()->MockOutput thread" + mockOutput).start();
new Thread(controllerServer, "ConnectionAcceptor.run()->ControllerServer thread" + controllerServer).start(); new Thread(controllerServer, "ConnectionAcceptor.run()->ControllerServer thread" + controllerServer).start();
racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class ControllerServer extends Observable implements Runnable {
try { try {
boatActionDecoder.decode(encodedMessage.getMessageBody()); boatActionDecoder.decode(encodedMessage.getMessageBody());
BoatAction boatAction = boatActionDecoder.getMessage(); BoatAction boatAction = boatActionDecoder.getMessage();
action = boatActionDecoder.getBoatAction(); action = boatAction.getBoatAction();
// Notify observers of most recent action // Notify observers of most recent action
this.notifyObservers(); this.notifyObservers();