From b37bc0b5e4e9f7c0e379ff31b3c54034ca121c8b Mon Sep 17 00:00:00 2001 From: osp1 Date: Mon, 27 Apr 2020 10:43:28 +0100 Subject: [PATCH] Added all classes for the program in src - With the exception of the 6Meanings test. --- .../.idea/jarRepositories.xml | 20 ++ .../.idea/uiDesigner.xml | 124 ++++++++ .../.idea/workspace.xml | 285 +++--------------- .../java/uk/ac/aber/cs22120/group20/App.java | 48 --- .../group20/javafx/AddWordController.java | 106 +++++++ .../cs22120/group20/javafx/Application.java | 106 +++++++ .../group20/javafx/DictionaryController.java | 217 +++++++++++++ .../javafx/PracticeListController.java | 223 ++++++++++++++ .../{ => javafx}/PrimaryController.java | 2 +- .../cs22120/group20/javafx/ScreenSwitch.java | 20 ++ .../{ => javafx}/SecondaryController.java | 2 +- .../group20/javafx/SharedCodeController.java | 12 + .../cs22120/group20/json/DictionaryEntry.java | 90 ++++++ .../cs22120/group20/json/JsonProcessing.java | 45 +++ .../selfassessment/AssessmentGenerator.java | 57 ++++ .../MatchTheMeaningQuestion.java | 198 ++++++++++++ .../group20/selfassessment/Question.java | 24 ++ .../selfassessment/TranslationController.java | 144 +++++++++ .../aber/cs22120/group20/test/JSONTest.java | 28 ++ .../aber/cs22120/group20/test/JavaFXTest.java | 54 ++++ .../group20/test/SelfAssesmentTest.java | 36 +++ .../icons/black_icons/100px/add-100.png | Bin 0 -> 1495 bytes .../icons/black_icons/100px/checkmark-100.png | Bin 0 -> 520 bytes .../icons/black_icons/100px/flashcard-100.png | Bin 0 -> 2148 bytes .../icons/black_icons/100px/info-100.png | Bin 0 -> 1438 bytes .../icons/black_icons/100px/left-100.png | Bin 0 -> 558 bytes .../icons/black_icons/100px/menu-100.png | Bin 0 -> 403 bytes .../icons/black_icons/100px/pass-fail-100.png | Bin 0 -> 1498 bytes .../icons/black_icons/100px/rating-100.png | Bin 0 -> 1308 bytes .../icons/black_icons/100px/read-100.png | Bin 0 -> 786 bytes .../icons/black_icons/100px/right-100.png | Bin 0 -> 549 bytes .../icons/black_icons/100px/search-100.png | Bin 0 -> 1601 bytes .../black_icons/100px/sort-alpha-up-100.png | Bin 0 -> 2449 bytes .../100px/sort-alpha-up-reversed-100.png | Bin 0 -> 2421 bytes .../icons/black_icons/100px/sort-lang-100.png | Bin 0 -> 2267 bytes .../icons/black_icons/100px/upload-100.png | Bin 0 -> 854 bytes .../assets/icons/black_icons/50px/add-50.png | Bin 0 -> 720 bytes .../icons/black_icons/50px/checkmark-50.png | Bin 0 -> 291 bytes .../icons/black_icons/50px/flashcard-50.png | Bin 0 -> 1467 bytes .../assets/icons/black_icons/50px/info-50.png | Bin 0 -> 747 bytes .../assets/icons/black_icons/50px/left-50.png | Bin 0 -> 305 bytes .../assets/icons/black_icons/50px/menu-50.png | Bin 0 -> 264 bytes .../icons/black_icons/50px/pass-fail-50.png | Bin 0 -> 823 bytes .../icons/black_icons/50px/rating-50.png | Bin 0 -> 676 bytes .../assets/icons/black_icons/50px/read-50.png | Bin 0 -> 431 bytes .../icons/black_icons/50px/right-50.png | Bin 0 -> 302 bytes .../icons/black_icons/50px/search-50.png | Bin 0 -> 806 bytes .../black_icons/50px/sort-alpha-up-50.png | Bin 0 -> 1454 bytes .../50px/sort-alpha-up-reversed-50.png | Bin 0 -> 1478 bytes .../icons/black_icons/50px/sort-lang-50.png | Bin 0 -> 1257 bytes .../icons/black_icons/50px/upload-50.png | Bin 0 -> 448 bytes .../icons/white_icons/100px/add-100.png | Bin 0 -> 1607 bytes .../icons/white_icons/100px/checkmark-100.png | Bin 0 -> 783 bytes .../icons/white_icons/100px/flashcard-100.png | Bin 0 -> 2326 bytes .../icons/white_icons/100px/info-100.png | Bin 0 -> 1519 bytes .../icons/white_icons/100px/left-100.png | Bin 0 -> 807 bytes .../icons/white_icons/100px/menu-100.png | Bin 0 -> 564 bytes .../icons/white_icons/100px/pass-fail-100.png | Bin 0 -> 1459 bytes .../icons/white_icons/100px/rating-100.png | Bin 0 -> 1288 bytes .../icons/white_icons/100px/read-100.png | Bin 0 -> 851 bytes .../icons/white_icons/100px/right-100.png | Bin 0 -> 796 bytes .../icons/white_icons/100px/search-100.png | Bin 0 -> 1604 bytes .../white_icons/100px/sort-alpha-up-100.png | Bin 0 -> 2588 bytes .../100px/sort-alpha-up-reversed-100.png | Bin 0 -> 2541 bytes .../icons/white_icons/100px/sort-lang-100.png | Bin 0 -> 2487 bytes .../icons/white_icons/100px/upload-100.png | Bin 0 -> 929 bytes .../assets/icons/white_icons/50px/add-50.png | Bin 0 -> 878 bytes .../icons/white_icons/50px/checkmark-50.png | Bin 0 -> 501 bytes .../icons/white_icons/50px/flashcard-50.png | Bin 0 -> 1662 bytes .../assets/icons/white_icons/50px/info-50.png | Bin 0 -> 844 bytes .../assets/icons/white_icons/50px/left-50.png | Bin 0 -> 501 bytes .../assets/icons/white_icons/50px/menu-50.png | Bin 0 -> 429 bytes .../icons/white_icons/50px/pass-fail-50.png | Bin 0 -> 894 bytes .../icons/white_icons/50px/rating-50.png | Bin 0 -> 758 bytes .../assets/icons/white_icons/50px/read-50.png | Bin 0 -> 555 bytes .../icons/white_icons/50px/right-50.png | Bin 0 -> 482 bytes .../icons/white_icons/50px/search-50.png | Bin 0 -> 920 bytes .../white_icons/50px/sort-alpha-up-50.png | Bin 0 -> 1707 bytes .../50px/sort-alpha-up-reversed-50.png | Bin 0 -> 1689 bytes .../icons/white_icons/50px/sort-lang-50.png | Bin 0 -> 1555 bytes .../icons/white_icons/50px/upload-50.png | Bin 0 -> 567 bytes .../uk/ac/aber/cs22120/group20/addword.fxml | 65 ++++ .../ac/aber/cs22120/group20/dictionary.fxml | 80 +++++ .../aber/cs22120/group20/matchthemeaning.fxml | 71 +++++ .../ac/aber/cs22120/group20/practicelist.fxml | 80 +++++ .../uk/ac/aber/cs22120/group20/primary.fxml | 2 +- .../uk/ac/aber/cs22120/group20/secondary.fxml | 2 +- .../ac/aber/cs22120/group20/translation.fxml | 44 +++ .../uk/ac/aber/cs22120/group20/addWord.fxml | 65 ++++ .../ac/aber/cs22120/group20/dictionary.fxml | 80 +++++ .../ac/aber/cs22120/group20/practicelist.fxml | 80 +++++ 91 files changed, 2114 insertions(+), 296 deletions(-) create mode 100644 src/Welsh Vocabulary Tutor/.idea/jarRepositories.xml create mode 100644 src/Welsh Vocabulary Tutor/.idea/uiDesigner.xml delete mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/AddWordController.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/Application.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/DictionaryController.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/PracticeListController.java rename src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/{ => javafx}/PrimaryController.java (84%) create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/ScreenSwitch.java rename src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/{ => javafx}/SecondaryController.java (84%) create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/SharedCodeController.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/DictionaryEntry.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/json/JsonProcessing.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/AssessmentGenerator.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningQuestion.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/Question.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JSONTest.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/JavaFXTest.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/test/SelfAssesmentTest.java create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/add-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/checkmark-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/flashcard-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/info-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/left-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/menu-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/pass-fail-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/rating-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/read-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/right-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/search-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/sort-alpha-up-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/sort-alpha-up-reversed-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/sort-lang-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/100px/upload-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/add-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/checkmark-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/flashcard-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/info-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/left-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/menu-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/pass-fail-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/rating-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/read-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/right-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/search-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/sort-alpha-up-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/sort-alpha-up-reversed-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/sort-lang-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/black_icons/50px/upload-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/add-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/checkmark-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/flashcard-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/info-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/left-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/menu-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/pass-fail-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/rating-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/read-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/right-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/search-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/sort-alpha-up-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/sort-alpha-up-reversed-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/sort-lang-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/100px/upload-100.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/add-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/checkmark-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/flashcard-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/info-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/left-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/menu-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/pass-fail-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/rating-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/read-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/right-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/search-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/sort-alpha-up-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/sort-alpha-up-reversed-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/sort-lang-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/assets/icons/white_icons/50px/upload-50.png create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/addword.fxml create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/dictionary.fxml create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/matchthemeaning.fxml create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/practicelist.fxml create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/translation.fxml create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/addWord.fxml create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/dictionary.fxml create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/practicelist.fxml diff --git a/src/Welsh Vocabulary Tutor/.idea/jarRepositories.xml b/src/Welsh Vocabulary Tutor/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/src/Welsh Vocabulary Tutor/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/Welsh Vocabulary Tutor/.idea/uiDesigner.xml b/src/Welsh Vocabulary Tutor/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/src/Welsh Vocabulary Tutor/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Welsh Vocabulary Tutor/.idea/workspace.xml b/src/Welsh Vocabulary Tutor/.idea/workspace.xml index a313612..b0efba1 100644 --- a/src/Welsh Vocabulary Tutor/.idea/workspace.xml +++ b/src/Welsh Vocabulary Tutor/.idea/workspace.xml @@ -1,217 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -