Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) AddWordController.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) Application.java 0,2 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) DictionaryController.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java

@@ -1,4 +1,4 @@
-/**
+/*
  * @(#) FlashcardController.java 0,1 2020/05/01
  *
  * Copyright (c) 2020 Aberystwyth University.

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) MatchTheMeaningController.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) PracticeListController.java 0.2 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) ScreenSwitch.java 0.1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java

@@ -1,4 +1,4 @@
-/**
+/*
  * @(#) SharedCodeController.java 0,1 2020/05/01
  *
  * Copyright (c) 2020 Aberystwyth University.

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java

@@ -1,4 +1,4 @@
-/**
+/*
  * @(#) SixMeaningsController.java 0,1 2020/05/01
  *
  * Copyright (c) 2020 Aberystwyth University.

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java

@@ -1,10 +1,8 @@
-/**
+/*
-
+ * @(#) TranslationController.java 1.1 2020/05/01
-@(#) TranslationController.java 1.1 2020/05/01
+ *
-
+ * Copyright (c) 2020 Aberystwyth University.
-
+ * All rights reserved.
-Copyright (c) 2020 Aberystwyth University.
-All rights reserved.
 */
 package uk.ac.aber.cs221.group20.javafx;
 

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) DictionaryEntry.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) JsonProcessing.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) AssessmentGenerator.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) MatchTheMeaningQuestion.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) Question.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */
@@ -118,7 +118,7 @@ public class Question {
    /**
     * Resets the score to 0 for the next test.
     */
-   private static void resetScore(){
+   public static void resetScore(){
       correctAnswers = 0;
       wrongAnswers =0;
    }

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) SixMeaningsQuestion.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) TranslationQuestion.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) DictionaryEntryTest.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  * @(#) JSONTest.java 0,1 2020/05/07
  *
  * Copyright (c) 2020 Aberystwyth University.

src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java

@@ -1,6 +1,6 @@
-/**
+/*
  * @(#) QuestionTest.java 0,1 2020/05/01
- * <p>
+ *
  * Copyright (c) 2020 Aberystwyth University.
  * All rights reserved.
  */