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

Change default port to 4940

Browse Source 
#story[956] #pair[wmu16, mra106]
This commit is contained in:
Michael Rausch
2017-05-25 16:56:41 +12:00
parent 49e4c92da6
commit acbaa838ec
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/App.java
+40 -27
View File
@@ -4,6 +4,8 @@ import javafx.application.Application;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.Parent; import javafx.scene.Parent;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.stage.Stage; import javafx.stage.Stage;
import seng302.models.PolarTable; import seng302.models.PolarTable;
import seng302.models.stream.StreamParser; import seng302.models.stream.StreamParser;
@@ -32,45 +34,56 @@ public class App extends Application {
} }
public static void main(String[] args) { public static void main(String[] args) {
StreamReceiver sr = null;
new ServerThread("Racevision Test Server");
try { try {
StreamReceiver sr = null;
new ServerThread("Racevision Test Server");
try {
Thread.sleep(2000); Thread.sleep(2000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
if (args.length == 1 && args[0].equals("-standalone")) { if (args.length == 1 && args[0].equals("-standalone")) {
return; return;
} }
if (args.length == 3 && args[0].equals("-server")) { if (args.length == 3 && args[0].equals("-server")) {
sr = new StreamReceiver(args[1], Integer.valueOf(args[2]), "RaceStream"); sr = new StreamReceiver(args[1], Integer.valueOf(args[2]), "RaceStream");
} else if (args.length == 2 && args[0].equals("-server")) { } else if (args.length == 2 && args[0].equals("-server")) {
switch (args[1]) { switch (args[1]) {
case "internal": case "internal":
sr = new StreamReceiver("localhost", 4949, "RaceStream"); sr = new StreamReceiver("localhost", 4949, "RaceStream");
break; break;
case "staffserver": case "staffserver":
sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream"); sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
break; break;
case "official": case "official":
sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream"); sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
break; break;
} }
} }
//Change the StreamReceiver in this else block to change the default data source. //Change the StreamReceiver in this else block to change the default data source.
else{ else {
sr = new StreamReceiver("localhost", 4949, "RaceStream"); sr = new StreamReceiver("livedata.americascup.com", 4940, "RaceStream");
} }
sr.start(); sr.start();
StreamParser streamParser = new StreamParser("StreamParser"); StreamParser streamParser = new StreamParser("StreamParser");
streamParser.start(); streamParser.start();
}
catch (Exception e){
Alert alert = new Alert(AlertType.INFORMATION);
alert.setTitle("Information Dialog");
alert.setHeaderText("Fatal Error");
alert.setContentText("There was an error connecting to the AC35 stream");
alert.showAndWait();
}
launch(args); launch(args);