Reimplemented race position in the race view. Removed Boat class and Yacht class is replaced completely. Race position "-" shows properly on start screen. Removed BoatTest and TeamsParserTest. Fixed estimated time till finish on server.

#story[818]
2026-05-09 14:28:43 +00:00 · 2017-05-04 13:50:06 +12:00
parent a4cc5f222c
commit 6935bd514e
19 changed files with 448 additions and 363 deletions
@@ -231,10 +231,16 @@ public class StreamParser extends Thread{
 //            boatStatus += "\nEstTimeAtFinish: " + bytesToLong(Arrays.copyOfRange(payload,37 + (i * 20),43+ (i * 20)));
 //            boatStatuses.add(boatStatus);
        }
-        int pos = 1;
-        for (Yacht yacht : boatsPos.values()) {
-            yacht.setPosition(String.valueOf(pos));
-            pos++;
+        if (isRaceStarted()) {
+            int pos = 1;
+            for (Yacht yacht : boatsPos.values()) {
+                yacht.setPosition(String.valueOf(pos));
+                pos++;
+            }
+        } else {
+            for (Yacht yacht : boatsPos.values()) {
+                yacht.setPosition("-");
+            }
        }
    }

@@ -1,64 +1,64 @@
-package seng302.models.parsers;
-
-import org.w3c.dom.*;
-import seng302.models.Boat;
-
-import java.util.ArrayList;
-import java.util.NoSuchElementException;
-
-public class TeamsParser extends FileParser {
-
-	private Document doc;
-
-	public TeamsParser(String path) {
-		super(path);
-		this.doc = this.parseFile();
-	}
-
-	/**
-	 * Create a boat instance by a given team node
-	 * @param node a boat node containing name, alias and velocity
-	 * @return an instance of Boat
-	 */
-	private Boat parseBoat(Node node) {
-		try {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				Element element = (Element) node;
-				String name = element.getElementsByTagName("name").item(0).getTextContent();
-				String alias = element.getElementsByTagName("alias").item(0).getTextContent();
-				double velocity = Double.valueOf(element.getElementsByTagName("velocity").item(0).getTextContent());
-				int id = Integer.valueOf(element.getElementsByTagName("id").item(0).getTextContent());
-				Boat boat = new Boat(name, velocity, alias, id);
-				return boat;
-			} else {
-				throw new NoSuchElementException("Cannot generate a boat by given node");
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	/**
-	 * Create an arraylist of boats instance.
-	 * @return an arraylist of boats in teams file
-	 */
-	public ArrayList<Boat> getBoats() {
-		ArrayList<Boat> boats = new ArrayList<>();
-
-		try {
-			NodeList nodes = this.doc.getElementsByTagName("team");
-			for (int i = 0; i < nodes.getLength(); i++) {
-				Node node = nodes.item(i);
-				boats.add(parseBoat(node));
-			}
-			return boats;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-
-}
-
+//package seng302.models.parsers;
+//
+//import org.w3c.dom.*;
+//import seng302.models.Yacht;
+//
+//import java.util.ArrayList;
+//import java.util.NoSuchElementException;
+//
+//public class TeamsParser extends FileParser {
+//
+//	private Document doc;
+//
+//	public TeamsParser(String path) {
+//		super(path);
+//		this.doc = this.parseFile();
+//	}
+//
+//	/**
+//	 * Create a boat instance by a given team node
+//	 * @param node a boat node containing name, alias and velocity
+//	 * @return an instance of Boat
+//	 */
+//	private Yacht parseBoat(Node node) {
+//		try {
+//			if (node.getNodeType() == Node.ELEMENT_NODE) {
+//				Element element = (Element) node;
+//				String name = element.getElementsByTagName("name").item(0).getTextContent();
+//				String alias = element.getElementsByTagName("alias").item(0).getTextContent();
+//				double velocity = Double.valueOf(element.getElementsByTagName("velocity").item(0).getTextContent());
+//				int id = Integer.valueOf(element.getElementsByTagName("id").item(0).getTextContent());
+//				Yacht boat = new Yacht(name, velocity, alias, id);
+//				return boat;
+//			} else {
+//				throw new NoSuchElementException("Cannot generate a boat by given node");
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			return null;
+//		}
+//	}
+//
+//	/**
+//	 * Create an arraylist of boats instance.
+//	 * @return an arraylist of boats in teams file
+//	 */
+//	public ArrayList<Yacht> getBoats() {
+//		ArrayList<Yacht> boats = new ArrayList<>();
+//
+//		try {
+//			NodeList nodes = this.doc.getElementsByTagName("team");
+//			for (int i = 0; i < nodes.getLength(); i++) {
+//				Node node = nodes.item(i);
+//				boats.add(parseBoat(node));
+//			}
+//			return boats;
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			return null;
+//		}
+//	}
+//
+//
+//}
+//