From 3c10311a4dff940a15ff33d1a7a3c69829a0b116 Mon Sep 17 00:00:00 2001 From: maj83 Date: Wed, 29 Apr 2020 13:32:22 +0100 Subject: [PATCH] Updated SixMeaningsController.java --- .../selfassessment/SixMeaningsController.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java index ea2583a..1e89185 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java @@ -100,15 +100,9 @@ public class SixMeaningsController implements Initializable { } -// private void getWords() { -// -// wordSet = AssessmentGenerator.generateSixMeanings(); -// -// } - - private void setWords(boolean isEnglish){ + if(isEnglish){ wordSet.add(allQuestions.get(0)); @@ -166,17 +160,9 @@ public class SixMeaningsController implements Initializable { } - private void prepare() { - //getWords(); - Random rd = new Random(); - System.out.println(rd.nextBoolean()); - setWords(AssessmentGenerator.isEnglish); - } - - @Override public void initialize(URL url, ResourceBundle resourceBundle) { - this.prepare(); + setWords(isEnglish); }