fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched port back to 4942

Browse Source 
#story[778]
This commit is contained in:
Erika Savell
2017-04-28 13:30:19 +12:00
parent 6befa24302
commit 214e26ad90
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/src/main/java/seng302/Networking/MockOutput.java
+3 -8
View File
@@ -1,8 +1,7 @@
package seng302.Networking; package seng302.Networking;
import com.sun.xml.internal.bind.v2.runtime.output.SAXOutput;
import seng302.Networking.MessageEncoders.RaceVisionByteEncoder; import seng302.Networking.MessageEncoders.RaceVisionByteEncoder;
import seng302.Networking.MessageEncoders.XMLMessageEncoder; import seng302.Networking.MessageEncoders.XMLMessageEncoder;
import seng302.Networking.Utils.BoatLocationMessage;
import seng302.Networking.Utils.MessageType; import seng302.Networking.Utils.MessageType;
import java.io.*; import java.io.*;
@@ -15,7 +14,6 @@ import java.util.ArrayList;
public class MockOutput implements Runnable public class MockOutput implements Runnable
{ {
private long lastHeartbeatTime; private long lastHeartbeatTime;
private RaceVisionByteEncoder messageEncoder = new RaceVisionByteEncoder(); private RaceVisionByteEncoder messageEncoder = new RaceVisionByteEncoder();
//socket port 4942 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
@@ -30,17 +28,14 @@ public class MockOutput implements Runnable
private short xmlSequenceNumber = 1; private short xmlSequenceNumber = 1;
private int heartbeatSequenceNum = 1; private int heartbeatSequenceNum = 1;
public MockOutput() throws IOException {
MockOutput() throws IOException {
/**************sockets*******************/ /**************sockets*******************/
//start Time //start Time
lastHeartbeatTime = System.currentTimeMillis(); lastHeartbeatTime = System.currentTimeMillis();
// mockSocket = new Socket("localhost", 4942);
serverSocket = new ServerSocket(4942); serverSocket = new ServerSocket(4942);
// mockSocket = serverSocket.accept();
} }
/** /**
network/src/main/java/seng302/Networking/VisualiserInput.java
-3
View File
@@ -32,9 +32,6 @@ public class VisualiserInput
VisualiserInput() throws IOException{ VisualiserInput() throws IOException{
ServerSocket visualiserSocket = new ServerSocket(4945);
Socket connectionSocket = visualiserSocket.accept();
Socket connectionSocket = new Socket(InetAddress.getLocalHost(), 4942); Socket connectionSocket = new Socket(InetAddress.getLocalHost(), 4942);
//this is the test data that streams form the AC35 website //this is the test data that streams form the AC35 website