From e8b9b465b1e8aa423d979ce710ddf1baeb7bb43e Mon Sep 17 00:00:00 2001
From: law39 <law39@aber.ac.uk>
Date: Fri, 1 May 2020 15:48:42 +0100
Subject: [PATCH 1/2] Corrected copyright notices. Issue #55

---
 .../aber/cs221/group20/javafx/AddWordController.java |  4 ++--
 .../uk/ac/aber/cs221/group20/javafx/Application.java |  4 ++--
 .../cs221/group20/javafx/DictionaryController.java   |  4 ++--
 .../cs221/group20/javafx/FlashcardController.java    |  2 +-
 .../group20/javafx/MatchTheMeaningController.java    |  4 ++--
 .../cs221/group20/javafx/PracticeListController.java |  4 ++--
 .../ac/aber/cs221/group20/javafx/ScreenSwitch.java   |  4 ++--
 .../cs221/group20/javafx/SharedCodeController.java   |  2 +-
 .../cs221/group20/javafx/SixMeaningsController.java  |  2 +-
 .../cs221/group20/javafx/TranslationController.java  | 12 +++++-------
 .../ac/aber/cs221/group20/json/DictionaryEntry.java  |  4 ++--
 .../ac/aber/cs221/group20/json/JsonProcessing.java   |  4 ++--
 .../group20/selfassessment/AssessmentGenerator.java  |  4 ++--
 .../selfassessment/MatchTheMeaningQuestion.java      |  4 ++--
 .../aber/cs221/group20/selfassessment/Question.java  |  4 ++--
 .../group20/selfassessment/SixMeaningsQuestion.java  |  4 ++--
 .../group20/selfassessment/TranslationQuestion.java  |  4 ++--
 .../aber/cs221/group20/test/DictionaryEntryTest.java |  4 ++--
 .../java/uk/ac/aber/cs221/group20/test/JSONTest.java |  2 +-
 .../uk/ac/aber/cs221/group20/test/QuestionTest.java  |  4 ++--
 20 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java
index 3fb7d19..d9f8ab1 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java
index 971657c..00a471b 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/Application.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java
index 7baf20e..5a24d20 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/DictionaryController.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java
index 60d7a9e..6cadf29 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/FlashcardController.java	
+++ b/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.
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java
index d43f17a..e1cb211 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java
index 73b9bef..898d817 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/PracticeListController.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java
index 80c1740..95b4e02 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java
index aa199af..d9425ea 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SharedCodeController.java	
+++ b/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.
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java
index 52231a6..718b944 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java	
+++ b/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.
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java
index 91f4ceb..a2f3446 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java	
+++ b/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
-
-
-Copyright (c) 2020 Aberystwyth University.
-All rights reserved.
+/*
+ * @(#) TranslationController.java 1.1 2020/05/01
+ *
+ * Copyright (c) 2020 Aberystwyth University.
+ * All rights reserved.
 */
 package uk.ac.aber.cs221.group20.javafx;
 
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java
index bf6dfd8..8d000ce 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/DictionaryEntry.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java
index eaf647a..2617c24 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java
index f23a4a8..704787a 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java
index d624c61..555e640 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/MatchTheMeaningQuestion.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java
index 2062e87..0ce979c 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java
index ecc88e8..5465f11 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/SixMeaningsQuestion.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java
index 477d085..597984f 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/TranslationQuestion.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java
index f356f3e..f70bd14 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/DictionaryEntryTest.java	
+++ b/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.
  */
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java
index 44d157e..53cdb0d 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/JSONTest.java	
+++ b/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.
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java
index 1c8c639..a0ea582 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java	
+++ b/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.
  */

From 06b102982901348e72a22df1721385cb6d1ac5fd Mon Sep 17 00:00:00 2001
From: law39 <law39@aber.ac.uk>
Date: Fri, 1 May 2020 15:51:00 +0100
Subject: [PATCH 2/2] Made resetScore in Question Public

---
 .../java/uk/ac/aber/cs221/group20/selfassessment/Question.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java
index 0ce979c..75051b1 100644
--- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java	
+++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/Question.java	
@@ -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;
    }