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

mock/src/main/java/seng302/MockOutput.java

@@ -85,6 +85,11 @@ public class MockOutput implements Runnable
 
     /**
      * Used to give the mocOutput information about boat location to be made into a message and sent
+     * @param sourceID id of the boat
+     * @param lat latitude of boat
+     * @param lon longitude of boat
+     * @param heading heading of boat
+     * @param speed speed of boat
      */
     public synchronized void parseBoatLocation(int sourceID, double lat, double lon, double heading, double speed){
 

mock/src/main/java/seng302/Model/Race.java

@@ -111,8 +111,8 @@ public class Race implements Runnable {
         AnimationTimer timer = new AnimationTimer() {
             long currentTime = System.currentTimeMillis();
             long startTime = currentTime + (PRERACE_TIME / scaleFactor);
-            long minutes;
-            long hours;
+            //long minutes;
+            //long hours;
             long timeLeft;
 
             @Override

mock/src/test/java/seng302/Model/BoatTest.java

@@ -93,6 +93,4 @@ public class BoatTest {
         TEST_BOAT.setCurrentLeg(start);
         assertEquals(TEST_BOAT.calculateHeading(), 270, 1e-8);
     }
-
-
 }