From ee65e7eba53220f777c7faef47eda21b9ec19dea Mon Sep 17 00:00:00 2001 From: David Wu Date: Thu, 6 Apr 2017 16:44:22 +1200 Subject: [PATCH] Changed where the saved annotation set is declared. -Annotation set is now initialized along with annotations. #story[26] --- src/main/java/seng302/Controllers/RaceController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index 3ea94788..311a44cf 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -29,7 +29,7 @@ public class RaceController extends Controller { GridPane canvasBase; //user saved data for annotation display - private ArrayList presetAnno = new ArrayList<>(); + private ArrayList presetAnno; ResizableRaceCanvas raceMap; @@ -180,7 +180,7 @@ public class RaceController extends Controller { startScreen.setVisible(false); ongoingRacePane.setVisible(true); - + //Initialize save annotation array, fps listener, and annotation listeners initializeFPS(); initializeAnnotations(); @@ -227,6 +227,7 @@ public class RaceController extends Controller { * Set up boat annotations */ private void initializeAnnotations() { + presetAnno = new ArrayList<>(); //listener for annotation showAnnotations.selectedProperty().addListener(new ChangeListener() { public void changed(ObservableValue ov, @@ -282,5 +283,4 @@ public class RaceController extends Controller { } }); } - }