Updated MatchTheMeaningController.java
This commit is contained in:
parent
d5b83532f2
commit
332cfc6e7b
1 changed files with 3 additions and 16 deletions
|
@ -81,14 +81,6 @@ public class MatchTheMeaningController implements Initializable{
|
||||||
private Label WrongAnswer;
|
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.
|
* 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){
|
private void setWords(ArrayList<DictionaryEntry> questions, ArrayList<Integer> orderList){
|
||||||
|
|
||||||
|
isEnglish = AssessmentGenerator.isEnglish;
|
||||||
|
|
||||||
if(isEnglish){
|
if(isEnglish){
|
||||||
LeftWord1.setText(questions.get(0).getEnglish());
|
LeftWord1.setText(questions.get(0).getEnglish());
|
||||||
LeftWord2.setText(questions.get(1).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
|
@Override
|
||||||
public void initialize(URL url, ResourceBundle resourceBundle) {
|
public void initialize(URL url, ResourceBundle resourceBundle) {
|
||||||
|
|
||||||
this.prepare();
|
setWords(answer,orderList);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue