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

Merge remote-tracking branch 'origin/Story1247_AutoDiscovery' into NewUI

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/java/seng302/App.java
#	src/main/java/seng302/visualiser/controllers/StartScreenController.java
#	src/main/resources/views/StartScreenView.fxml
This commit is contained in:
Michael Rausch
2017-09-07 16:36:30 +12:00
parent 0feccdc8b9 eb1d3f1a60
commit 8cc725616c
16 changed files with 607 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/App.java
+21 -5
View File
@@ -8,14 +8,13 @@ import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.image.Image;
import javafx.stage.Stage;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import seng302.visualiser.controllers.ViewManager;
import seng302.gameServer.ServerAdvertiser;
import java.io.IOException;
public class App extends Application {
@@ -86,6 +85,21 @@ public class App extends Application {
primaryStage.setScene(scene);
primaryStage.show();
primaryStage.setOnCloseRequest(e -> {
// ClientPacketParser.appClose();
// ClientPacketParser.appClose();
try {
ServerAdvertiser.getInstance().unregister();
} catch (IOException e1) {
logger.warn("Could not un-register game");
}
System.exit(0);
});
// ClientState.primaryStage = primaryStage;
primaryStage.setOnCloseRequest(e -> System.exit(0));
}
@@ -94,6 +108,8 @@ public class App extends Application {
parseArgs(args);
} catch (ParseException e) {
logger.error("Could not parse command line arguments");
} catch (IOException e) {
e.printStackTrace();
}
launch(args);