Host starts with button in ConnectionController

- Converted Event to Singleton for configuring and hosting no more than one game instance.
- Retrieve address and port from ConnectionAcceptor
- Automatically add local host to host list

#story[1010]

racevisionGame/pom.xml

@@ -104,7 +104,7 @@
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
-                                        <Main-Class>mock.app.App</Main-Class>
+                                        <Main-Class>visualiser.app.App</Main-Class>
                                         <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
                                         <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
                                     </manifestEntries>

racevisionGame/src/main/java/mock/app/App.java

@@ -1,56 +0,0 @@
-package mock.app;
-
-
-import javafx.application.Application;
-import javafx.stage.Stage;
-import mock.dataInput.PolarParser;
-import mock.model.Polars;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import shared.dataInput.XMLReader;
-import shared.enums.XMLFileType;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-public class App extends Application {
-
-    /**
-     * Entry point for running the programme
-     *
-     * @param args for starting the programme
-     */
-    public static void main(String[] args) {
-        launch(args);
-    }
-
-    @Override
-    public void start(Stage primaryStage) {
-        try {
-            Polars boatPolars = PolarParser.parse("mock/polars/acc_polars.csv");
-
-            String regattaXML = XMLReader.readXMLFileToString("mock/mockXML/regattaTest.xml", StandardCharsets.UTF_8);
-            String raceXML = XMLReader.readXMLFileToString("mock/mockXML/raceTest.xml", StandardCharsets.UTF_8);
-            String boatXML = XMLReader.readXMLFileToString("mock/mockXML/boatTest.xml", StandardCharsets.UTF_8);
-
-            Event raceEvent = new Event(raceXML, regattaXML, boatXML, XMLFileType.Contents, boatPolars);
-            raceEvent.start();
-
-        } catch (Exception e) {
-            //Catch all exceptions, print, and exit.
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-
-
-}

racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java

@@ -8,8 +8,10 @@ import org.mockito.Mock;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -54,6 +56,14 @@ public class ConnectionAcceptor implements Runnable {
         new Thread(checkClientConnection).start();
     }
 
+    public String getAddress() throws UnknownHostException {
+        return InetAddress.getLocalHost().getHostAddress();
+    }
+
+    public int getServerPort() {
+        return serverPort;
+    }
+
     /**
      * Run the Acceptor
      */

racevisionGame/src/main/java/mock/app/Event.java

@@ -1,5 +1,6 @@
 package mock.app;
 
+import mock.dataInput.PolarParser;
 import mock.model.MockRace;
 import mock.model.Polars;
 import network.Messages.LatestMessages;
@@ -11,7 +12,10 @@ import shared.exceptions.InvalidRegattaDataException;
 import shared.exceptions.XMLReaderException;
 import shared.model.Constants;
 
+import javax.xml.transform.TransformerException;
 import java.io.IOException;
+import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
@@ -20,6 +24,7 @@ import java.time.format.DateTimeFormatter;
  * A Race Event, this holds all of the race's information as well as handling the connection to its clients.
  */
 public class Event {
+    private static Event theEvent = new Event();
 
     private String raceXML;
     private String regattaXML;
@@ -32,36 +37,42 @@ public class Event {
     private ConnectionAcceptor mockOutput;
     private LatestMessages latestMessages;
 
-
     /**
      * Constructs an event, using various XML files.
-     * @param raceXML The race.xml file.
-     * @param regattaXML The regatta.xml file.
-     * @param boatXML The boat.xml file.
-     * @param type How to read the file - e.g., load as resource.
-     * @param boatPolars polars that the boat uses
      */
-    public Event(String raceXML, String regattaXML, String boatXML, XMLFileType type, Polars boatPolars) {
+    private Event() {
-
+        try {
-        this.raceXML = getRaceXMLAtCurrentTime(raceXML);
+            this.raceXML = getRaceXMLAtCurrentTime(XMLReader.readXMLFileToString("mock/mockXML/raceTest.xml", StandardCharsets.UTF_8));
-        this.boatXML = boatXML;
+            this.boatXML = XMLReader.readXMLFileToString("mock/mockXML/boatTest.xml", StandardCharsets.UTF_8);
-        this.regattaXML = regattaXML;
+            this.regattaXML = XMLReader.readXMLFileToString("mock/mockXML/regattaTest.xml", StandardCharsets.UTF_8);
-        this.xmlFileType = type;
+            this.xmlFileType = XMLFileType.Contents;
-
-        this.boatPolars = boatPolars;
-
-        this.latestMessages = new LatestMessages();
 
+            this.boatPolars = PolarParser.parse("mock/polars/acc_polars.csv");
 
-        try {
+            this.latestMessages = new LatestMessages();
             this.mockOutput = new ConnectionAcceptor(latestMessages);
-            new Thread(mockOutput).start();
+        }
-
+         catch (IOException e) {
-        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (XMLReaderException e) {
+            e.printStackTrace();
+        } catch (TransformerException e) {
             e.printStackTrace();
         }
     }
 
+    public static Event getEvent() {
+        return theEvent;
+    }
+
+    public String getAddress() throws UnknownHostException {
+        return mockOutput.getAddress();
+    }
+
+    public int getPort() {
+        return mockOutput.getServerPort();
+    }
+
     /**
      * Sends the initial race data and then begins race simulation.
      * @throws InvalidRaceDataException Thrown if the race xml file cannot be parsed.
@@ -70,6 +81,7 @@ public class Event {
      * @throws InvalidRegattaDataException Thrown if the regatta xml file cannot be parsed.
      */
     public void start() throws InvalidRaceDataException, XMLReaderException, InvalidBoatDataException, InvalidRegattaDataException {
+        new Thread(mockOutput).start();
 
         sendXMLs();
 
@@ -119,5 +131,4 @@ public class Event {
         return raceXML;
 
     }
-
 }

racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java

@@ -8,11 +8,17 @@ import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.AnchorPane;
+import mock.app.Event;
+import shared.exceptions.InvalidBoatDataException;
+import shared.exceptions.InvalidRaceDataException;
+import shared.exceptions.InvalidRegattaDataException;
+import shared.exceptions.XMLReaderException;
 import visualiser.model.RaceConnection;
 
 import java.io.IOException;
 import java.net.Socket;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.ResourceBundle;
 
 /**
@@ -41,8 +47,6 @@ public class ConnectionController extends Controller {
     public void initialize(URL location, ResourceBundle resources) {
         // TODO - replace with config file
         connections = FXCollections.observableArrayList();
-        connections.add(new RaceConnection("livedata.americascup.com", 4941));
-        connections.add(new RaceConnection("localhost", 4942));
 
         connectionTable.setItems(connections);
         hostnameColumn.setCellValueFactory(cellData -> cellData.getValue().hostnameProperty());
@@ -95,4 +99,28 @@ public class ConnectionController extends Controller {
         }
 
     }
+
+    /**
+     * Sets up a new host
+     */
+    public void addLocal() {
+        try {
+            Event game = Event.getEvent();
+            urlField.textProperty().set(game.getAddress());
+            portField.textProperty().set(Integer.toString(game.getPort()));
+
+            game.start();
+            addConnection();
+        } catch (InvalidRaceDataException e) {
+            e.printStackTrace();
+        } catch (XMLReaderException e) {
+            e.printStackTrace();
+        } catch (InvalidBoatDataException e) {
+            e.printStackTrace();
+        } catch (InvalidRegattaDataException e) {
+            e.printStackTrace();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+    }
 }

racevisionGame/src/main/java/visualiser/model/RaceConnection.java

@@ -15,6 +15,11 @@ public class RaceConnection {
     private final int port;
     private final StringProperty status;
 
+    /**
+     * Constructor for remote host connections.
+     * @param hostname URL for remote host
+     * @param port port for game feed
+     */
     public RaceConnection(String hostname, int port) {
         this.hostname = new SimpleStringProperty(hostname);
         this.port = port;

racevisionGame/src/main/resources/visualiser/scenes/connect.fxml

@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
+<?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
-<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.ConnectionController">
+
+<AnchorPane fx:id="connectionWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.ConnectionController">
    <children>
       <GridPane fx:id="connection" prefHeight="600.0" prefWidth="780.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="600.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="80.0" />
-            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="600.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="308.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="301.0" />
+            <ColumnConstraints hgrow="SOMETIMES" maxWidth="600.0" minWidth="10.0" prefWidth="80.0" />
          </columnConstraints>
          <rowConstraints>
             <RowConstraints maxHeight="182.0" minHeight="10.0" prefHeight="182.0" vgrow="SOMETIMES" />
@@ -18,42 +28,43 @@
             <RowConstraints maxHeight="80.0" minHeight="50.0" prefHeight="80.0" vgrow="SOMETIMES" />
          </rowConstraints>
          <children>
-            <TableView fx:id="connectionTable" prefHeight="200.0" prefWidth="1080.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+            <TableView fx:id="connectionTable" prefHeight="200.0" prefWidth="1080.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1">
                <columns>
                   <TableColumn fx:id="hostnameColumn" prefWidth="453.99998474121094" text="Host" />
                   <TableColumn fx:id="statusColumn" prefWidth="205.0" text="Status" />
                </columns>
                <GridPane.margin>
-                  <Insets left="50.0" right="50.0" />
+                  <Insets />
                </GridPane.margin>
             </TableView>
-            <Button mnemonicParsing="false" onAction="#checkConnections" text="Refresh" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
+            <Button mnemonicParsing="false" onAction="#checkConnections" text="Refresh" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="3">
                <GridPane.margin>
                   <Insets right="20.0" />
                </GridPane.margin>
             </Button>
-            <Button fx:id="connectButton" mnemonicParsing="false" onAction="#connectSocket" text="Connect" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="3">
+            <Button fx:id="connectButton" mnemonicParsing="false" onAction="#connectSocket" text="Connect" GridPane.columnIndex="2" GridPane.halignment="LEFT" GridPane.rowIndex="3">
                <GridPane.margin>
                   <Insets left="20.0" />
                </GridPane.margin>
             </Button>
-            <Label text="Welcome to RaceVision" GridPane.columnSpan="2" GridPane.halignment="CENTER">
+            <Label text="Welcome to RaceVision" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.halignment="CENTER">
                <font>
                   <Font size="36.0" />
                </font>
             </Label>
-            <GridPane GridPane.columnSpan="2" GridPane.rowIndex="2">
+            <GridPane GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="2">
               <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="447.0" minWidth="10.0" prefWidth="375.0" />
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="SOMETIMES" maxWidth="441.0" minWidth="10.0" prefWidth="100.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="381.0" minWidth="10.0" prefWidth="111.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="270.0" minWidth="10.0" prefWidth="103.0" />
               </columnConstraints>
               <rowConstraints>
                   <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
-                  <TextField fx:id="urlField" GridPane.rowIndex="1">
+                  <TextField fx:id="urlField" prefHeight="27.0" prefWidth="347.0" GridPane.rowIndex="1">
                      <GridPane.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                      </GridPane.margin>
@@ -63,9 +74,10 @@
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                      </GridPane.margin>
                   </TextField>
-                  <Button mnemonicParsing="false" onAction="#addConnection" text="Add New Connection" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
+                  <Button mnemonicParsing="false" onAction="#addConnection" text="Add Remote" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
                   <Label text="Host Name:" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM" />
                   <Label text="Port:" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM" />
+                  <Button mnemonicParsing="false" onAction="#addLocal" text="Host" GridPane.columnIndex="3" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
                </children>
             </GridPane>
          </children>