Merge branch 'develop' into remove_observers

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

src/main/java/seng302/App.java

@@ -24,7 +24,6 @@ public class App extends Application {
         primaryStage.setOnCloseRequest(e -> {
             StreamParser.appClose();
             StreamReceiver.noMoreBytes();
-            System.out.println("[CLIENT] Exiting program");
             System.exit(0);
         });
 

src/main/java/seng302/controllers/CanvasController.java

@@ -51,16 +51,11 @@ public class CanvasController {
     private GraphicsContext gc;
     private ImageView mapImage;
 
-    private final int MARK_SIZE     = 10;
     private final int BUFFER_SIZE   = 50;
     private final int PANEL_WIDTH   = 1260; // it should be 1280 but, minors 40 to cancel the bias.
     private final int PANEL_HEIGHT  = 960;
     private final int CANVAS_WIDTH  = 720;
     private final int CANVAS_HEIGHT = 720;
-    private final int LHS_BUFFER    = BUFFER_SIZE;
-    private final int RHS_BUFFER    = BUFFER_SIZE;
-    private final int TOP_BUFFER    = BUFFER_SIZE;
-    private final int BOT_BUFFER    = TOP_BUFFER;
     private boolean horizontalInversion = false;
 
     private double distanceScaleFactor;
@@ -405,24 +400,24 @@ public class CanvasController {
 
         if (scaleDirection == ScaleDirection.HORIZONTAL) {
             referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, minLonPoint));
-            referencePointX = LHS_BUFFER + distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
+            referencePointX = BUFFER_SIZE + distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
 
             referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, maxLatPoint));
-            referencePointY  = CANVAS_HEIGHT - (TOP_BUFFER + BOT_BUFFER);
+            referencePointY  = CANVAS_HEIGHT - (BUFFER_SIZE + BUFFER_SIZE);
             referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint);
             referencePointY  = referencePointY / 2;
-            referencePointY += TOP_BUFFER;
+            referencePointY += BUFFER_SIZE;
             referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint);
         } else {
-            referencePointY = CANVAS_HEIGHT - BOT_BUFFER;
+            referencePointY = CANVAS_HEIGHT - BUFFER_SIZE;
 
             referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, minLonPoint));
-            referencePointX  = LHS_BUFFER;
+            referencePointX  = BUFFER_SIZE;
             referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
-            referencePointX += ((CANVAS_WIDTH - (LHS_BUFFER + RHS_BUFFER)) - (minLonToMaxLon * distanceScaleFactor)) / 2;
+            referencePointX += ((CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE)) - (minLonToMaxLon * distanceScaleFactor)) / 2;
         }
         if(horizontalInversion) {
-            referencePointX = CANVAS_WIDTH - RHS_BUFFER - (referencePointX - LHS_BUFFER);
+            referencePointX = CANVAS_WIDTH - BUFFER_SIZE - (referencePointX - BUFFER_SIZE);
         }
     }
 
@@ -443,10 +438,10 @@ public class CanvasController {
             horiAngle = horiAngle - (Math.PI / 2);
         double horiDistance = Math.cos(horiAngle) * Mark.calculateDistance(minLonPoint, maxLonPoint);
 
-        double vertScale = (CANVAS_HEIGHT - (TOP_BUFFER + BOT_BUFFER)) / vertDistance;
+        double vertScale = (CANVAS_HEIGHT - (BUFFER_SIZE + BUFFER_SIZE)) / vertDistance;
 
-        if ((horiDistance * vertScale) > (CANVAS_WIDTH - (RHS_BUFFER + LHS_BUFFER))) {
+        if ((horiDistance * vertScale) > (CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE))) {
-            distanceScaleFactor = (CANVAS_WIDTH - (RHS_BUFFER + LHS_BUFFER)) / horiDistance;
+            distanceScaleFactor = (CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE)) / horiDistance;
             scaleDirection = ScaleDirection.HORIZONTAL;
         } else {
             distanceScaleFactor = vertScale;
@@ -484,7 +479,7 @@ public class CanvasController {
             yAxisLocation += (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
         }
         if(horizontalInversion) {
-            xAxisLocation = CANVAS_WIDTH - RHS_BUFFER - (xAxisLocation - LHS_BUFFER);
+            xAxisLocation = CANVAS_WIDTH - BUFFER_SIZE - (xAxisLocation - BUFFER_SIZE);
         }
         return new Point2D(xAxisLocation, yAxisLocation);
     }

src/main/java/seng302/controllers/StartScreenController.java

@@ -12,7 +12,6 @@ import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.Parent;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;

src/main/java/seng302/fxObjects/BoatGroup.java

@@ -1,14 +1,9 @@
 package seng302.fxObjects;
 
-import javafx.event.EventHandler;
 import javafx.geometry.Point2D;
 import javafx.scene.CacheHint;
 import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.input.MouseDragEvent;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
 import javafx.scene.shape.Line;
 import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
@@ -147,7 +142,6 @@ public class BoatGroup extends Group {
         boatPoly.setLayoutY(y);
         boatAnnotations.setLayoutX(x);
         boatAnnotations.setLayoutY(y);
-
         wake.setLayoutX(x);
         wake.setLayoutY(y);
         wake.rotate(rotation);

src/main/java/seng302/fxObjects/MarkGroup.java

@@ -13,7 +13,7 @@ import seng302.models.mark.MarkType;
 import seng302.models.mark.SingleMark;
 
 /**
- * Created by CJIRWIN on 26/04/2017.
+ * Grouping of javaFX objects needed to represent a Mark on screen.
  */
 public class MarkGroup extends Group {
 

src/main/java/seng302/models/Colors.java

@@ -3,7 +3,7 @@ package seng302.models;
 import javafx.scene.paint.Color;
 
 /**
- * Created by ryan_ on 16/03/2017.
+ * Enum for randomly generating colours.
  */
 public enum Colors {
     RED, PERU, SEAGREEN, GREEN, BLUE, PURPLE;

src/main/java/seng302/models/Event.java

@@ -92,7 +92,6 @@ public class Event {
         if (this.isFinishingEvent) {
             return (this.getTimeString() + ", " + this.getBoat().getBoatName() + " finished the race");
         }
-//        System.out.println(this.getDistanceBetweenMarks());
         return (this.getTimeString() + ", " + this.getBoat().getBoatName() + " passed " + this.mark1.getName() + " going heading " + this.getBoatHeading() + "°");
     }
 

src/main/java/seng302/models/Leg.java

@@ -1,116 +0,0 @@
-package seng302.models;
-
-import seng302.models.mark.SingleMark;
-
-/**
-* Represents the leg of a race.
-*/
-public class Leg {
-    private int heading;
-    private int distance;
-    private boolean isFinishingLeg;
-    private SingleMark startingSingleMark;
-
-    /**
-     * Create a new leg
-     *
-     * @param heading,  the magnetic heading of this leg
-     * @param distance, the total distance of this leg in meters
-     * @param singleMark,   the singleMark this leg starts on
-     */
-    public Leg(int heading, int distance, SingleMark singleMark) {
-        this.heading = heading;
-        this.distance = distance;
-        this.startingSingleMark = singleMark;
-        this.isFinishingLeg = false;
-    }
-
-    /**
-     * Create a new leg
-     *
-     * @param heading,    the magnetic heading of this leg
-     * @param distance,   the total distance of this leg in meters
-     * @param markerName, the name of the marker this leg starts on
-     */
-    public Leg(int heading, int distance, String markerName) {
-        this.heading = heading;
-        this.distance = distance;
-        this.startingSingleMark = new SingleMark(markerName);
-        this.isFinishingLeg = false;
-    }
-
-    /**
-     * Get the heading of this leg
-     * @return int
-     */
-    public int getHeading() {
-        return this.heading;
-    }
-
-    /**
-     * Set the heading for this leg
-     * @param heading
-     */
-    public void setHeading(int heading) {
-        this.heading = heading;
-    }
-
-    /**
-     * Get the total distance of this leg in meters
-     * @return int
-     */
-    public int getDistance() {
-        return this.distance;
-    }
-
-    /**
-     * Set the distance of this leg in meters
-     * @param distance
-     */
-    public void setDistance(int distance) {
-        this.distance = distance;
-    }
-
-    /**
-     * Returns the marker this leg started on
-     * @return SingleMark
-     */
-    public SingleMark getMarker() {
-        return this.startingSingleMark;
-    }
-
-    /**
-     * Set the singleMark this leg starts on
-     * @param singleMark
-     */
-    public void setMarker(SingleMark singleMark) {
-        this.startingSingleMark = singleMark;
-    }
-
-    /**
-     * Returns the name of the marker this leg started on
-     * @return String
-     */
-    public String getMarkerLabel() {
-        return this.startingSingleMark.getName();
-    }
-
-
-
-    /**
-     * Specify whether or not the race finishes on this leg
-     *
-     * @param isFinishingLeg whether or not the race finishes on this leg
-     */
-    public void setFinishingLeg(boolean isFinishingLeg) {
-        this.isFinishingLeg = isFinishingLeg;
-    }
-
-    /**
-     * Returns whether or not the race finishes after this leg
-     * @return true if this the race finishes after this leg
-     */
-    public boolean getIsFinishingLeg() {
-        return this.isFinishingLeg;
-    }
-}

src/main/java/seng302/models/mark/Mark.java

@@ -14,6 +14,7 @@ public abstract class Mark {
 
     /**
      * Create a mark instance by passing its name and type
+     *
      * @param name the name of the mark
      * @param markType the type of mark. either GATE_MARK or SINGLE_MARK.
      */
@@ -47,20 +48,24 @@ public abstract class Mark {
     }
 
     /**
-     * Calculate the heading in radians from geographical location with latitude1, longitude 1 to geographical
+     * Calculate the heading in radians from geographical location with latitude1, longitude 1 to
-     * latitude2, longitude 2
+     * geographical latitude2, longitude 2
+     *
      * @param longitude1 Longitude of first point in degrees
      * @param longitude2 Longitude of second point in degrees
      * @param latitude1 Latitude of first point in degrees
      * @param latitude2 Latitude of first  point in degrees
      * @return Heading in radians
      */
-    public static double calculateHeadingRad (Double latitude1, Double longitude1, Double latitude2, Double longitude2) {
+    public static double calculateHeadingRad(Double latitude1, Double longitude1, Double latitude2,
+        Double longitude2) {
         latitude1 = Math.toRadians(latitude1);
         latitude2 = Math.toRadians(latitude2);
         Double longDiff = Math.toRadians(longitude2 - longitude1);
         Double y = Math.sin(longDiff) * Math.cos(latitude2);
-        Double x = Math.cos(latitude1)*Math.sin(latitude2)-Math.sin(latitude1)*Math.cos(latitude2)*Math.cos(longDiff);
+        Double x =
+            Math.cos(latitude1) * Math.sin(latitude2) - Math.sin(latitude1) * Math.cos(latitude2)
+                * Math.cos(longDiff);
         return Math.atan2(y, x);
     }
 
@@ -80,8 +85,8 @@ public abstract class Mark {
     }
 
     /**
-     * Calculate the distance in meters from geographical location with latitude1, longitude 1 to geographical
+     * Calculate the distance in meters from geographical location with latitude1, longitude 1 to
-     * latitude2, longitude 2
+     * geographical latitude2, longitude 2
      *
      * @param longitude1 Longitude of first point in degrees
      * @param longitude2 Longitude of second point in degrees
@@ -89,14 +94,16 @@ public abstract class Mark {
      * @param latitude2 Latitude of first  point in degrees
      * @return Distance in meters
      */
-    public static Double calculateDistance (Double latitude1, Double longitude1, Double latitude2, Double longitude2) {
+    public static Double calculateDistance(Double latitude1, Double longitude1, Double latitude2,
+        Double longitude2) {
         Double theta = longitude1 - longitude2;
         Double dist = Math.sin(Math.toRadians(latitude1)) * Math.sin(Math.toRadians(latitude2)) +
             Math.cos(Math.toRadians(latitude1)) * Math.cos(Math.toRadians(latitude2)) *
                 Math.cos(Math.toRadians(theta));
         dist = Math.acos(dist);
         dist = Math.toDegrees(dist);
-        dist = dist * 60 * 1.1508; //nautical mile (distance between two degrees) * (degrees in a minute)
+        dist = dist * 60
+            * 1.1508; //nautical mile (distance between two degrees) * (degrees in a minute)
         dist = dist * 1609.344;    //ratio of miles to metres
         return dist;
     }

src/main/java/seng302/models/mark/MarkType.java

@@ -5,5 +5,5 @@ package seng302.models.mark;
  * Created by Haoming Yin (hyi25) on 17/3/17.
  */
 public enum MarkType {
-    SINGLE_MARK, OPEN_GATE, CLOSED_GATE
+    SINGLE_MARK, OPEN_GATE
 }

src/main/java/seng302/models/stream/StreamParser.java

@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.TreeMap;
@@ -60,14 +61,12 @@ public class StreamParser extends Thread{
     }
 
     /**
-     * Used to within threading so when the stream parser thread runs, it will keep looking for a packet to
+     * Used to within threading so when the stream parser thread runs, it will keep looking for a
-     * process until it is unable to find anymore packets
+     * packet to process until it is unable to find anymore packets
-     *
      */
     public void run() {
         appRunning = true;
         try {
-             System.out.println("[CLIENT] Start of stream");
             streamStatus = true;
             xmlObject = new XMLParser();
             while (StreamReceiver.packetBuffer == null || StreamReceiver.packetBuffer.size() < 1) {
@@ -87,10 +86,8 @@ public class StreamParser extends Thread{
 
     /**
      * Used to start the stream parser thread when multithreading
-     *
      */
     public void start() {
-        System.out.println("[CLIENT] Starting " +  threadName );
         if (t == null) {
             t = new Thread(this, threadName);
             t.start();
@@ -145,11 +142,9 @@ public class StreamParser extends Thread{
                     break;
                 default:
                     break;
-                 //System.out.println(packet.getType().toString());
             }
-         }
+        } catch (NullPointerException e) {
-         catch (NullPointerException e){
+            System.out.println("Error parsing packet");
-             System.out.println("Error parsing packet of type " + packet.getType());
         }
     }
 
@@ -179,9 +174,10 @@ public class StreamParser extends Thread{
     }
 
     /**
-     * Extracts the useful race status data from race status type packets. This method will also print to the
+     * Extracts the useful race status data from race status type packets. This method will also
-     * console the current state of the race (if it has started/finished or is about to start), along side
+     * print to the console the current state of the race (if it has started/finished or is about to
-     * this it'll also display the amount of time since the race has started or time till it starts
+     * start), along side this it'll also display the amount of time since the race has started or
+     * time till it starts
      *
      * @param packet Packet parsed in to use the payload
      */
@@ -201,20 +197,18 @@ public class StreamParser extends Thread{
             format.setTimeZone(TimeZone.getTimeZone(getTimeZoneString()));
             currentTimeString = format.format((new Date(currentTime)).getTime());
         }
-        long timeTillStart = ((new Date (expectedStartTime)).getTime() - (new Date (currentTime)).getTime())/1000;
+        long timeTillStart =
+            ((new Date(expectedStartTime)).getTime() - (new Date(currentTime)).getTime()) / 1000;
 
         if (timeTillStart > 0) {
             timeSinceStart = timeTillStart;
-            //System.out.println("Time till start: " + timeTillStart + " Seconds");
         } else {
             if (raceStatus == 4 || raceStatus == 8) {
                 raceFinished = true;
                 raceStarted = false;
-                System.out.println("[CLIENT] Race has finished");
             } else if (!raceStarted) {
                 raceStarted = true;
                 raceFinished = false;
-                System.out.println("[CLIENT] Race has started");
             }
             timeSinceStart = timeTillStart;
         }
@@ -226,17 +220,19 @@ public class StreamParser extends Thread{
         int raceType = payload[23];
         boatsPos = new TreeMap<>();
         for (int i = 0; i < noBoats; i++) {
-            long boatStatusSourceID = bytesToLong(Arrays.copyOfRange(payload,24 + (i * 20),28+ (i * 20)));
+            long boatStatusSourceID = bytesToLong(
+                Arrays.copyOfRange(payload, 24 + (i * 20), 28 + (i * 20)));
             Yacht boat = boats.get((int) boatStatusSourceID);
             boat.setBoatStatus((int) payload[28 + (i * 20)]);
             boat.setLegNumber((int) payload[29 + (i * 20)]);
             boat.setPenaltiesAwarded((int) payload[30 + (i * 20)]);
             boat.setPenaltiesServed((int) payload[31 + (i * 20)]);
-            Long estTimeAtNextMark = bytesToLong(Arrays.copyOfRange(payload,32 + (i * 20),38+ (i * 20)));
+            Long estTimeAtNextMark = bytesToLong(
+                Arrays.copyOfRange(payload, 32 + (i * 20), 38 + (i * 20)));
             boat.setEstimateTimeAtNextMark(estTimeAtNextMark);
-            Long estTimeAtFinish = bytesToLong(Arrays.copyOfRange(payload,38 + (i * 20),44+ (i * 20)));
+            Long estTimeAtFinish = bytesToLong(
+                Arrays.copyOfRange(payload, 38 + (i * 20), 44 + (i * 20)));
             boat.setEstimateTimeAtFinish(estTimeAtFinish);
-            boatsPos.put(estTimeAtFinish, boat);
 //            String boatStatus = "SourceID: " + boatStatusSourceID;
 //            boatStatus += "\nBoat Status: " + (int)payload[28 + (i * 20)];
 //            boatStatus += "\nLegNumber: " + (int)payload[29 + (i * 20)];
@@ -272,7 +268,8 @@ public class StreamParser extends Thread{
         for (int i = 0; i < numOfLines; i++) {
             int lineNum = payload[4 + totalLen];
             int textLength = payload[5 + totalLen];
-            byte[] messageTextBytes = Arrays.copyOfRange(payload,6 + totalLen,6 + textLength + totalLen);
+            byte[] messageTextBytes = Arrays
+                .copyOfRange(payload, 6 + totalLen, 6 + textLength + totalLen);
             String messageText = new String(messageTextBytes);
             totalLen += 2 + textLength;
         }
@@ -289,7 +286,8 @@ public class StreamParser extends Thread{
 
         int messageType = payload[9];
         long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
-        String xmlMessage = new String((Arrays.copyOfRange(payload,14,(int) (14 + messageLength)))).trim();
+        String xmlMessage = new String(
+            (Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
 
         //Create XML document Object
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -344,8 +342,8 @@ public class StreamParser extends Thread{
     }
 
     /**
-     * When a yacht action occurs this will parse the parse the byte array to retrieve the necessary info,
+     * When a yacht action occurs this will parse the parse the byte array to retrieve the necessary
-     * currently unused
+     * info, currently unused
      *
      * @param packet Packet parsed in to use the payload
      */
@@ -372,8 +370,8 @@ public class StreamParser extends Thread{
     }
 
     /**
-     * Used to breakdown the boatlocation packets so the boat coordinates, id and groundspeed are all used
+     * Used to breakdown the boatlocation packets so the boat coordinates, id and groundspeed are
-     * All the other extra data is still being read and translated however is unused.
+     * all used All the other extra data is still being read and translated however is unused.
      *
      * @param packet Packet parsed in to use the payload
      */
@@ -400,7 +398,8 @@ public class StreamParser extends Thread{
 
             //add a new priority que to the boatPositions HashMap
             if (!boatPositions.containsKey(boatId)) {
-                boatPositions.put(boatId, new PriorityBlockingQueue<>(256, new Comparator<BoatPositionPacket>() {
+                boatPositions.put(boatId,
+                    new PriorityBlockingQueue<>(256, new Comparator<BoatPositionPacket>() {
                         @Override
                         public int compare(BoatPositionPacket p1, BoatPositionPacket p2) {
                             return (int) (p1.getTimeValid() - p2.getTimeValid());
@@ -409,7 +408,8 @@ public class StreamParser extends Thread{
             }
             boatPositions.get(boatId).put(boatPacket);
         } else if (deviceType == 3) {
-            BoatPositionPacket markPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, heading, groundSpeed);
+            BoatPositionPacket markPacket = new BoatPositionPacket(boatId, timeValid, lat, lon,
+                heading, groundSpeed);
 
             //add a new priority que to the boatPositions HashMap
             if (!markPositions.containsKey(boatId)) {
@@ -458,13 +458,21 @@ public class StreamParser extends Thread{
         ArrayList<String> windInfo = new ArrayList<>();
         for (int i = 0; i < loopCount; i++) {
             String wind = "WindId: " + payload[3 + (20 * i)];
-            wind += "\nTime: " + bytesToLong(Arrays.copyOfRange(payload,4 + (20 * i),10 + (20 * i)));
+            wind +=
-            wind += "\nRaceId: " + bytesToLong(Arrays.copyOfRange(payload,10 + (20 * i),14 + (20 * i)));
+                "\nTime: " + bytesToLong(Arrays.copyOfRange(payload, 4 + (20 * i), 10 + (20 * i)));
-            wind += "\nWindDirection: " + bytesToLong(Arrays.copyOfRange(payload,14 + (20 * i),16 + (20 * i)));
+            wind += "\nRaceId: " + bytesToLong(
-            wind += "\nWindSpeed: " + bytesToLong(Arrays.copyOfRange(payload,16 + (20 * i),18 + (20 * i)));
+                Arrays.copyOfRange(payload, 10 + (20 * i), 14 + (20 * i)));
-            wind += "\nBestUpWindAngle: " + bytesToLong(Arrays.copyOfRange(payload,18 + (20 * i),20 + (20 * i)));
+            wind += "\nWindDirection: " + bytesToLong(
-            wind += "\nBestDownWindAngle: " + bytesToLong(Arrays.copyOfRange(payload,20 + (20 * i),22 + (20 * i)));
+                Arrays.copyOfRange(payload, 14 + (20 * i), 16 + (20 * i)));
-            wind += "\nFlags: " + String.format("%8s", Integer.toBinaryString(payload[22 + (20 * i)] & 0xFF)).replace(' ', '0');
+            wind += "\nWindSpeed: " + bytesToLong(
+                Arrays.copyOfRange(payload, 16 + (20 * i), 18 + (20 * i)));
+            wind += "\nBestUpWindAngle: " + bytesToLong(
+                Arrays.copyOfRange(payload, 18 + (20 * i), 20 + (20 * i)));
+            wind += "\nBestDownWindAngle: " + bytesToLong(
+                Arrays.copyOfRange(payload, 20 + (20 * i), 22 + (20 * i)));
+            wind += "\nFlags: " + String
+                .format("%8s", Integer.toBinaryString(payload[22 + (20 * i)] & 0xFF))
+                .replace(' ', '0');
             windInfo.add(wind);
         }
     }
@@ -600,7 +608,6 @@ public class StreamParser extends Thread{
 
     public static void appClose() {
         appRunning = false;
-        System.out.println("[CLIENT] Shutting down stream parser");
     }
 
     /**

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

@@ -44,7 +44,6 @@ public class StreamReceiver extends Thread {
     }
 
     public void start () {
-        System.out.println("[CLIENT] Starting " +  threadName );
         if (t == null) {
             t = new Thread (this, threadName);
             t.start ();
@@ -155,6 +154,5 @@ public class StreamReceiver extends Thread {
 
     public static void noMoreBytes(){
         moreBytes = false;
-        System.out.println("[CLIENT] Shutting down stream receiver");
     }
 }

src/main/java/seng302/server/ServerThread.java

@@ -29,8 +29,6 @@ public class ServerThread implements Runnable, Observer {
         Thread runner = new Thread(this, threadName);
         runner.setDaemon(true);
 
-        serverLog("Spawning Server", 0);
-
         raceSimulator = new Simulator(BOAT_LOCATION_PERIOD);
         raceSimulator.addObserver(this);
         // run race simulator, so it can send boats' static location.
@@ -134,7 +132,6 @@ public class ServerThread implements Runnable, Observer {
      * Starts an instance of the race simulator
      */
     private void startRaceSim(){
-        serverLog("Starting Running Race Simulator", 0);
         // set race started to true, so the simulator will start moving boats
         raceSimulator.setRaceStarted(true);
     }
@@ -143,7 +140,6 @@ public class ServerThread implements Runnable, Observer {
      * Starts sending heartbeat messages to the client
      */
     private void startSendingHeartbeats() {
-        serverLog("Sending Heartbeats", 0);
         Timer t = new Timer();
 
         t.schedule(new TimerTask() {
@@ -154,7 +150,7 @@ public class ServerThread implements Runnable, Observer {
                 try {
                     server.send(heartbeat);
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, HEARTBEAT_PERIOD);
@@ -174,14 +170,13 @@ public class ServerThread implements Runnable, Observer {
                     if (startTime < System.currentTimeMillis() && !raceStarted){
                         startRaceSim();
                         raceStarted = true;
-                        serverLog("Race Started", 0);
                     }
                     else{
                         server.send(raceStartStatusMessage);
                     }
 
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, RACE_START_STATUS_PERIOD);
@@ -191,7 +186,6 @@ public class ServerThread implements Runnable, Observer {
      * Start sending race start status messages until race starts
      */
     private void startSendingRaceStatusMessages(){
-        serverLog("Sending race status messages", 0);
         Timer t = new Timer();
         t.schedule(new TimerTask() {
             @Override
@@ -199,9 +193,8 @@ public class ServerThread implements Runnable, Observer {
                 Message raceStatusMessage = getRaceStatusMessage();
                 try {
                     server.send(raceStatusMessage);
-
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, RACE_STATUS_PERIOD);
@@ -218,17 +211,12 @@ public class ServerThread implements Runnable, Observer {
 
             if (raceData != null){
                 server.send(raceData);
-                serverLog("Sending race data", 0);
             }
-
             if (boatData != null){
                 server.send(boatData);
-                serverLog("Sending boat data", 0);
             }
-
              if (regatta != null){
                  server.send(regatta);
-                 serverLog("Sending regatta data", 0);
             }
         } catch (IOException e) {
             serverLog("Couldn't send an XML Message: " + e.getMessage(), 0);
@@ -247,7 +235,6 @@ public class ServerThread implements Runnable, Observer {
                     Message raceData = getXmlMessage("/server_config/courseLimits.xml", XMLMessageSubType.RACE);
                     if (raceData != null) {
                         server.send(raceData);
-                        serverLog("Sending race data", 0);
                     }
                 }catch (IOException e) {
                     serverLog("Couldn't send an XML Message: " + e.getMessage(), 0);
@@ -295,7 +282,7 @@ public class ServerThread implements Runnable, Observer {
                     }
 
                 } catch (IOException e) {
-                    System.out.print("");
+                    e.printStackTrace();
                 }
             }
         }, 0, BOAT_LOCATION_PERIOD);
@@ -322,7 +309,6 @@ public class ServerThread implements Runnable, Observer {
                     numOfBoatsFinished ++;
                     if (!boatsFinished.get(boat.getSourceID())) {
                         boatsFinished.put(boat.getSourceID(), true);
-                        serverLog("Boat " + boat.getSourceID() + " finished the race", 1);
                     }
                 }
                 Message m = new BoatLocationMessage(boat.getSourceID(), 1, boat.getLat(),

src/main/java/seng302/server/StreamingServerSocket.java

@@ -28,7 +28,6 @@ class StreamingServerSocket {
     }
 
     void start(){
-        ServerThread.serverLog("Listening For Connections",0);
         try {
             client = socket.accept();
         } catch (IOException e) {
@@ -39,7 +38,6 @@ class StreamingServerSocket {
         }
         else{
             isServerStarted = true;
-            ServerThread.serverLog("client connected from " + client.socket().getInetAddress(),0);
         }
     }
 

src/main/java/seng302/server/simulator/Simulator.java

@@ -54,7 +54,6 @@ public class Simulator extends Observable implements Runnable {
 					numOfFinishedBoats += moveBoat(boat, lapse);
 				}
 			}
-			//System.out.println(boats.get(0));
 
 			setChanged();
 			notifyObservers(boats);
@@ -65,8 +64,6 @@ public class Simulator extends Observable implements Runnable {
 				e.printStackTrace();
 			}
 		}
-
-		System.out.println("[SERVER] Race simulator has been terminated");
 	}
 
 	/**

src/test/java/seng302/LegTest.java

@@ -1,54 +0,0 @@
-package seng302;
-
-import org.junit.Test;
-import seng302.models.Leg;
-import seng302.models.mark.SingleMark;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Unit test for the Leg class.
- */
-public class LegTest {
-
-    /**
-     * Test creation of the leg by specifying a string
-     * for the marker label
-     */
-    @Test
-    public void testLegCreationUsingMarkerLabel() {
-        Leg leg = new Leg(010, 100, "SingleMark");
-
-        assertEquals(leg.getHeading(), 010);
-        assertEquals(leg.getDistance(), 100);
-        assertEquals(leg.getMarkerLabel(), "SingleMark");
-        assertEquals(leg.getIsFinishingLeg(), false);
-    }
-
-    /**
-     * Test creation of the leg by providing a
-     * SingleMark object
-     */
-    @Test
-    public void testLegCreation() {
-        Leg leg = new Leg(010, 100, new SingleMark("SingleMark"));
-
-        assertEquals(leg.getHeading(), 010);
-        assertEquals(leg.getDistance(), 100);
-        assertEquals(leg.getMarkerLabel(), "SingleMark");
-        assertEquals(leg.getIsFinishingLeg(), false);
-    }
-
-    /**
-     * Test changing whether or not a
-     * leg is the finishing leg
-     */
-    @Test
-    public void testSetFinishLeg() {
-        Leg leg = new Leg(010, 100, "SingleMark");
-
-        leg.setFinishingLeg(true);
-        assertEquals(leg.getIsFinishingLeg(), true);
-    }
-
-}

src/test/java/seng302/models/stream/StreamReceiverTest.java

@@ -99,7 +99,7 @@ public class StreamReceiverTest {
             byte[] emptyArray = {};
             assert bytesToLong.invoke(streamReceiver, emptyArray).equals(0L);
         } catch (Exception e){
-            System.out.println("");
+            e.printStackTrace();
         }
     }