Merge branch 'wake_remake' into Story30b_correcting_boat_movement

# Conflicts:
#	src/main/java/seng302/controllers/CanvasController.java
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/parsers/StreamParser.java

src/main/java/seng302/models/parsers/StreamReceiver.java

@@ -6,6 +6,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.concurrent.PriorityBlockingQueue;
 import java.util.zip.CRC32;
@@ -15,8 +17,8 @@ import java.util.zip.Checksum;
 public class StreamReceiver extends Thread {
     private InputStream stream;
     private Socket host;
-    private ByteArrayOutputStream crcBuffer;
-    private Thread thread;
+    private  ByteArrayOutputStream crcBuffer;
+    private Thread t;
     private String threadName;
     public static PriorityBlockingQueue<StreamPacket> packetBuffer;
 
@@ -31,24 +33,31 @@ public class StreamReceiver extends Thread {
     }
 
     public void run(){
-        packetBuffer = new PriorityBlockingQueue<>(256, new Comparator<StreamPacket>() {
+        PriorityBlockingQueue<StreamPacket> pq = new PriorityBlockingQueue<>(256, new Comparator<StreamPacket>() {
             @Override
             public int compare(StreamPacket s1, StreamPacket s2) {
                 return (int) (s1.getTimeStamp() - s2.getTimeStamp());
             }
         });
+        packetBuffer = pq;
         connect();
     }
 
     public void start () {
         System.out.println("Starting " +  threadName );
-        if (thread == null) {
-            thread = new Thread (this, threadName);
-            thread.start ();
+        if (t == null) {
+            t = new Thread (this, threadName);
+            t.start ();
         }
     }
 
 
+    public StreamReceiver(Socket host,  PriorityBlockingQueue packetBuffer){
+        this.host=host;
+        this.packetBuffer = packetBuffer;
+    }
+
+
     public void connect(){
         try {
             stream = host.getInputStream();
@@ -120,8 +129,8 @@ public class StreamReceiver extends Thread {
     }
 
     /**
-     * takes an array of up to 7 bytes and returns a positive
-     * long constructed from the input bytes
+     * takes an array of up to 7 bytes in little endian format and
+     * returns a positive long constructed from the input bytes
      *
      * @return a positive long if there is less than 8 bytes -1 otherwise
      */
@@ -137,4 +146,13 @@ public class StreamReceiver extends Thread {
         }
         return partialLong;
     }
+
+
+    public static void main(String[] args) {
+
+        StreamReceiver sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1");
+        //StreamReceiver sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread2");
+        sr.start();
+
+    }
 }