From 2111c1ff31b06a5d3967f52e0e39d14049045ad5 Mon Sep 17 00:00:00 2001
From: Brad Corbett <brc9@aber.ac.uk>
Date: Mon, 27 Apr 2020 16:58:15 +0100
Subject: [PATCH] Added updated TranslationController.

---
 .../selfassessment/TranslationController.java | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java
index a7f5827..20a8ea5 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java	
+++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java	
@@ -86,10 +86,10 @@ public class TranslationController extends Question {
         incorrectGuesses.setText("Incorrect Guesses: 0");
 
         if(englishOrWelsh){
-            wordToTranslate.setText(practiceList.get(chosenWord).getEnglish());
+            wordToTranslate.setText(practiceList.get(chosenWord).getWelsh());
         }
         else{
-            wordToTranslate.setText(practiceList.get(chosenWord).getWelsh());
+            wordToTranslate.setText(practiceList.get(chosenWord).getEnglish());
         }
     }
 
@@ -103,25 +103,20 @@ public class TranslationController extends Question {
     @FXML
     void translateWord() {
 
+        ArrayList<String> usersInput = new ArrayList<>();
+        usersInput.add(translationBox.getText());
 
-        if(englishOrWelsh) {
-            if (translationBox.getText().equals(practiceList.get(chosenWord).getWelsh())) {
-                correctGuessesInt++;
-            } else {
-                incorrectGuessesInt++;
-            }
-        }
-        else{
-            if (translationBox.getText().equals(practiceList.get(chosenWord).getEnglish())) {
-                correctGuessesInt++;
-            } else {
-                incorrectGuessesInt++;
-            }
-        }
+        ArrayList<DictionaryEntry> correctTranslation = new ArrayList<>();
+        correctTranslation.add(practiceList.get(chosenWord));
+
+        checkAnswer(correctTranslation, usersInput, englishOrWelsh);
 
 
-        correctGuesses.setText("Correct Guesses: " + correctGuessesInt);
-        incorrectGuesses.setText("Incorrect Guesses: " + incorrectGuessesInt);
+
+
+
+        correctGuesses.setText("Correct Guesses: " + correctAnswer);
+        incorrectGuesses.setText("Incorrect Guesses: " + wrongAnswer);
 
 
 
@@ -139,10 +134,10 @@ public class TranslationController extends Question {
         }
 
         if(englishOrWelsh){
-            wordToTranslate.setText(practiceList.get(chosenWord).getEnglish());
+            wordToTranslate.setText(practiceList.get(chosenWord).getWelsh());
         }
         else{
-            wordToTranslate.setText(practiceList.get(chosenWord).getWelsh());
+            wordToTranslate.setText(practiceList.get(chosenWord).getEnglish());
         }
     }
 }