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:
Henry Dugmore 2020-05-01 15:26:40 +01:00
commit 16598c8a0b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,3 @@
package uk.ac.aber.cs221.group20.json;
/** /**
* @(#) JsonProcessing.java 0,1 2020/04/27 * @(#) JsonProcessing.java 0,1 2020/04/27
* <p> * <p>
@ -6,6 +5,8 @@ package uk.ac.aber.cs221.group20.json;
* All rights reserved. * All rights reserved.
*/ */
package uk.ac.aber.cs221.group20.json;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;

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

@ -1,3 +1,10 @@
/**
* @(#) AssessmentGenerator.java 0,1 2020/05/01
* <p>
* Copyright (c) 2020 Aberystwyth University.
* All rights reserved.
*/
package uk.ac.aber.cs221.group20.selfassessment; package uk.ac.aber.cs221.group20.selfassessment;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;