Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules

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

@@ -18,7 +18,8 @@ public class MockOutput implements Runnable
 
     private RaceVisionByteEncoder messageEncoder = new RaceVisionByteEncoder();
 
-    //socket port 4945 as 4940 is ac35 live port and 4941 is ac35 test port
+    //socket port 4942 as 4940 is ac35 live port and 4941 is ac35 test port
+    private ServerSocket serverSocket;
     private Socket mockSocket;
     private DataOutputStream outToVisualiser;
 
@@ -31,20 +32,15 @@ public class MockOutput implements Runnable
 
 
 
-    public MockOutput() throws  IOException {
+    MockOutput() throws  IOException {
-        /*******************************Test********************************/
+/**************sockets*******************/
-        StringBuilder xmlString;
+        //start Time
+        lastHeartbeatTime = System.currentTimeMillis();
 
-        BufferedReader br = new BufferedReader(new InputStreamReader(
-                this.getClass().getResourceAsStream(("/raceXML/Regatta.xml"))));
 
-        String line;
+//        mockSocket = new Socket("localhost", 4942);
-        xmlString = new StringBuilder();
+        serverSocket = new ServerSocket(4942);
-        while ((line = br.readLine()) != null) {
+//        mockSocket = serverSocket.accept();
-            xmlString.append(line.trim());
-        }
-
-        parseXMLString(xmlString.toString(), 5);
 
     }
     /**
@@ -97,33 +93,47 @@ public class MockOutput implements Runnable
     public void run() {
 
         try {
-            /*******************************Test********************************/
+            while (true){
-
+                mockSocket = serverSocket.accept();
-            /**************sockets*******************/
+                outToVisualiser = new DataOutputStream(mockSocket.getOutputStream());
-            //start Time
-            lastHeartbeatTime = System.currentTimeMillis();
 
+                /*******************************Test********************************/
+                StringBuilder xmlString;
 
-            mockSocket = new Socket("localhost", 4945);
+                BufferedReader br = new BufferedReader(new InputStreamReader(
-            outToVisualiser = new DataOutputStream(mockSocket.getOutputStream());
+                        this.getClass().getResourceAsStream(("/raceXML/Regatta.xml"))));
 
-
+                String line;
-            //loop that sends
+                xmlString = new StringBuilder();
-            while (true) {
+                while((line=br.readLine())!= null){
-                //sends a heartbeat every 5 seconds
+                    xmlString.append(line.trim());
-                if (timeSinceHeartbeat() >= 5.00) {
-                    outToVisualiser.write(heartbeat());
-                    lastHeartbeatTime = System.currentTimeMillis();
                 }
 
-                //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();
                 }
             }
         } catch (IOException e) {

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

@@ -35,6 +35,8 @@ public class VisualiserInput
         ServerSocket visualiserSocket = new ServerSocket(4945);
         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);