diff --git a/src/Welsh Vocabulary Tutor/pom.xml b/src/Welsh Vocabulary Tutor/pom.xml index 39197d6..c740378 100644 --- a/src/Welsh Vocabulary Tutor/pom.xml +++ b/src/Welsh Vocabulary Tutor/pom.xml @@ -62,7 +62,7 @@ javafx-maven-plugin 0.0.1 - uk.ac.aber.cs22120.group20.javafx.Application + uk.ac.aber.cs221.group20.javafx.Application diff --git a/src/Welsh Vocabulary Tutor/src/main/java/module-info.java b/src/Welsh Vocabulary Tutor/src/main/java/module-info.java index f6cdc5f..8a3c10a 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/module-info.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/module-info.java @@ -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; } \ No newline at end of file diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/AddWordController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java similarity index 98% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/AddWordController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java index 685dc03..1cc5f85 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/AddWordController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java @@ -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; /** diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/Application.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java similarity index 93% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/Application.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java index 0cf8185..40dfa44 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/Application.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/DictionaryController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java similarity index 98% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/DictionaryController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java index 6ececf2..8af3ebd 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/DictionaryController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/FlashcardController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java similarity index 96% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/FlashcardController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java index f3eeda8..48c24d1 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/FlashcardController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java @@ -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". diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/MatchTheMeaningController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java similarity index 93% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/MatchTheMeaningController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java index 7df1d6f..36ae0f5 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/MatchTheMeaningController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java @@ -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 *

@@ -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 */ diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/PracticeListController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java similarity index 99% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/PracticeListController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java index 27ef770..2a13b36 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/PracticeListController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/ScreenSwitch.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java similarity index 95% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/ScreenSwitch.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java index a0e2174..5cf77b3 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/ScreenSwitch.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java @@ -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; } /** diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SharedCodeController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java similarity index 97% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SharedCodeController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java index 94ba67c..bb9b496 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SharedCodeController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java @@ -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 diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SixMeaningsController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java similarity index 92% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SixMeaningsController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java index dba2b9f..d88e238 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SixMeaningsController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java @@ -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 *

@@ -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 { diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/TranslationController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java similarity index 91% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/TranslationController.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java index 99de1b5..348e686 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/TranslationController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java @@ -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; /** diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/DictionaryEntry.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java similarity index 94% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/DictionaryEntry.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java index e096c0e..58eb034 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/DictionaryEntry.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java @@ -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. diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/JsonProcessing.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java similarity index 96% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/JsonProcessing.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java index 3ce1728..b93ec83 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/JsonProcessing.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java similarity index 93% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java index a66bdf5..3e385dc 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java @@ -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); diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningQuestion.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java similarity index 88% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningQuestion.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java index cae3dd0..d35dcc4 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningQuestion.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java @@ -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; 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/cs221/group20/selfassessment/Question.java similarity index 97% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/Question.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java index 342d620..48961c6 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/cs221/group20/selfassessment/Question.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsQuestion.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java similarity index 93% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsQuestion.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java index 1808d22..d2eac7d 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsQuestion.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationQuestion.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java similarity index 86% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationQuestion.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java index b3a45d6..d6642ba 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationQuestion.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java @@ -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. diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AddWordControllerTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AddWordControllerTest.java similarity index 86% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AddWordControllerTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AddWordControllerTest.java index 812a843..6bc0d03 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AddWordControllerTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AddWordControllerTest.java @@ -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.*; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AssessmentGeneratorTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AssessmentGeneratorTest.java similarity index 55% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AssessmentGeneratorTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AssessmentGeneratorTest.java index d0ce61b..0218e36 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/AssessmentGeneratorTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/AssessmentGeneratorTest.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/DictionaryEntryTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java similarity index 92% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/DictionaryEntryTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java index 63b7976..e87892a 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/DictionaryEntryTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java @@ -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.*; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/FlashcardControllerTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/FlashcardControllerTest.java similarity index 67% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/FlashcardControllerTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/FlashcardControllerTest.java index 4a9453c..18a4f72 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/FlashcardControllerTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/FlashcardControllerTest.java @@ -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.*; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JSONTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java similarity index 92% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JSONTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java index 28e68ce..58db68b 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JSONTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JavaFXTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JavaFXTest.java similarity index 96% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JavaFXTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JavaFXTest.java index bfcb8a1..d6df46d 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JavaFXTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JavaFXTest.java @@ -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 diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/QuestionTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java similarity index 81% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/QuestionTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java index dfee4e3..32d68ca 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/QuestionTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java @@ -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 correctAnswerList = new ArrayList<>(); ArrayList 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 correctAnswerList = new ArrayList<>(); ArrayList 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 correctAnswerList = new ArrayList<>(); ArrayList 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 correctAnswerList = new ArrayList<>(); ArrayList 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); diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/SelfAssesmentTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/SelfAssesmentTest.java similarity index 95% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/SelfAssesmentTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/SelfAssesmentTest.java index 2c77981..136f34b 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/SelfAssesmentTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/SelfAssesmentTest.java @@ -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 diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/TranslationControllerTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/TranslationControllerTest.java similarity index 76% rename from src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/TranslationControllerTest.java rename to src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/TranslationControllerTest.java index 62274ee..85d90c3 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/TranslationControllerTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/TranslationControllerTest.java @@ -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; diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/addword.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/addword.fxml index 6e2ee09..a4ca237 100644 --- a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/addword.fxml +++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/addword.fxml @@ -16,7 +16,7 @@ - + diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/dictionary.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/dictionary.fxml index e9a6e32..c51fa0f 100644 --- a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/dictionary.fxml +++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/dictionary.fxml @@ -14,7 +14,7 @@ diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translation.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translation.fxml index a91574b..a3b4540 100644 --- a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translation.fxml +++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translation.fxml @@ -15,7 +15,7 @@