diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningController.java index 1439c9a..c891f88 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningController.java @@ -33,7 +33,7 @@ import java.util.*; public class MatchTheMeaningController implements Initializable{ - private ArrayList answer =new ArrayList<>(); + public static ArrayList answer =new ArrayList<>(); private ArrayList orderList = new ArrayList<>(Arrays.asList(0,1,2,3)); private boolean isEnglish; @@ -84,11 +84,11 @@ public class MatchTheMeaningController implements Initializable{ /** * Pick randomly dictionary entry and add it to question list where are stored questions for this test. */ - private void getQuestions(){ - - answer.addAll(AssessmentGenerator.generateWordMatch()); - - } +// private void getQuestions(){ +// +// answer.addAll(AssessmentGenerator.generateWordMatch()); +// +// } /** * Set chosen words from dictionary on the scene. @@ -153,7 +153,7 @@ public class MatchTheMeaningController implements Initializable{ WrongAnswer.setText(Integer.toString(Question.wrongAnswers)); answer.clear(); - this.prepare(); + AssessmentGenerator.goToNextQuestion(); } @@ -161,7 +161,7 @@ public class MatchTheMeaningController implements Initializable{ * Method responsible for preparing questions and scene. */ private void prepare(){ - getQuestions(); +// getQuestions(); setWords(answer,orderList); }