noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
osp1 2020-05-01 15:55:10 +01:00
commit 1f425811ae
20 changed files with 40 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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;

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

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

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

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

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

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

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

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

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

@ -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;
}

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

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

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

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

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

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

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

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

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

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