diff --git a/dev/20200331/brc9/translationFX/.idea/.name b/dev/20200331/brc9/translationFX/.idea/.name
new file mode 100644
index 0000000..1a05ef2
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/.idea/.name
@@ -0,0 +1 @@
+translationTestWork
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/.idea/encodings.xml b/dev/20200331/brc9/translationFX/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/.idea/misc.xml b/dev/20200331/brc9/translationFX/.idea/misc.xml
new file mode 100644
index 0000000..e0844bc
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/.idea/modules.xml b/dev/20200331/brc9/translationFX/.idea/modules.xml
new file mode 100644
index 0000000..14cbad5
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/.idea/workspace.xml b/dev/20200331/brc9/translationFX/.idea/workspace.xml
new file mode 100644
index 0000000..31f8105
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/.idea/workspace.xml
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1586206742084
+
+
+ 1586206742084
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No facets are configured
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 11
+
+
+
+
+
+
+
+ translationTestWork
+
+
+
+
+
+
+
+ 11
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/.gitkeep b/dev/20200331/brc9/translationFX/out/production/translationTestWork/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/compiler.xml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/compiler.xml
new file mode 100644
index 0000000..0c465ee
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/compiler.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/encodings.xml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/encodings.xml
new file mode 100644
index 0000000..34d7d10
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/encodings.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/misc.xml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/misc.xml
new file mode 100644
index 0000000..d24ea8e
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/misc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/vcs.xml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/workspace.xml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/workspace.xml
new file mode 100644
index 0000000..a313612
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/.idea/workspace.xml
@@ -0,0 +1,328 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1585703857421
+
+
+ 1585703857421
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/pom.xml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/pom.xml
new file mode 100644
index 0000000..d2e762f
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/pom.xml
@@ -0,0 +1,44 @@
+
+ 4.0.0
+ uk.ac.aber.cs22120.group20
+ Welsh Vocabulary Tutor
+ 1.0-SNAPSHOT
+
+ UTF-8
+ 11
+ 11
+
+
+
+ org.openjfx
+ javafx-controls
+ 11
+
+
+ org.openjfx
+ javafx-fxml
+ 11
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.0
+
+ 11
+
+
+
+ org.openjfx
+ javafx-maven-plugin
+ 0.0.1
+
+ uk.ac.aber.cs22120.group20.App
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml
new file mode 100644
index 0000000..e2ba159
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml
new file mode 100644
index 0000000..3e1a950
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml
new file mode 100644
index 0000000..e2ba159
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml
new file mode 100644
index 0000000..3e1a950
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/out/production/translationTestWork/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/src/.gitkeep b/dev/20200331/brc9/translationFX/src/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/compiler.xml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/compiler.xml
new file mode 100644
index 0000000..0c465ee
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/compiler.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/encodings.xml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/encodings.xml
new file mode 100644
index 0000000..34d7d10
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/encodings.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/misc.xml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/misc.xml
new file mode 100644
index 0000000..d24ea8e
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/misc.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/vcs.xml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/workspace.xml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/workspace.xml
new file mode 100644
index 0000000..d8ecf85
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/.idea/workspace.xml
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1585703857421
+
+
+ 1585703857421
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/pom.xml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/pom.xml
new file mode 100644
index 0000000..d2e762f
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/pom.xml
@@ -0,0 +1,44 @@
+
+ 4.0.0
+ uk.ac.aber.cs22120.group20
+ Welsh Vocabulary Tutor
+ 1.0-SNAPSHOT
+
+ UTF-8
+ 11
+ 11
+
+
+
+ org.openjfx
+ javafx-controls
+ 11
+
+
+ org.openjfx
+ javafx-fxml
+ 11
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.0
+
+ 11
+
+
+
+ org.openjfx
+ javafx-maven-plugin
+ 0.0.1
+
+ uk.ac.aber.cs22120.group20.App
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/module-info.java b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/module-info.java
new file mode 100644
index 0000000..5d44bb3
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module uk.ac.aber.cs22120.group20 {
+ requires javafx.controls;
+ requires javafx.fxml;
+
+ opens uk.ac.aber.cs22120.group20 to javafx.fxml;
+ exports uk.ac.aber.cs22120.group20;
+}
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java
new file mode 100644
index 0000000..7bd0a9a
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java
@@ -0,0 +1,56 @@
+package uk.ac.aber.cs22120.group20;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Launch class of the Welsh Vocabulary tutor Application
+ *
+ * @author Brad Corbett [brc9]
+ * @author Henry Dugmore [hjd3]
+ * @author Kain Bryan-Jones [kab74]
+ * @author Luke Wybar [law39]
+ * @author Marcin Jakob [maj83]
+ * @author Oscar Pocock [osp1]
+ * @author Tom Perry [top1]
+ * @author Waylen Watts [ncw]
+ *
+ * @version 0.1
+ */
+public class App extends Application {
+ private static Scene scene;
+
+
+ @Override
+ public void start(Stage stage) throws IOException {
+ scene = new Scene(loadFXML("translationTest"));
+ stage.setScene(scene);
+ stage.show();
+ }
+
+ static void setRoot(String fxml) throws IOException {
+ scene.setRoot(loadFXML(fxml));
+ }
+
+ private static Parent loadFXML(String fxml) throws IOException {
+ FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource(fxml + ".fxml"));
+ return fxmlLoader.load();
+ }
+
+ public static void main(String[] args) {
+
+ launch();
+
+
+
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/PrimaryController.java b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/PrimaryController.java
new file mode 100644
index 0000000..e4d95f2
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/PrimaryController.java
@@ -0,0 +1,124 @@
+package uk.ac.aber.cs22120.group20;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.text.Text;
+import java.util.Random;
+
+
+/**
+ * Placeholder Controller
+ */
+public class PrimaryController {
+ ArrayList words = new ArrayList<>();
+ WelshDictionary word1 = new WelshDictionary("english1","welsh1", "type1");
+ WelshDictionary word2 = new WelshDictionary("english2","welsh2", "type1");
+ WelshDictionary word3 = new WelshDictionary("english3","welsh3", "type1");
+ WelshDictionary word4 = new WelshDictionary("english4","welsh4", "type1");
+ WelshDictionary word5 = new WelshDictionary("english5","welsh5", "type1");
+ ArrayList numbersUsed = new ArrayList();
+ int correctGuessesInt = 0;
+ int incorrectGuessesInt = 0;
+
+ int chosenWord = 0;
+ @FXML
+ private TextField translationBox;
+
+ @FXML
+ private Text typeOfTest;
+
+ @FXML
+ private Text wordToTranslate;
+
+ @FXML
+ private Text correctGuesses;
+
+ @FXML
+ private Text incorrectGuesses;
+
+ @FXML
+ private Button submitButton;
+ Random rand = new Random();
+
+ boolean englishOrWelsh = false; // False means English to Welsh, true means Welsh to English
+
+
+
+ @FXML
+ private void initialize(){
+
+ words.add(word1);
+ words.add(word2);
+ words.add(word3);
+ words.add(word4);
+ words.add(word5);
+
+
+ chosenWord = (rand.nextInt(5)+1);
+ numbersUsed.add(chosenWord);
+
+ englishOrWelsh = rand.nextBoolean();
+
+ correctGuesses.setText("Correct guesses: 0");
+ incorrectGuesses.setText("Incorrect guesses: 0");
+
+ if(englishOrWelsh){
+ wordToTranslate.setText(words.get(chosenWord).getEnglish());
+ }
+ else{
+ wordToTranslate.setText(words.get(chosenWord).getWelsh());
+ }
+
+
+
+
+
+ }
+
+
+
+ @FXML
+ private void switchToSecondary() throws IOException {
+ App.setRoot("secondary");
+ }
+
+
+
+
+ @FXML
+ void translateWord() {
+ if(translationBox.equals(words.get(chosenWord))){
+ correctGuessesInt++;
+ }
+ else{
+ incorrectGuessesInt++;
+ }
+
+ /*
+ correctGuesses.setText("Correct Guesses: " + correctGuessesInt);
+ incorrectGuesses.setText("Incorrect Guesses: " + incorrectGuessesInt);
+*/
+ if(numbersUsed.size() >= 5){
+ submitButton.setVisible(false);
+ }
+
+
+
+ do{
+ chosenWord = (rand.nextInt(5)+1);
+ }while(numbersUsed.contains(chosenWord));
+
+ if(englishOrWelsh){
+ wordToTranslate.setText(words.get(chosenWord).getEnglish());
+ }
+ else{
+ wordToTranslate.setText(words.get(chosenWord).getWelsh());
+ }
+
+
+ }
+}
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/SecondaryController.java b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/SecondaryController.java
new file mode 100644
index 0000000..94eb1ac
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/SecondaryController.java
@@ -0,0 +1,14 @@
+package uk.ac.aber.cs22120.group20;
+
+import java.io.IOException;
+import javafx.fxml.FXML;
+/**
+ * Placeholder Controller
+ */
+public class SecondaryController {
+
+ @FXML
+ private void switchToPrimary() throws IOException {
+ App.setRoot("primary");
+ }
+}
\ No newline at end of file
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/WelshDictionary.java b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/WelshDictionary.java
new file mode 100644
index 0000000..dc903ad
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/WelshDictionary.java
@@ -0,0 +1,50 @@
+package uk.ac.aber.cs22120.group20;
+
+public class WelshDictionary {
+ private String english;
+ private String welsh;
+ private String wordType;
+
+
+ public WelshDictionary() {
+ }
+
+ public WelshDictionary(String english, String welsh, String wordType) {
+ this.english = english;
+ this.welsh = welsh;
+ this.wordType = wordType;
+ }
+
+ public String getEnglish() {
+ return english;
+ }
+
+ public void setEnglish(String english) {
+ this.english = english;
+ }
+
+ public String getWelsh() {
+ return welsh;
+ }
+
+ public void setWelsh(String welsh) {
+ this.welsh = welsh;
+ }
+
+ public String getWordType() {
+ return wordType;
+ }
+
+ public void setWordType(String wordType) {
+ this.wordType = wordType;
+ }
+
+ @Override
+ public String toString() {
+ return "WelshDictionary{" +
+ "english='" + english + '\'' +
+ ", welsh='" + welsh + '\'' +
+ ", wordType='" + wordType + '\'' +
+ '}';
+ }
+}
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml
new file mode 100644
index 0000000..865008d
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml
new file mode 100644
index 0000000..3e1a950
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translationTest.fxml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translationTest.fxml
new file mode 100644
index 0000000..3604571
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translationTest.fxml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/module-info.class b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/module-info.class
new file mode 100644
index 0000000..29bf4c2
Binary files /dev/null and b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/module-info.class differ
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/App.class b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/App.class
new file mode 100644
index 0000000..8557d61
Binary files /dev/null and b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/App.class differ
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/PrimaryController.class b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/PrimaryController.class
new file mode 100644
index 0000000..25c9081
Binary files /dev/null and b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/PrimaryController.class differ
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/SecondaryController.class b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/SecondaryController.class
new file mode 100644
index 0000000..3d7007b
Binary files /dev/null and b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/SecondaryController.class differ
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/WelshDictionary.class b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/WelshDictionary.class
new file mode 100644
index 0000000..a44665e
Binary files /dev/null and b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/WelshDictionary.class differ
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml
new file mode 100644
index 0000000..865008d
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml
new file mode 100644
index 0000000..3e1a950
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/translationTest.fxml b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/translationTest.fxml
new file mode 100644
index 0000000..3604571
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/translationTest.fxml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev/20200331/brc9/translationFX/translationTestWork.iml b/dev/20200331/brc9/translationFX/translationTestWork.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/dev/20200331/brc9/translationFX/translationTestWork.iml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/top19/flashcardfx/hellofx/.idea/misc.xml b/dev/20200331/top19/flashcardfx/hellofx/.idea/misc.xml
index c0c7641..083d959 100644
--- a/dev/20200331/top19/flashcardfx/hellofx/.idea/misc.xml
+++ b/dev/20200331/top19/flashcardfx/hellofx/.idea/misc.xml
@@ -7,7 +7,7 @@
-
+
\ No newline at end of file
diff --git a/dev/20200331/top19/flashcardfx/hellofx/.idea/vcs.xml b/dev/20200331/top19/flashcardfx/hellofx/.idea/vcs.xml
new file mode 100644
index 0000000..bc59970
--- /dev/null
+++ b/dev/20200331/top19/flashcardfx/hellofx/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/20200331/top19/flashcardfx/hellofx/.idea/workspace.xml b/dev/20200331/top19/flashcardfx/hellofx/.idea/workspace.xml
index 5f28b7e..7f0eb79 100644
--- a/dev/20200331/top19/flashcardfx/hellofx/.idea/workspace.xml
+++ b/dev/20200331/top19/flashcardfx/hellofx/.idea/workspace.xml
@@ -2,36 +2,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -49,7 +24,7 @@
-
+
@@ -61,8 +36,8 @@
-
-
+
+
@@ -71,8 +46,8 @@
-
-
+
+
@@ -89,7 +64,7 @@
-
+
@@ -101,7 +76,7 @@
-
+
@@ -114,7 +89,7 @@
-
+
@@ -140,8 +115,16 @@
+
+
+ initial
+
+
+ C:\Users\user\Documents\CS22120\gp20\dev\20200331\top19\flashcardfx\hellofx\src
+
+
-
+
-
+
+
+
-
@@ -246,28 +230,20 @@