Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
This commit is contained in:
commit
16598c8a0b
2 changed files with 9 additions and 1 deletions
|
@ -1,4 +1,3 @@
|
|||
package uk.ac.aber.cs221.group20.json;
|
||||
/**
|
||||
* @(#) JsonProcessing.java 0,1 2020/04/27
|
||||
* <p>
|
||||
|
@ -6,6 +5,8 @@ package uk.ac.aber.cs221.group20.json;
|
|||
* All rights reserved.
|
||||
*/
|
||||
|
||||
package uk.ac.aber.cs221.group20.json;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
import javafx.scene.control.Alert;
|
||||
|
|
Reference in a new issue