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/cs22120/group20/javafx/AddWordController.java index 576cf3d..a944611 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/cs22120/group20/javafx/AddWordController.java @@ -126,11 +126,6 @@ public class AddWordController extends SharedCodeController { // } - @FXML - private void switchToPrimary() throws IOException { - Application.setRoot("Primary"); - } - // add character methods for characters ch, dd, ff, ng, ll, ph, rh, th public void addCharch(ActionEvent actionEvent) { welsh.appendText("ch"); 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/cs22120/group20/javafx/DictionaryController.java index c6435c9..d503414 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/cs22120/group20/javafx/DictionaryController.java @@ -116,15 +116,6 @@ public class DictionaryController extends SharedCodeController { } } - /** - * Switches to the primary scene. - * - * @throws IOException - */ - @FXML - private void switchToPracticeList() throws IOException { - ScreenSwitch.swap(ScreenSwitch.SceneEnum.practiceListScene); - } /** * Initializes the table of dictionary entries. 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/cs22120/group20/javafx/FlashcardController.java index f5dc1dc..ae1db1b 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/cs22120/group20/javafx/FlashcardController.java @@ -170,9 +170,5 @@ public class FlashcardController extends SharedCodeController { } - @FXML - private void switchToAddWord() throws IOException { - AssessmentGenerator.generateAssessment(Application.practiseList); - } } 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/cs22120/group20/javafx/PracticeListController.java index 0f4f65c..3b2a0e5 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/cs22120/group20/javafx/PracticeListController.java @@ -233,15 +233,7 @@ public class PracticeListController extends SharedCodeController{ } } - /** - * Switches to the primary scene. - * - * @throws IOException - */ - @FXML - private void switchToFlashCard() throws IOException { - ScreenSwitch.swap(ScreenSwitch.SceneEnum.flashcardScene); - } + } 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 8119077..324bf05 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 @@ -149,7 +149,6 @@