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:
top19 2020-05-01 13:02:25 +01:00
commit 1f734ca50c
2 changed files with 12 additions and 2 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

@ -103,6 +103,7 @@ public class AddWordController extends SharedCodeController {
trueWordType = DictionaryEntry.wordTypeEnum.other;
}
boolean entryFound = false;
// test for one or more blank fields and if there is create the correct error dialogue box
if (english.getText().isBlank() || welsh.getText().isBlank() || wordType.getValue().equals("Type")) {
Alert error = new Alert(Alert.AlertType.ERROR);
@ -113,6 +114,7 @@ public class AddWordController extends SharedCodeController {
error.showAndWait();
} else {
for (DictionaryEntry entry : Application.dictionary) {
//test if the entry exists in the dictionary and if it does create the correct error dialogue box
entryFound = false;
DictionaryEntry newEntry = new DictionaryEntry(english.getText(), welsh.getText(), trueWordType);
@ -130,6 +132,7 @@ public class AddWordController extends SharedCodeController {
}
}
if (!entryFound) {
//if everything is fine, save the entered values as a dictionary entry in the dictionary
Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Success");
@ -165,6 +168,7 @@ public class AddWordController extends SharedCodeController {
*
* @param actionEvent action event for the button click
*/
// add character methods for characters ch, dd, ff, ng, ll, ph, rh, th
public void addCharch(ActionEvent actionEvent) {
welsh.appendText("ch");

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

@ -62,7 +62,10 @@ public class DictionaryController extends SharedCodeController {
public ObservableList<DictionaryEntry> list = FXCollections.observableArrayList();
/**
*
* Method to switch the language used to sort the dictionary list.
* <p>
* If currently sorted by English, this will change the sort to by Welsh.
* If currently sorted by Welsh, this will change the sort to by English.
*/
@FXML
private void switchLangSort() {
@ -97,7 +100,10 @@ public class DictionaryController extends SharedCodeController {
}
/**
*
* Method to switch the alphabetical order used to sort the dictionary list.
* <p>
* If currently sorted by A-Z, this will change the sort to by Z-A.
* If currently sorted by Z-A, this will change the sort to by A-Z.
*/
@FXML
private void switchAlphaSort() {