Merge branch 'master' into story70

# Conflicts:
#	dedicatedServer/src/main/java/app/App.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml

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

@@ -18,6 +18,7 @@ import shared.exceptions.InvalidRegattaDataException;
 import shared.exceptions.XMLReaderException;
 import shared.model.Bearing;
 import shared.model.Constants;
+import shared.xml.XMLUtilities;
 
 import javax.xml.bind.JAXBException;
 import javax.xml.parsers.ParserConfigurationException;
@@ -76,30 +77,35 @@ public class Event {
 
     /**
      * Constructs an event, using various XML files.
-     * @param gameType Type of game to create. Determines which XML files to send
+     * @param singlePlayer Whether or not to create a single player event.
      * @throws EventConstructionException Thrown if we cannot create an Event for any reason.
      */
-    public Event(int gameType) throws EventConstructionException {
+    public Event(boolean singlePlayer, int mapIndex) throws EventConstructionException {
 
-        String raceXMLFile = "mock/mockXML/raceTest.xml";
+//        System.out.println(XMLUtilities.validateXML(this.getClass().getClassLoader().getResource("mock/mockXML/iMapLayout.xml").toString()
+//                , this.getClass().getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd")));
 
+        String raceXMLFile;
+        switch (mapIndex){
+            case 0:raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
+                break;
+            case 1:raceXMLFile = "mock/mockXML/oMapLayout.xml";
+                break;
+            case 2: raceXMLFile = "mock/mockXML/iMapLayout.xml";
+                break;
+            case 3: raceXMLFile = "mock/mockXML/mMapLayout.xml";
+                break;
+            default: raceXMLFile = "mock/mockXML/raceSixPlayers.xml";
+
+        }
         String boatsXMLFile = "mock/mockXML/boatTest.xml";
-
         String regattaXMLFile = "mock/mockXML/regattaTest.xml";
 
-
-        if (gameType == 1) {
+        if (singlePlayer) {
             raceXMLFile = "mock/mockXML/raceSinglePlayer.xml";
             boatsXMLFile = "mock/mockXML/boatsSinglePlayer.xml";
         }
 
-        if (gameType == 2){
-            System.out.println("In gametype 2");
-            raceXMLFile = "mock/mockXML/raceTutorial.xml";
-            boatsXMLFile = "mock/mockXML/boatTutorial.xml";
-            regattaXMLFile = "mock/mockXML/regattaTutorial.xml";
-        }
-
         //Read XML files.
         try {
             //this.raceXML = RaceXMLCreator.alterRaceToWind(raceXMLFile, 90);

racevisionGame/src/main/java/mock/model/SourceIdAllocator.java

@@ -42,6 +42,7 @@ public class SourceIdAllocator {
         }
 
         List<Integer> allocatedIDs = mockRace.getRaceDataSource().getParticipants();
+
         List<Integer> allIDs = new ArrayList<>(mockRace.getBoatDataSource().getBoats().keySet());
 
         //Get list of unallocated ids.