From 332cfc6e7bc202aa2201e923a5816454f90645e2 Mon Sep 17 00:00:00 2001
From: maj83 <maj83@aber.ac.uk>
Date: Wed, 29 Apr 2020 13:17:40 +0100
Subject: [PATCH] Updated MatchTheMeaningController.java

---
 .../MatchTheMeaningController.java            | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

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 c891f88..69ed5b2 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	
@@ -81,14 +81,6 @@ public class MatchTheMeaningController implements Initializable{
    private Label WrongAnswer;
 
 
-   /**
-    * Pick randomly dictionary entry and add it to question list where are stored questions for this test.
-    */
-//   private void getQuestions(){
-//
-//      answer.addAll(AssessmentGenerator.generateWordMatch());
-//
-//   }
 
    /**
     * Set chosen words from dictionary on the scene.
@@ -100,6 +92,8 @@ public class MatchTheMeaningController implements Initializable{
 
    private void setWords(ArrayList<DictionaryEntry> questions, ArrayList<Integer> orderList){
 
+      isEnglish = AssessmentGenerator.isEnglish;
+
       if(isEnglish){
          LeftWord1.setText(questions.get(0).getEnglish());
          LeftWord2.setText(questions.get(1).getEnglish());
@@ -157,18 +151,11 @@ public class MatchTheMeaningController implements Initializable{
 
    }
 
-   /**
-    * Method responsible for preparing questions and scene.
-    */
-   private void prepare(){
-//      getQuestions();
-      setWords(answer,orderList);
-   }
 
    @Override
    public void initialize(URL url, ResourceBundle resourceBundle) {
 
-      this.prepare();
+      setWords(answer,orderList);
 
    }
 }