From 0367805f0fbef312b976940deff67bac1dc51070 Mon Sep 17 00:00:00 2001 From: Peter Galloway Date: Mon, 22 May 2017 15:01:04 +1200 Subject: [PATCH] fixed bug from merge where est time to next mark was null on some boats #story[923] --- .../seng302/controllers/StartScreenController.java | 4 ++-- src/main/java/seng302/models/BoatGroup.java | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java index bf1456a8..debeb371 100644 --- a/src/main/java/seng302/controllers/StartScreenController.java +++ b/src/main/java/seng302/controllers/StartScreenController.java @@ -58,10 +58,10 @@ public class StartScreenController implements Initializable { contentPane.getChildren().addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl))); } catch(javafx.fxml.LoadException e){ - System.err.println(e.getCause()); + e.printStackTrace(); } catch(IOException e){ - System.err.println(e); + e.printStackTrace(); } } diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/models/BoatGroup.java index 6a6c0370..9ce9db91 100644 --- a/src/main/java/seng302/models/BoatGroup.java +++ b/src/main/java/seng302/models/BoatGroup.java @@ -217,11 +217,14 @@ public class BoatGroup extends Group{ if (estTimeToNextMarkObject == null){ estTimeToNextMarkObject = getTextObject("", textColor); } - - DateFormat format = new SimpleDateFormat("mm:ss"); - String timeToNextMark = format + if (boat.getEstimateTimeAtNextMark() != null){ + DateFormat format = new SimpleDateFormat("mm:ss"); + String timeToNextMark = format .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong()); - estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark); + estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark); + } else { + estTimeToNextMarkObject.setText("Next mark: -"); + } } /**