Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]

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

@@ -43,7 +43,7 @@ public class Event {
     private Event() {
         try {
             this.raceXML = getRaceXMLAtCurrentTime(XMLReader.readXMLFileToString("mock/mockXML/raceTest.xml", StandardCharsets.UTF_8));
-            this.boatXML = XMLReader.readXMLFileToString("mock/mockXML/boatTest.xml", StandardCharsets.UTF_8);
+            this.boatXML = XMLReader.readXMLFileToString("mock/mockXML/boatsSinglePlayer.xml", StandardCharsets.UTF_8);
             this.regattaXML = XMLReader.readXMLFileToString("mock/mockXML/regattaTest.xml", StandardCharsets.UTF_8);
             this.xmlFileType = XMLFileType.Contents;
 

racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java

@@ -60,6 +60,7 @@ public class ControllerClient  {
             BinaryMessageEncoder binaryMessage = new BinaryMessageEncoder(MessageType.BOATACTION, System.currentTimeMillis(), 0,
                     (short) encodedBoatAction.length, encodedBoatAction);
 
+            System.out.println("Sending out key: " + protocolCode);
             outputStream.write(binaryMessage.getFullMessage());
         }
     }

racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java

@@ -50,6 +50,7 @@ public class ControllerServer implements Runnable {
                     BoatActionDecoder boatActionDecoder = new BoatActionDecoder(encodedMessage.getMessageBody());
                     BoatActionEnum decodedMessage = boatActionDecoder.getBoatAction();
                     int key = decodedMessage.getValue();
+                    System.out.println("Received key: " + key);
                 }
             } catch (IOException e) {
                 e.printStackTrace();

racevisionGame/src/main/resources/mock/mockXML/boatTest.xml

@@ -33,23 +33,8 @@
         </Boat>
 
         <!--Participants-->
-        <Boat BoatName="Team ORACLE USA" HullNum="RG01" ShapeID="0" ShortName="USA" SourceID="121" StoweName="USA" Type="Yacht">
-            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
-        </Boat>
-        <Boat BoatName="Land Rover BAR" HullNum="RG01" ShapeID="0" ShortName="GBR" SourceID="122" StoweName="GBR" Type="Yacht">
-            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
-        </Boat>
-        <Boat BoatName="SoftBank Team Japan" HullNum="RG01" ShapeID="0" ShortName="JPN" SourceID="123" StoweName="JPN" Type="Yacht">
-            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
-        </Boat>
-        <Boat BoatName="Groupama Team France" HullNum="RG01" ShapeID="0" ShortName="FRA" SourceID="124" StoweName="FRA" Type="Yacht">
-            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
-        </Boat>
         <Boat BoatName="Artemis Racing" HullNum="RG01" ShapeID="0" ShortName="SWE" SourceID="125" StoweName="SWE" Type="Yacht">
             <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
         </Boat>
-        <Boat BoatName="Emirates Team New Zealand" HullNum="RG01" ShapeID="0" ShortName="NZL" SourceID="126" StoweName="NZL" Type="Yacht">
-            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
-        </Boat>
     </Boats>
 </BoatConfig>

racevisionGame/src/main/resources/mock/mockXML/boatsSinglePlayer.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<BoatConfig>
+    <Boats>
+
+        <!--Mark Boats-->
+        <Boat Type="Mark" BoatName="PRO" SourceID="101" >
+            <GPSposition X= "-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="PIN" SourceID="102" >
+            <GPSposition X= "-64.855242" Y="32.293771" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="Marker1" SourceID="103" >
+            <GPSposition X= "-64.843983" Y="32.293039" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="WGL" SourceID="104" >
+            <GPSposition X= "-64.850045" Y="32.28468" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="WGR" SourceID="105" >
+            <GPSposition X= "-64.847591" Y="32.280164" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="LGL" SourceID="106" >
+            <GPSposition X= "-64.835249" Y="32.309693" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="LGR" SourceID="107" >
+            <GPSposition X= "-64.831785" Y="32.308046" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="FL" SourceID="108" >
+            <GPSposition X= "-64.839291" Y="32.317379" Z="0"/>
+        </Boat>
+        <Boat Type="Mark" BoatName="FR" SourceID="109" >
+            <GPSposition X= "-64.83626" Y="32.317257" Z="0"/>
+        </Boat>
+
+        <!--Participants-->
+        <Boat BoatName="Emirates Team New Zealand" HullNum="RG01" ShapeID="0" ShortName="NZL" SourceID="126" StoweName="NZL" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="Land Rover BAR" HullNum="RG01" ShapeID="0" ShortName="GBR" SourceID="122" StoweName="GBR" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="SoftBank Team Japan" HullNum="RG01" ShapeID="0" ShortName="JPN" SourceID="123" StoweName="JPN" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="Groupama Team France" HullNum="RG01" ShapeID="0" ShortName="FRA" SourceID="124" StoweName="FRA" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="Artemis Racing" HullNum="RG01" ShapeID="0" ShortName="SWE" SourceID="125" StoweName="SWE" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+        <Boat BoatName="Emirates Team New Zealand" HullNum="RG01" ShapeID="0" ShortName="NZL" SourceID="126" StoweName="NZL" Type="Yacht">
+            <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
+        </Boat>
+    </Boats>
+</BoatConfig>

racevisionGame/src/main/resources/mock/mockXML/raceTest.xml

@@ -5,12 +5,7 @@
     <CreationTimeDate>CREATION_TIME</CreationTimeDate>
     <RaceStartTime Postpone="false" Time="START_TIME"/>
     <Participants>
-        <Yacht SourceID="121"/>
-        <Yacht SourceID="122"/>
-        <Yacht SourceID="123"/>
-        <Yacht SourceID="124"/>
         <Yacht SourceID="125"/>
-        <Yacht SourceID="126"/>
     </Participants>
     <CompoundMarkSequence>
         <Corner CompoundMarkID="1" SeqID="1"/>