diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/Question.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/Question.java index 0380d6e..7b7f54d 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/Question.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/Question.java @@ -1,6 +1,9 @@ package uk.ac.aber.cs22120.group20.selfassessment; -import uk.ac.aber.cs22120.group20.json.WelshDictionary; +import uk.ac.aber.cs22120.group20.json.DictionaryEntry; + +import java.util.ArrayList; + /** * Abstract class contains the basic information that all the shared information between the @@ -12,13 +15,34 @@ import uk.ac.aber.cs22120.group20.json.WelshDictionary; */ public class Question { + public int correctAnswer = 0; + public int wrongAnswer =0; + /** * Constructor for * WordEnterQuestion that takes a WelshDictionary object that is being tested on as the parameter. * @param correctAnswer */ - public wordEnterQuestion(WelshDictionary correctAnswer){ + public void wordEnterQuestion(DictionaryEntry correctAnswer){ } + public void checkAnswer(ArrayList listOfCorrectQuestions, ArrayListlistOfAnswers, boolean isEnglish){ + if(isEnglish){ + for(int i=0; i