Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules

network/src/main/java/seng302/Networking/MockOutput.java

@@ -18,6 +18,7 @@ public class MockOutput
     private RaceVisionByteEncoder messageEncoder = new RaceVisionByteEncoder();
 
     //socket port 4942 as 4940 is ac35 live port and 4941 is ac35 test port
+    private ServerSocket serverSocket;
     private Socket mockSocket;
     private DataOutputStream outToVisualiser;
 
@@ -32,48 +33,60 @@ public class MockOutput
 
 
     MockOutput() throws  IOException{
-        /*******************************Test********************************/
-        StringBuilder xmlString;
-
-        BufferedReader br = new BufferedReader(new InputStreamReader(
-                this.getClass().getResourceAsStream(("/raceXML/Regatta.xml"))));
-
-        String line;
-        xmlString = new StringBuilder();
-        while((line=br.readLine())!= null){
-            xmlString.append(line.trim());
-        }
-
-        parseXMLString(xmlString.toString(), 5);
-
-        /*******************************Test********************************/
-
         /**************sockets*******************/
         //start Time
         lastHeartbeatTime = System.currentTimeMillis();
 
 
-        mockSocket = new Socket("localhost", 4942);
+//        mockSocket = new Socket("localhost", 4942);
-        outToVisualiser = new DataOutputStream(mockSocket.getOutputStream());
+        serverSocket = new ServerSocket(4942);
+//        mockSocket = serverSocket.accept();
+
+
 
 
         //loop that sends
-        while(true)
+        while (true){
-        {
+            mockSocket = serverSocket.accept();
-            //sends a heartbeat every 5 seconds
+            outToVisualiser = new DataOutputStream(mockSocket.getOutputStream());
-            if (timeSinceHeartbeat() >= 5.00){
+
-                outToVisualiser.write(heartbeat());
+            /*******************************Test********************************/
-                lastHeartbeatTime = System.currentTimeMillis();
+            StringBuilder xmlString;
+
+            BufferedReader br = new BufferedReader(new InputStreamReader(
+                    this.getClass().getResourceAsStream(("/raceXML/Regatta.xml"))));
+
+            String line;
+            xmlString = new StringBuilder();
+            while((line=br.readLine())!= null){
+                xmlString.append(line.trim());
             }
 
-            //checks the buffer to see if there is anything to send
+            parseXMLString(xmlString.toString(), 5);
-            if (messagesToSendBuffer.size() > 0) {
+
-                for (byte[] binaryMessage : messagesToSendBuffer) {
+            /*******************************Test********************************/
-                    //sends the message to the visualiser
+
-                    outToVisualiser.write(binaryMessage);
+            while(true) {
+                try {
+                    //sends a heartbeat every 5 seconds
+                    if (timeSinceHeartbeat() >= 5.00) {
+                        outToVisualiser.write(heartbeat());
+                        lastHeartbeatTime = System.currentTimeMillis();
+                    }
+
+                    //checks the buffer to see if there is anything to send
+                    if (messagesToSendBuffer.size() > 0) {
+                        for (byte[] binaryMessage : messagesToSendBuffer) {
+                            //sends the message to the visualiser
+                            outToVisualiser.write(binaryMessage);
+                        }
+                        //cleans out buffer
+                        messagesToSendBuffer.clear();
+                    }
+                }catch(SocketException e){
+                    break;
                 }
-                //cleans out buffer
+
-                messagesToSendBuffer.clear();
             }
         }
         /**************sockets*******************/

network/src/main/java/seng302/Networking/VisualiserInput.java

@@ -36,8 +36,10 @@ public class VisualiserInput
 //        ServerSocket visualiserSocket = new ServerSocket(4942);
 //        Socket connectionSocket = visualiserSocket.accept();
 
+        Socket connectionSocket = new Socket(InetAddress.getLocalHost(), 4942);
+
         //this is the test data that streams form the AC35 website
-        Socket connectionSocket = new Socket("livedata.americascup.com",4941);
+//        Socket connectionSocket = new Socket("livedata.americascup.com",4941);
 
 
         //start Time