From 832c90f81cdc30fa9140e0b8081c2b5438eb58e9 Mon Sep 17 00:00:00 2001
From: top19 <top19@aber.ac.uk>
Date: Thu, 30 Apr 2020 09:20:33 +0100
Subject: [PATCH] Removed the placeholder screenswitching buttons.

---
 .../aber/cs22120/group20/javafx/AddWordController.java |  5 -----
 .../cs22120/group20/javafx/DictionaryController.java   |  9 ---------
 .../cs22120/group20/javafx/FlashcardController.java    |  4 ----
 .../cs22120/group20/javafx/PracticeListController.java | 10 +---------
 .../resources/uk/ac/aber/cs22120/group20/addword.fxml  |  1 -
 .../uk/ac/aber/cs22120/group20/dictionary.fxml         |  1 -
 .../uk/ac/aber/cs22120/group20/flashcard.fxml          |  1 -
 .../uk/ac/aber/cs22120/group20/practicelist.fxml       |  1 -
 8 files changed, 1 insertion(+), 31 deletions(-)

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 @@
                 <Button mnemonicParsing="false" onAction="#addButtonClick" prefHeight="25.0" prefWidth="274.0" text="Add Word" GridPane.columnIndex="3" GridPane.rowIndex="4" />
                 <TextField fx:id="english" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                 <TextField fx:id="welsh" GridPane.columnIndex="5" GridPane.rowIndex="3" />
-                <Button mnemonicParsing="false" onAction="#switchToPrimary" prefHeight="25.0" prefWidth="107.0" text="Switch Scene" GridPane.columnIndex="1" GridPane.rowIndex="5" />
                 <GridPane prefHeight="55.0" prefWidth="258.0" GridPane.columnIndex="3" GridPane.rowIndex="5">
                     <columnConstraints>
                         <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
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 f677954..d2bf521 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	
@@ -185,7 +185,6 @@
                         <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
                     </columnResizePolicy>
                 </TableView>
-                <Button fx:id="primaryButton" onAction="#switchToPracticeList" text="Switch to Practice List" />
             </children>
             <padding>
                 <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/flashcard.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/flashcard.fxml
index f70bb77..013a9e1 100644
--- a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/flashcard.fxml	
+++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/flashcard.fxml	
@@ -151,7 +151,6 @@
                     </children>
                 </HBox>
             </children>
-            <Button mnemonicParsing="false" onAction="#switchToAddWord" text="Add Word Screen" />
 
         </VBox>
 
diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/practicelist.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/practicelist.fxml
index 58d98a1..d149508 100644
--- a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/practicelist.fxml	
+++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/practicelist.fxml	
@@ -180,7 +180,6 @@
                         <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
                     </columnResizePolicy>
                 </TableView>
-                <Button fx:id="primaryButton" onAction="#switchToFlashCard" text="Switch to FlashCard View" />
             </children>
             <padding>
                 <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />