noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactored classes into cs221

Browse source 
Classes now reside in the cs221 package rather than cs22120
This commit is contained in:
law39 2020-04-30 18:51:02 +01:00
parent dcb108ed75
commit 258f433d71
33 changed files with 114 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Welsh Vocabulary Tutor/pom.xml
View file

@ -62,7 +62,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.1</version>
<configuration>
<mainClass>uk.ac.aber.cs22120.group20.javafx.Application</mainClass>
<mainClass>uk.ac.aber.cs221.group20.javafx.Application</mainClass>
</configuration>
</plugin>
</plugins>

16
src/Welsh Vocabulary Tutor/src/main/java/module-info.java
View file

@ -1,4 +1,4 @@
module uk.ac.aber.cs22120.group20 {
module uk.ac.aber.cs221.group20 {
requires javafx.controls;
requires javafx.fxml;
requires com.fasterxml.jackson.core;
@ -8,15 +8,13 @@ module uk.ac.aber.cs22120.group20 {
requires org.junit.jupiter.api;
opens uk.ac.aber.cs22120.group20.javafx to javafx.fxml;
opens uk.ac.aber.cs22120.group20 to javafx.fxml;
opens uk.ac.aber.cs22120.group20.json to com.fasterxml.jackson.databind;
opens uk.ac.aber.cs221.group20.javafx to javafx.fxml;
opens uk.ac.aber.cs221.group20.json to com.fasterxml.jackson.databind;
opens uk.ac.aber.cs22120.group20.selfassessment to javafx.fxml;
opens uk.ac.aber.cs221.group20.selfassessment to javafx.fxml;
exports uk.ac.aber.cs22120.group20.json to com.fasterxml.jackson.databind;
exports uk.ac.aber.cs22120.group20.javafx to javafx.graphics, javafx.fxml;
exports uk.ac.aber.cs22120.group20.test to org.junit.jupiter, org.testfx;
// exports uk.ac.aber.cs22120.group20.test to junit;
exports uk.ac.aber.cs221.group20.json to com.fasterxml.jackson.databind;
exports uk.ac.aber.cs221.group20.javafx to javafx.graphics, javafx.fxml;
// exports uk.ac.aber.cs221.group20.test to org.junit.jupiter, org.testfx;
}

6
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/AddWordController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java
View file

@ -5,7 +5,7 @@
* All rights reserved.
*/
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
@ -13,11 +13,9 @@ import javafx.scene.control.Alert;
import javafx.scene.control.ComboBox;
import javafx.scene.control.TextField;
import java.io.IOException;
import javafx.scene.image.Image;
import javafx.scene.paint.Color;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
/**

6
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/Application.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java
View file

@ -4,12 +4,12 @@
* Copyright (c) 2020 Aberystwyth University.
* All rights reserved.
*/
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.stage.FileChooser;
import javafx.stage.Stage;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.json.JsonProcessing;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.JsonProcessing;
import java.io.File;
import java.io.IOException;

5
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/DictionaryController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java
View file

@ -4,7 +4,7 @@
* Copyright (c) 2020 Aberystwyth University.
* All rights reserved.
*/
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.beans.property.SimpleStringProperty;
import javafx.collections.FXCollections;
@ -19,8 +19,7 @@ import javafx.scene.control.TextField;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.paint.Color;
import javafx.stage.Stage;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import java.util.ArrayList;
import java.util.Comparator;

7
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/FlashcardController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.animation.*;
import javafx.fxml.FXML;
@ -6,13 +6,10 @@ import javafx.scene.Node;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.paint.Color;
import javafx.scene.shape.Rectangle;
import javafx.scene.text.Text;
import javafx.scene.transform.Rotate;
import javafx.util.Duration;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import java.io.IOException;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
/**
* A class that servers as the controller for the programs Flashcard JavaFX scene, handling all of its events and attributes. This scene is defined as "flashcard.fxml".

13
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/MatchTheMeaningController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
/**
* @(#) MyController.java 0,1 2020/04/07
* <p>
@ -7,18 +7,15 @@ package uk.ac.aber.cs22120.group20.javafx;
*/
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Alert;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.paint.Color;
import uk.ac.aber.cs22120.group20.javafx.SharedCodeController;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs22120.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import java.net.URL;
import java.util.*;
/**
@ -33,7 +30,7 @@ import java.util.*;
* @author Tom Perry [top1]
* @author Waylen Watts [ncw]
* @version 0.4 Initial development
* @see uk.ac.aber.cs22120.group20.javafx.Application
* @see Application
*/

4
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/PracticeListController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java
View file

@ -4,7 +4,7 @@
* Copyright (c) 2020 Aberystwyth University.
* All rights reserved.
*/
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.beans.property.SimpleStringProperty;
import javafx.collections.FXCollections;
@ -16,7 +16,7 @@ import javafx.scene.control.*;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.paint.Color;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import java.util.ArrayList;
import java.util.Comparator;

8
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/ScreenSwitch.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
@ -18,6 +18,7 @@ import java.net.URL;
*/
public class ScreenSwitch extends SharedCodeController {
private static Scene scene;
private static Stage stage;
/**
* This constructor is used by Application to pass control of the stage.
@ -28,8 +29,13 @@ public class ScreenSwitch extends SharedCodeController {
*/
public ScreenSwitch(Stage stage){
scene = new Scene(fxmlLoader(SceneEnum.dictionaryScene));
stage.setMinHeight(680);
stage.setHeight(680);
stage.setMinWidth(1100);
stage.setWidth(1100);
stage.setScene(scene);
stage.show();
ScreenSwitch.stage = stage;
}
/**

6
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SharedCodeController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
@ -6,8 +6,8 @@ import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.shape.Rectangle;
import javafx.scene.text.Text;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
/**
* Abstract class that contains all the shared FXML elements between the
* different controller classes including the sliding menu and the test score counter, to reduce code

13
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SixMeaningsController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
/**
* @(#) SixMeaningsController.java 0,1 2020/04/27
* <p>
@ -7,18 +7,15 @@ package uk.ac.aber.cs22120.group20.javafx;
*/
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.input.MouseEvent;
import javafx.scene.paint.Color;
import javafx.scene.text.Text;
import uk.ac.aber.cs22120.group20.javafx.Application;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs22120.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import java.net.URL;
import java.util.*;
/**
@ -33,7 +30,7 @@ import java.util.*;
* @author Tom Perry [top1]
* @author Waylen Watts [ncw]
* @version 0.1 Initial development
* @see uk.ac.aber.cs22120.group20.javafx.Application
* @see Application
*/
public class SixMeaningsController extends SharedCodeController {

9
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/TranslationController.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.javafx;
package uk.ac.aber.cs221.group20.javafx;
import javafx.fxml.FXML;
import javafx.scene.control.TextField;
@ -10,10 +10,9 @@ import javafx.scene.text.Text;
import java.util.ArrayList;
import java.util.Random;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.javafx.Application;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs22120.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
/**

6
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/DictionaryEntry.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java
View file

@ -4,10 +4,10 @@
* Copyright (c) 2020 Aberystwyth University.
* All rights reserved.
*/
package uk.ac.aber.cs22120.group20.json;
package uk.ac.aber.cs221.group20.json;
import uk.ac.aber.cs22120.group20.javafx.Application;
import uk.ac.aber.cs22120.group20.javafx.DictionaryController;
import uk.ac.aber.cs221.group20.javafx.DictionaryController;
import uk.ac.aber.cs221.group20.javafx.Application;
/**
* A class that demonstrates how a controller works.

2
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/JsonProcessing.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.json;
package uk.ac.aber.cs221.group20.json;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

15
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java
View file

@ -1,9 +1,10 @@
package uk.ac.aber.cs22120.group20.selfassessment;
package uk.ac.aber.cs221.group20.selfassessment;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import uk.ac.aber.cs22120.group20.javafx.*;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.javafx.*;
import uk.ac.aber.cs221.group20.javafx.*;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import java.text.DecimalFormat;
import java.util.*;
@ -53,12 +54,12 @@ public class AssessmentGenerator {
//int wordToTranslatePlace;
if (practiseList.size()<5){
if (practiseList.size()==0){
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle("Error");
alert.setHeaderText("Not enough words in practice list");
alert.setResizable(false);
alert.setContentText("Please add more words to your practice list on the dictionary page before trying to test yourself!");
alert.setContentText("Please add at least 1 word to your practice!");
alert.showAndWait();
}else {
@ -91,7 +92,7 @@ public class AssessmentGenerator {
// wordsToTranslate.add(Application.practiseList.get(wordToTranslatePlace));
// wordsToTranslate.toArray();
// }
if((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof MatchTheMeaningQuestion)){
if( (practiseList.size()>=4) || ((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof MatchTheMeaningQuestion))){
generatedAssessment = generateMatchMeaning(practiseList);
}else {
numberToGenerate--;
@ -196,7 +197,7 @@ public class AssessmentGenerator {
alert.setHeaderText("You finished the tests\n Well Done!");
alert.setResizable(false);
String sb = "You got " +
new DecimalFormat("#.##").format(((double) (totalCorrectAnswers * 100) / (double) totalAnswers)) +
new DecimalFormat("#").format(((double) (totalCorrectAnswers * 100) / (double) totalAnswers)) +
"%" +
"\n Would you like to test yourself again?";
alert.setContentText(sb);

4
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningQuestion.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java
View file

@ -1,6 +1,6 @@
package uk.ac.aber.cs22120.group20.selfassessment;
package uk.ac.aber.cs221.group20.selfassessment;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import java.util.ArrayList;
import java.util.Arrays;

4
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/Question.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java
View file

@ -1,8 +1,8 @@
package uk.ac.aber.cs22120.group20.selfassessment;
package uk.ac.aber.cs221.group20.selfassessment;
import javafx.scene.control.Alert;
import javafx.scene.control.Label;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import java.util.ArrayList;

4
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsQuestion.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java
View file

@ -1,6 +1,6 @@
package uk.ac.aber.cs22120.group20.selfassessment;
package uk.ac.aber.cs221.group20.selfassessment;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import java.util.ArrayList;
import java.util.LinkedList;

4
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationQuestion.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java
View file

@ -1,6 +1,6 @@
package uk.ac.aber.cs22120.group20.selfassessment;
package uk.ac.aber.cs221.group20.selfassessment;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
/**
* Class used to create a MatchTheMeaning Question.

5
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AddWordControllerTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AddWordControllerTest.java
View file

@ -1,10 +1,11 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
import javafx.event.ActionEvent;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import uk.ac.aber.cs22120.group20.javafx.AddWordController;
import uk.ac.aber.cs221.group20.javafx.AddWordController;
import uk.ac.aber.cs221.group20.javafx.AddWordController;
import static org.junit.jupiter.api.Assertions.*;

10
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AssessmentGeneratorTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AssessmentGeneratorTest.java
View file

@ -1,9 +1,11 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
import org.junit.jupiter.api.Test;
import uk.ac.aber.cs22120.group20.javafx.Application;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs22120.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.javafx.Application;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import java.util.LinkedList;

6
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/DictionaryEntryTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java
View file

@ -1,8 +1,8 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
import org.junit.jupiter.api.Test;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.json.JsonProcessing;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.JsonProcessing;
import java.util.*;

2
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/FlashcardControllerTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/FlashcardControllerTest.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
import static org.junit.jupiter.api.Assertions.*;

10
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JSONTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java
View file

@ -1,12 +1,12 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import uk.ac.aber.cs22120.group20.javafx.Application;
import uk.ac.aber.cs22120.group20.javafx.SharedCodeController;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.json.JsonProcessing;
import uk.ac.aber.cs221.group20.javafx.Application;
import uk.ac.aber.cs221.group20.javafx.SharedCodeController;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.json.JsonProcessing;
import java.io.File;
import java.io.FileWriter;

2
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JavaFXTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JavaFXTest.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
/**
* Class that contains methods to test that the application class is correctly storing the full

35
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/QuestionTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java
View file

@ -1,16 +1,19 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
import org.junit.jupiter.api.Test;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs22120.group20.selfassessment.Question;
import uk.ac.aber.cs22120.group20.selfassessment.TranslationQuestion;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.selfassessment.TranslationQuestion;
import java.util.ArrayList;
import java.util.LinkedList;
import static org.junit.jupiter.api.Assertions.*;
import static uk.ac.aber.cs22120.group20.json.DictionaryEntry.wordTypeEnum.verb;
import static uk.ac.aber.cs221.group20.json.DictionaryEntry.wordTypeEnum.verb;
/**
* Class that contains methods which will be used to test the Question class, and its methods.
@ -37,7 +40,7 @@ class QuestionTest {
void testCheckRightAnswerTranslationOrSixMeanings() {
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
ArrayList<String> correctEntryList = new ArrayList<>();
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1",verb);
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1", DictionaryEntry.wordTypeEnum.verb);
boolean isEnglish = true;
correctAnswerList.add(wordToTest);
@ -61,7 +64,7 @@ class QuestionTest {
void testCheckWrongAnswerTranslationOrSixMeanings() {
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
ArrayList<String> correctEntryList = new ArrayList<>();
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1",verb);
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1", DictionaryEntry.wordTypeEnum.verb);
boolean isEnglish = true;
correctAnswerList.add(wordToTest);
@ -88,10 +91,10 @@ class QuestionTest {
void testCheckRightAnswerMatchMeaning(){
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
ArrayList<String> correctEntryList = new ArrayList<>();
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1",verb);
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2",verb);
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3",verb);
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4",verb);
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1", DictionaryEntry.wordTypeEnum.verb);
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2", DictionaryEntry.wordTypeEnum.verb);
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3", DictionaryEntry.wordTypeEnum.verb);
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4", DictionaryEntry.wordTypeEnum.verb);
boolean isEnglish = true;
correctAnswerList.add(wordToTest1);
@ -121,10 +124,10 @@ class QuestionTest {
void testCheckWrongAnswerMatchMeaning(){
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
ArrayList<String> correctEntryList = new ArrayList<>();
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1",verb);
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2",verb);
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3",verb);
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4",verb);
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1", DictionaryEntry.wordTypeEnum.verb);
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2", DictionaryEntry.wordTypeEnum.verb);
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3", DictionaryEntry.wordTypeEnum.verb);
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4", DictionaryEntry.wordTypeEnum.verb);
correctAnswerList.add(wordToTest1);

2
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/SelfAssesmentTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/SelfAssesmentTest.java
View file

@ -1,4 +1,4 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
/**
* This class will test that the lists pulled in the self-assessment package are indeed

12
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/TranslationControllerTest.java → src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/TranslationControllerTest.java
View file

@ -1,11 +1,13 @@
package uk.ac.aber.cs22120.group20.test;
package uk.ac.aber.cs221.group20.test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import uk.ac.aber.cs22120.group20.javafx.TranslationController;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import uk.ac.aber.cs22120.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs22120.group20.selfassessment.Question;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.javafx.TranslationController;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import java.util.LinkedList;
import java.util.Random;

2
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/addword.fxml
View file

@ -16,7 +16,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<BorderPane minHeight="550" minWidth="500" stylesheets="" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs22120.group20.javafx.AddWordController">
<BorderPane minHeight="550" minWidth="500" stylesheets="" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs221.group20.javafx.AddWordController">
<left>

2
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/dictionary.fxml
View file

@ -14,7 +14,7 @@
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="uk.ac.aber.cs22120.group20.javafx.DictionaryController"
fx:controller="uk.ac.aber.cs221.group20.javafx.DictionaryController"
stylesheets=""
minWidth="450"
minHeight="550"

2
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/flashcard.fxml
View file

@ -8,7 +8,7 @@
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="uk.ac.aber.cs22120.group20.javafx.FlashcardController"
fx:controller="uk.ac.aber.cs221.group20.javafx.FlashcardController"
minWidth="450"
minHeight="550"

2
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/practicelist.fxml
View file

@ -15,7 +15,7 @@
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="uk.ac.aber.cs22120.group20.javafx.PracticeListController"
fx:controller="uk.ac.aber.cs221.group20.javafx.PracticeListController"
minWidth="450"
minHeight="550"
>

2
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translation.fxml
View file

@ -15,7 +15,7 @@
<?import javafx.scene.text.Font?>
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="uk.ac.aber.cs22120.group20.javafx.TranslationController"
fx:controller="uk.ac.aber.cs221.group20.javafx.TranslationController"
fx:id="container"
minWidth="450"
minHeight="550"