michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wake_remake' of /home/cosc/student/wmu16/Documents/300/SENG302/team-13 with conflicts.

Browse Source
This commit is contained in:
William Muir
2017-05-01 22:00:12 +12:00
parent 3adadcc1e1
commit 944755fde1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/App.java
+5 -5
View File
@@ -31,16 +31,16 @@ public class App extends Application
}
if (args.length > 1){
sr = new StreamReceiver("localhost", 8085, "RaceStream");
sr = new StreamReceiver("localhost", 8085, "TestThread1");
}
else{
sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"RaceStream");
// sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
// sr = new StreamReceiver("localhost", 8085, "RaceStream");
// sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1");
// sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread1");
sr = new StreamReceiver("localhost", 8085, "TestThread1");
}
sr.start();
StreamParser streamParser = new StreamParser("StreamParser");
StreamParser streamParser = new StreamParser("TestThread2");
streamParser.start();
launch(args);
src/main/java/seng302/models/Race.java
+1 -1
View File
@@ -152,7 +152,7 @@ public class Race {
/**
* Set a boat as finished
* @param boat The boat that has finished the race
* @param boat The boat that has finished the race/home/cosc/student/wmu16
*/
public void setBoatFinished(Boat boat){
this.finishingOrder.add(boat);