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 'develop' of C:\Users\CJIRWIN\Documents\team-13 with conflicts.

Browse Source
This commit is contained in:
cir27
2017-05-02 16:41:40 +12:00
parent 9817fc9093
commit 9c60521d00
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/App.java
+25
View File
@@ -5,6 +5,9 @@ import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.stage.Stage;
import seng302.models.parsers.StreamParser;
import seng302.models.parsers.StreamReceiver;
import seng302.server.ServerThread;
public class App extends Application
{
@@ -18,6 +21,28 @@ public class App extends Application
}
public static void main(String[] args) {
StreamReceiver sr;
new ServerThread("Racevision Test Server");
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
// if (args.length > 1){
// sr = new StreamReceiver("localhost", 8085, "RaceStream");
// }
// 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.start();
StreamParser streamParser = new StreamParser("StreamParser");
streamParser.start();
launch(args);
}
}