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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
law39 2020-05-01 14:54:30 +01:00
commit ec32188200
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,6 +1,6 @@
/** /**
* @(#) FlashcardController.java 0,1 2020/05/07 * @(#) FlashcardController.java 0,1 2020/05/07
* <p> *
* Copyright (c) 2020 Aberystwyth University. * Copyright (c) 2020 Aberystwyth University.
* All rights reserved. * All rights reserved.
*/ */
@ -20,7 +20,7 @@ import uk.ac.aber.cs221.group20.json.DictionaryEntry;
* duplication. This will be extended by all the controller classes. * duplication. This will be extended by all the controller classes.
* *
* @author Tom Perry [top19] * @author Tom Perry [top19]
* @Version 0.2 Documentation. * @version 0.2 Documentation.
* @see Application * @see Application
* @see DictionaryEntry * @see DictionaryEntry
* @see ScreenSwitch * @see ScreenSwitch
@ -160,7 +160,7 @@ abstract public class SharedCodeController {
@FXML @FXML
private void practiceListIconClick() { private void practiceListIconClick() {
// Use 'ScreenSwitch' to switch to the 'practiceListScene'. // Use 'ScreenSwitch' to switch to the 'practiceListScene'.
ScreenSwitch.swap(ScreenSwitch.SceneType.practiceListScene); ScreenSwitch.swap(ScreenSwitch.SceneType.practiceListScene);
} }
/** /**

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

@ -1,3 +1,9 @@
/**
* @(#) JSONTest.java 0,1 2020/05/07
*
* Copyright (c) 2020 Aberystwyth University.
* All rights reserved.
*/
package uk.ac.aber.cs221.group20.test; package uk.ac.aber.cs221.group20.test;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;