Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
This commit is contained in:
commit
42579b785e
1 changed files with 13 additions and 3 deletions
|
@ -30,15 +30,21 @@ import java.util.LinkedList;
|
||||||
*/
|
*/
|
||||||
public class Application extends javafx.application.Application {
|
public class Application extends javafx.application.Application {
|
||||||
|
|
||||||
|
// //////////////// //
|
||||||
|
// Class variables. //
|
||||||
|
// //////////////// //
|
||||||
|
|
||||||
// Dictionary containing all the words.
|
// Dictionary containing all the words.
|
||||||
public static LinkedList<DictionaryEntry> dictionary = new LinkedList<>();
|
public static LinkedList<DictionaryEntry> dictionary = new LinkedList<>();
|
||||||
|
|
||||||
// Practice list containing all the practice words.
|
// Practice list containing all the practice words.
|
||||||
public static LinkedList<DictionaryEntry> practiceList = new LinkedList<>();
|
public static LinkedList<DictionaryEntry> practiceList = new LinkedList<>();
|
||||||
|
// JSON processor to import and export the json dictionary file.
|
||||||
// Json processor to import and export the json dictionary file.
|
|
||||||
private JsonProcessing jsonProcessing = new JsonProcessing();
|
private JsonProcessing jsonProcessing = new JsonProcessing();
|
||||||
|
|
||||||
|
// ////////////// //
|
||||||
|
// Class methods. //
|
||||||
|
// ////////////// //
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param args
|
* @param args
|
||||||
*/
|
*/
|
||||||
|
@ -46,6 +52,10 @@ public class Application extends javafx.application.Application {
|
||||||
launch();
|
launch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// //////// //
|
||||||
|
// Methods. //
|
||||||
|
// //////// //
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param stage
|
* @param stage
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
|
|
Reference in a new issue