Compare commits

..
Author SHA1 Message Date
Andrin Fassbind ac68af3638 extend dictionary 2022-05-13 20:53:33 +02:00
Andrin Fassbind d530d89db4 edit layout 2022-05-13 19:20:07 +02:00
Andrin Fassbind ddae1e297f solve bug PlacesFormularController id name not valid 2022-05-13 19:18:51 +02:00
Andrin Fassbind 1b22506047 solve bug game teilnehmername 2022-05-13 19:00:08 +02:00
Andrin Fassbind dc54eaa872 Merge remote-tracking branch 'origin/main' into language_Dev 2022-05-13 18:57:39 +02:00
Andrin Fassbind c4f0a5335d Create Language Change 2022-05-13 18:57:27 +02:00
Leonardo BrandenbergerandGitHub Enterprise 3c3c6c8510 Merge pull request #51 from PM2-IT21bWIN-ruiz-mach-krea/develop_footer
Develop footer
2022-05-13 17:52:44 +02:00
schrom01 a1b73e22ca removed "äöü" from error messages. 2022-05-13 17:51:04 +02:00
Roman SchenkandGitHub Enterprise 2327573581 Merge pull request #50 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs
Logging and docs added to classes  Person, Place and Player  #27 #28
2022-05-13 17:49:39 +02:00
Leonardo Brandenberger 7fd058a528 CodeCleanup in Player, Tournament, Place, Person, Participant and Team 2022-05-13 17:48:42 +02:00
Leonardo Brandenberger f38b8aff16 CodeCleanup in Player, Tournament and Participant 2022-05-13 17:16:33 +02:00
schrom01 11d6ca1852 changed error Message numberOfParticipants. 2022-05-13 17:10:32 +02:00
Leonardo Brandenberger 67003ad772 CodeCleanup in Player, Tournament and Participant 2022-05-13 17:03:23 +02:00
schrom01 a78d1d9de7 changed error Message numberOfParticipants. 2022-05-13 16:51:17 +02:00
schrom01 5f6193d8b2 Merge branch 'main' into develop_footer
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
2022-05-13 16:50:35 +02:00
Leonardo Brandenberger e0a9d963f6 CodeCleanup in Participant, Person and Team 2022-05-13 16:43:33 +02:00
Roman SchenkandGitHub Enterprise f8d12dafa7 Merge branch 'main' into logging_and_docs 2022-05-13 16:39:36 +02:00
Leonardo Brandenberger 726410f677 Added Java Doc and Logger to Person 2022-05-13 16:12:55 +02:00
Roman SchenkandGitHub Enterprise 3d522dd13c Merge pull request #49 from PM2-IT21bWIN-ruiz-mach-krea/gameSchedule_Alert
Create alert popup if user wants to create new game schedule
2022-05-13 16:12:29 +02:00
Andrin Fassbind 7dea7919c5 AlertDelete shortened code 2022-05-13 16:12:06 +02:00
fassbandandGitHub Enterprise f575bb94d3 Merge pull request #48 from PM2-IT21bWIN-ruiz-mach-krea/fixes_in_layout
Fixes in layout
2022-05-13 16:06:23 +02:00
Andrin Fassbind 55517a531e Create alert popup if user wants to create new game schedule 2022-05-13 16:04:19 +02:00
schrom01 53cf3bdacc rmeoved tournament Type GROUPS from Tournament Enum Type. 2022-05-13 15:58:58 +02:00
schrom01 c862492be3 fixes in Layout
solved #34
2022-05-13 15:57:39 +02:00
fassbandandGitHub Enterprise a6f14b94bd Merge pull request #47 from PM2-IT21bWIN-ruiz-mach-krea/fix_places_are_deleted_
fixed places are deleted.
2022-05-13 15:38:42 +02:00
Roman SchenkandGitHub Enterprise d3472017bb Merge pull request #46 from PM2-IT21bWIN-ruiz-mach-krea/closeImplementation
Make Application close properly
2022-05-13 15:37:31 +02:00
schrom01 0a7ca1ac3e fixed places are deleted.
solved #45
2022-05-13 15:36:29 +02:00
Andrin Fassbind bdb34fde31 Make Application close properly
If exception while closing there is a proper log
2022-05-13 15:35:41 +02:00
Roman SchenkandGitHub Enterprise 20903f6a69 Merge pull request #44 from PM2-IT21bWIN-ruiz-mach-krea/refactoring_of_factory
refactoring of Factory.java
2022-05-13 15:17:15 +02:00
schrom01 54a428cde2 throw PlaceExistsExceptoin if place exists already. 2022-05-13 13:48:38 +02:00
Leonardo Brandenberger 7267fe590b Added Java Doc and Logger to Place.java 2022-05-13 01:48:26 +02:00
Leonardo Brandenberger befa159f90 Added Java Doc and Logger to Player 2022-05-13 01:36:54 +02:00
Leonardo Brandenberger 06003d5b54 Merge remote-tracking branch 'origin/logging_and_docs' into logging_and_docs 2022-05-13 00:07:17 +02:00
Leonardo Brandenberger 072db996dc Added Java Doc and Logger to Team 2022-05-13 00:02:31 +02:00
25 changed files with 823 additions and 182 deletions
@@ -8,8 +8,9 @@ public abstract class FXController {
FileIO fileIO;
Pane pane;
IsObserver listener;
LanguageConfigurator languageConfigurator;
public FXController(){
public FXController() {
listener = new IsObserver() {
@Override
public void update() {
@@ -18,21 +19,30 @@ public abstract class FXController {
};
}
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane){
public void setup(LanguageConfigurator languageConfigurator) {
this.languageConfigurator = languageConfigurator;
shareGUIElementWithLanguageConfigurator();
}
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, LanguageConfigurator languageConfigurator) {
this.tournamentDecorator = tournamentDecorator;
this.fileIO = fileIO;
this.factoryDecorator = factoryDecorator;
this.pane = pane;
this.languageConfigurator = languageConfigurator;
shareGUIElementWithLanguageConfigurator();
addListener();
}
public abstract void shareGUIElementWithLanguageConfigurator();
public abstract void loadContent();
protected void setTournamentDecorator(TournamentDecorator tournamentDecorator) {
this.tournamentDecorator = tournamentDecorator;
}
public void addListener(){
public void addListener() {
tournamentDecorator.addListener(listener);
factoryDecorator.addListener(listener);
}
@@ -64,4 +74,8 @@ public abstract class FXController {
protected Pane getPane() {
return pane;
}
protected LanguageConfigurator getLanguageConfigurator() {
return languageConfigurator;
}
}
@@ -14,11 +14,12 @@ import java.io.IOException;
public class Factory {
private TournamentDecorator tournamentDecorator;
private FileIO fileIO;
private static LanguageConfigurator languageConfigurator;
public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator) {
public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator, LanguageConfigurator languageConfigurator) {
this.fileIO = fileIO;
this.tournamentDecorator = tournamentDecorator;
this.languageConfigurator = languageConfigurator;
}
public TournamentDecorator getTournamentDecorator() {
@@ -30,9 +31,12 @@ public class Factory {
}
public BorderPane loadMainWindow() {
FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("MainWindow.fxml"));
try {
return loader.load();
BorderPane pane = loader.load();
FXController controller = loader.getController();
controller.setup(languageConfigurator);
return pane;
} catch (IOException e) {
e.printStackTrace();
//TODO handle and logging
@@ -82,7 +86,7 @@ public class Factory {
FXMLLoader loader = new FXMLLoader(getClass().getResource("gameScheduleView/Game.fxml"));
box.getChildren().add(loader.load());
GameController controller = loader.getController();
controller.setup(tournamentDecorator, fileIO, factoryDecorator, box, gameDecorator);
controller.setup(tournamentDecorator, fileIO, factoryDecorator, box, gameDecorator, languageConfigurator);
return controller;
} catch (IOException e) {
e.printStackTrace();
@@ -130,6 +134,10 @@ public class Factory {
vBox.setBorder(null);
}
public LanguageConfigurator getLanguageConfigurator() {
return languageConfigurator;
}
public enum View {
tournamentList("tournamentList/tournamentList.fxml"),
participantFormular("participantAddFormular/participantFormular.fxml"),
@@ -151,7 +159,7 @@ public class Factory {
FXMLLoader loader = new FXMLLoader(getClass().getResource(fxmlFileName));
this.pane = loader.load();
FXController controller = loader.getController();
controller.setup(tournamentDecorator, fileIO, factoryDecorator, borderPane);
controller.setup(tournamentDecorator, fileIO, factoryDecorator, borderPane, languageConfigurator);
}
}
@@ -54,7 +54,8 @@ public class FactoryDecorator implements IsObservable{
clearMessage(false);
} catch (IOException | ClassNotFoundException e) {
e.printStackTrace();
printMessageToFooter("Fehler beim lesen der Datei.", true);
String msg = factory.getLanguageConfigurator().getSelectedLanguage("IOException");
printMessageToFooter(msg, true);
} //TODO handle and logging
}
@@ -169,6 +170,10 @@ public class FactoryDecorator implements IsObservable{
factory.resetFooter((BorderPane) pane, error);
}
public LanguageConfigurator getLanguageConfigurator() {
return factory.getLanguageConfigurator();
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();
@@ -19,14 +19,6 @@ public class Game implements Serializable {
this.previousGame2 = previousGame2;
}
public Place getLocation() {
return place;
}
public void setLocation(Place place) {
this.place = place;
}
public int getPoints1() {
return points1;
}
@@ -0,0 +1,196 @@
package ch.zhaw.projekt2.turnierverwaltung;
import javafx.scene.control.Labeled;
import javafx.scene.control.MenuItem;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class LanguageConfigurator {
private Language selectedLanguage;
private Map<String,String> germanDictionary;
private Map<String,String> englishDictionary;
private List<Labeled> labelList;
private List<MenuItem> menuItemList;
public LanguageConfigurator() {
selectedLanguage = Language.GERMAN;
labelList = new ArrayList<>();
menuItemList = new ArrayList<>();
germanDictionary = new HashMap<>();
englishDictionary = new HashMap<>();
setUpDictionaries();
}
private void setUpDictionaries() {
//Main
germanDictionary.put("menuItemLanguage","Sprache");
englishDictionary.put("menuItemLanguage","Language");
germanDictionary.put("closeBtn","Beenden");
englishDictionary.put("closeBtn","Close");
germanDictionary.put("mainTitle","Turnier Manager");
englishDictionary.put("mainTitle","Tournament Manager");
//Tournamentlist
germanDictionary.put("tournamentListTitle","Bestehende Turniere");
englishDictionary.put("tournamentListTitle","Existing tournaments");
germanDictionary.put("openBtn","Oeffnen");
englishDictionary.put("openBtn","Open");
germanDictionary.put("deleteBtn","Loeschen");
englishDictionary.put("deleteBtn","Delete");
germanDictionary.put("newTournamentFormularTitle","Neues Turnier erstellen");
englishDictionary.put("newTournamentFormularTitle","Create new tournament");
germanDictionary.put("tournamentNameLabel","Turnier Name:");
englishDictionary.put("tournamentNameLabel","Tournament Name:");
germanDictionary.put("tournamentModLabel","Turnier Modus:");
englishDictionary.put("tournamentModLabel","Tournament Mode:");
germanDictionary.put("createBtn","Erstellen");
englishDictionary.put("createBtn","Create");
//PlaceList
germanDictionary.put("placeListTitle","Hinzugefuegt");
englishDictionary.put("placeListTitle","Added");
germanDictionary.put("saveBtn","Speichern");
englishDictionary.put("saveBtn","Save");
germanDictionary.put("newPlaceTitle","Ort aendern/erstellen");
englishDictionary.put("newPlaceTitle","Create/Change Location");
germanDictionary.put("placeNameLabel","Ort:");
englishDictionary.put("placeNameLabel","Location:");
//GameSchedule
germanDictionary.put("treeView","Baumansicht");
englishDictionary.put("treeView","Treeview");
germanDictionary.put("createScheduleBtn","Spielplan erstellen");
englishDictionary.put("createScheduleBtn","Create game schedule");
germanDictionary.put("editParticipantBtn","Teilnehmer bearbeiten");
englishDictionary.put("editParticipantBtn","Edit Participants");
germanDictionary.put("editLocBtn","Orte bearbeiten");
englishDictionary.put("editLocBtn","Edit Locations");
germanDictionary.put("closeTournamentBtn","Turnier schliessen");
englishDictionary.put("closeTournamentBtn","Close tournament");
//ParticipantFormular
germanDictionary.put("participantListTitle","Hinzugefuegt");
englishDictionary.put("participantListTitle","Added");
germanDictionary.put("newParticipantFormularTitle","Teilnehmer aendern/erstellen");
englishDictionary.put("newParticipantFormularTitle","Change/Create Participant");
germanDictionary.put("participantNameLabel","Name:");
englishDictionary.put("participantNameLabel","Name:");
germanDictionary.put("firstNameLabel","Vorname:");
englishDictionary.put("firstNameLabel","First Name:");
germanDictionary.put("phoneNumberLabel","Telefon:");
englishDictionary.put("phoneNumberLabel","Phone:");
germanDictionary.put("birthDateLabel","Geb. Datum:");
englishDictionary.put("birthDateLabel","Birthdate:");
//Game
germanDictionary.put("locationLabel","Ort:");
englishDictionary.put("locationLabel","Location:");
//Error
germanDictionary.put("IOException","Fehler beim lesen der Datei");
englishDictionary.put("IOException","Could not read file");
germanDictionary.put("tournamentExists","Turniername vergeben");
englishDictionary.put("tournamentExists","Tournament exists already");
germanDictionary.put("invalidName","Name nicht gueltig");
englishDictionary.put("invalidName","Name not valid");
germanDictionary.put("invalidMode","Modus nicht gueltig");
englishDictionary.put("invalidMode","Mode not valid");
germanDictionary.put("numberParticipant","Anzahl Spieler muss mindestens 4 sein und eine Potenz von 2");
englishDictionary.put("numberParticipant","Number of players must be greater than 3 and power of 2");
germanDictionary.put("invalidPhone","Telefonnummer nicht gueltig");
englishDictionary.put("invalidPhone","Phonenumber not valid");
germanDictionary.put("invalidDate","Geburtsdatum nicht gueltig");
englishDictionary.put("invalidDate","Birthdate not valid");
germanDictionary.put("participantNotExist","Teilnehmer existiert nicht");
englishDictionary.put("participantNotExist","Participant does not exist");
germanDictionary.put("placeNotExist","Teilnehmer existiert nicht");
englishDictionary.put("placeNotExist","Participant does not exist");
//SaveMsg
germanDictionary.put("save","Zuletzt gespeichert: ");
englishDictionary.put("save","Last saved: ");
//Alert
germanDictionary.put("yes","Ja");
englishDictionary.put("yes","Yes");
germanDictionary.put("no","Nein");
englishDictionary.put("no","No");
germanDictionary.put("titleDelete","Entfernen");
englishDictionary.put("titleDelete","Remove");
germanDictionary.put("headerDelete","Turnier entfernen?");
englishDictionary.put("headerDelete","Delete Tournament?");
germanDictionary.put("contentDelete","Sind Sie sicher, dass sie das Turnier entfernen wollen?\nNach diesem Vorgang kann es nicht wiederhergestellt werden.");
englishDictionary.put("contentDelete","Are you shure you want to delete the tournament?\nAfter that there is no way to restore.");
germanDictionary.put("titleSchedule","Neu erstellen");
englishDictionary.put("titleSchedule","Create new");
germanDictionary.put("headerSchedule","Spielplan neu erstellen?");
englishDictionary.put("headerSchedule","Create new Schedule?");
germanDictionary.put("contentSchedule","Sind Sie sicher, dass Sie den Spielplan neu erstellen moechten?\nAlle Spielfortschritte gehen daraufhin verloren!");
englishDictionary.put("contentSchedule","Are you shure you want to create a new game schedule?\nAll results will be lost!");
}
public void translateGUI() {
String word = "";
for (Labeled label : labelList) {
switch (selectedLanguage) {
case GERMAN -> {
word = germanDictionary.get(label.getId());
}
case ENGLISH -> {
word = englishDictionary.get(label.getId());
}
}
if(word != null) {
label.setText(word);
} else {
//TODO LOG
}
}
for (MenuItem item : menuItemList) {
switch (selectedLanguage) {
case GERMAN -> {
word = germanDictionary.get(item.getId());
}
case ENGLISH -> {
word = englishDictionary.get(item.getId());
}
}
if(word != null) {
item.setText(word);
} else {
//TODO LOG
}
}
}
public void recieveLabel(Labeled label) {
if (label != null) {
labelList.add(label);
}
}
public void recieveMenuItem(MenuItem item) {
menuItemList.add(item);
}
public void changeLanguage(Language language) {
this.selectedLanguage = language;
translateGUI();
}
public String getSelectedLanguage(String getMsg) {
String word = "";
switch (selectedLanguage) {
case GERMAN -> word = germanDictionary.getOrDefault(getMsg,"check Logs");
case ENGLISH -> word = englishDictionary.getOrDefault(getMsg,"check Logs");
}
if (word.equals("check Logs")) {
//TODO Log
}
return word;
}
public enum Language {
ENGLISH,GERMAN
}
}
@@ -2,9 +2,38 @@ package ch.zhaw.projekt2.turnierverwaltung;
import java.io.Serializable;
/**
* Interface that defines the common functionality of a Participant, used by Players and Teams
*/
public interface Participant extends Serializable {
/**
* Method that will be used to get
*
* @return the name
*/
String getName();
void setName(String name);
/**
* Method to set a participants name
*
* @param name to be set
* @throws InvalidNameException if the name does not follow the correct format
*/
void setName(String name) throws InvalidNameException;
/**
* Method to compare two participants with each other
*
* @param participant to be compared to the current instance
* @return true if equal, false if not
*/
boolean equals(Participant participant);
void change(Participant participant);
/**
* Method to change out participants
*
* @param participant to be exchanged
* @throws Person.InvalidPhoneNumberException if phone number does not follow the correct formatting
*/
void change(Participant participant) throws Person.InvalidPhoneNumberException;
}
@@ -1,56 +1,113 @@
package ch.zhaw.projekt2.turnierverwaltung;
import java.io.Serializable;
import java.util.logging.Logger;
/**
* Class that represents a person and holds its attributes
*/
public class Person implements Serializable {
private final String NAME_MATCHING_REGEX = "[a-zA-Z]{1,20}";
private final String PHONE_MATCHING_REGEX = "[\\+]?[0-9]*";
private final String PHONE_MATCHING_REGEX = "[+]?[0-9]*";
private String name;
private String firstName;
private String phoneNumber;
private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
/**
* Constructor to initialize a person, also in charge of checking if name and phone number follow a valid format
*
* @param firstName of the new person
* @param name of the new person
* @param phoneNumber of the new person
* @throws InvalidNameException thrown when the name or firstname does not follow the valid format
* @throws InvalidPhoneNumberException thrown when the number does not follow a valid format
*/
public Person(String firstName, String name, String phoneNumber) throws InvalidNameException, InvalidPhoneNumberException {
if(!firstName.matches(NAME_MATCHING_REGEX)){
throw new InvalidNameException("The First name is Invalid.");
} else if(!name.matches(NAME_MATCHING_REGEX)){
throw new InvalidNameException("The Last name is Invalid");
} else if(!phoneNumber.matches(PHONE_MATCHING_REGEX)){
throw new InvalidPhoneNumberException("The entered Phone Number is invalid.");
}
logger.finer("Trying to initialize a new person with name: " + name + ", first name: "
+ firstName + ", Phone number: " + phoneNumber);
setFirstName(firstName);
setName(name);
setPhoneNumber(phoneNumber);
logger.fine("Successfully created a new Person with Name: " + name + ", Firstname: "
+ firstName + ", Phone number: " + phoneNumber);
}
/**
* Method to return the name of a Person
*
* @return the name as String
*/
public String getName() {
logger.fine("Returning name of:" + name);
return name;
}
public void setName(String name) {
/**
* Method to set the name of a Person
*
* @param name of the person to be set
*/
public void setName(String name) throws InvalidNameException {
if (!name.matches(NAME_MATCHING_REGEX)) {
logger.warning("Name: " + name + ", is not in a valid format");
throw new InvalidNameException("The Last name is Invalid");
}
logger.fine("Setting new name of " + this + " with: " + name);
this.name = name;
}
public String getFirstName() {
logger.fine("Returning firstname of " + this + "that is: " + firstName);
return firstName;
}
public void setFirstName(String firstName) {
/**
* Method to set the first name of a Person
*
* @param firstName the person to be set
*/
public void setFirstName(String firstName) throws InvalidNameException {
if (!firstName.matches(NAME_MATCHING_REGEX)) {
logger.warning("First name: " + firstName + ", is not in a valid format");
throw new InvalidNameException("The First name is Invalid.");
}
logger.fine("Setting new first name of " + this + " with: " + firstName);
this.firstName = firstName;
}
/**
* Method used to get the Phone number of a Person
*
* @return phone number of the person
*/
public String getPhoneNumber() {
logger.fine("returning phone number of " + this + "that is: " + phoneNumber);
return phoneNumber;
}
public void setPhoneNumber(String phoneNumber) {
/**
* Method used to set the Phone number of a Person
*
* @param phoneNumber to be set
*/
public void setPhoneNumber(String phoneNumber) throws InvalidPhoneNumberException {
if (!phoneNumber.matches(PHONE_MATCHING_REGEX)) {
logger.warning("Phone number: " + phoneNumber + ", is not in a valid format");
throw new InvalidPhoneNumberException("The entered Phone Number is invalid.");
}
logger.fine("Setting new phone number of " + this + " with: " + phoneNumber);
this.phoneNumber = phoneNumber;
}
public class InvalidPhoneNumberException extends Exception {
public InvalidPhoneNumberException() {
super();
}
/**
* Exception, that is used when a Phone number is in an invalid format.
*/
public static class InvalidPhoneNumberException extends Exception {
public InvalidPhoneNumberException(String errorMessage) {
super(errorMessage);
@@ -58,8 +115,13 @@ public class Person implements Serializable {
}
/**
* Overridden toString method to be Return the name in Format "Firstname Name".
*
* @return Returning the Name in format "Firstname Name" as String
*/
@Override
public String toString(){
public String toString() {
return firstName + " " + name;
}
@@ -1,36 +1,78 @@
package ch.zhaw.projekt2.turnierverwaltung;
import java.io.Serializable;
import java.util.logging.Logger;
/**
* Class Representing a place that can be set for a game
*/
public class Place implements Serializable {
private final String NAME_MATCHING_REGEX = "[a-zA-Z0-9]{1,20}";
private String name;
private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
/**
* Constructor of a place initializes it and checks if name is in valid format
*
* @param name to be set
* @throws InvalidNameException If name is invalid
*/
public Place(String name) throws InvalidNameException {
if(!name.matches(NAME_MATCHING_REGEX)){
throw new InvalidNameException("The Name is Invalid.");
if (!name.matches(NAME_MATCHING_REGEX)) {
logger.warning("Name: " + name + " does not follow the valid format");
throw new InvalidNameException("The Name: " + name + " is in an invalid Format");
}
logger.fine("Name: " + name + " is valid and will be set for the Place");
setName(name);
}
/**
* Method to get the Name of the Place as String
*
* @return name of place as String
*/
public String getName() {
logger.finer("returning the name: " + name);
return name;
}
public void setName(String name) {
/**
* Method to set the name of a place
*
* @param name the name to be set
*/
private void setName(String name) {
logger.finer("Setting " + name + " as name of place");
this.name = name;
}
/**
* Override of toString to return the name as String when needed
*
* @return the name of the place as String
*/
@Override
public String toString(){
public String toString() {
return name;
}
public boolean equals(Place place){
/**
* Override of equals tom compare places with each other
*
* @param place to be compared with this instance
* @return true if equals and false if not equal
*/
public boolean equals(Place place) {
logger.fine("Comparing " + place + " with " + this);
return name.equals(place.getName());
}
/**
* Functionality to save more details than the name about a place is not implemented in this prototype,
* so no functionality is set yet to change the place.
* @param place to be changed
*/
public void change(Place place) {
//TODO: If Place gets more developed in future releases
}
}
@@ -1,69 +1,127 @@
package ch.zhaw.projekt2.turnierverwaltung;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.logging.Logger;
public class Player extends Person implements Participant{
/**
* Class Representing a single Player
*/
public class Player extends Person implements Participant {
private LocalDate dateOfBirth;
private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
/**
* Constructor of player initializes a new player setting sever attributes like firstname, name birthdate usw.
* and checking if the format is valid
*
* @param firstName the firstname of the player
* @param name the name of the player
* @param phoneNumber the phone number of the player
* @param dateOfBirth the birthdate of the player
* @throws InvalidNameException thrown when the name or firstname are not in a valid format
* @throws InvalidPhoneNumberException thrown when the phone number is not in a valid format
*/
public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException, InvalidDateException {
super(firstName, name, phoneNumber);
logger.fine("initialized super of Player with firstname, name and phone number");
logger.finer("Setting the date of birth as:" + dateOfBirth);
setDateOfBirth(dateOfBirth);
logger.finer("finished initializing the Player:" + name);
}
/**
* Method to get the birthday of a player
*
* @return the birthday of a player
*/
public LocalDate getDateOfBirth() {
logger.fine("returning the birthday of " + getName());
return dateOfBirth;
}
public String getFormatedDateOfBirth(){
try{
/**
* Method that returns the date of birth formatted in eu way dd.MM.YYYY and as String
*
* @return String of formatted date
*/
public String getFormattedDateOfBirth() {
logger.finer("Trying to get the formatted date");
try {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
logger.fine("Returning the formatted birthdate of player: " + getName());
return dateOfBirth.format(formatter);
} catch (Exception e) {
//todo handle and logging
logger.warning("Failed to get formatted date for player " + getName() + "Error: " + e);
//TODO handle
return "";
}
}
/**
* Method to set the date of Birth with a String provided.
*
* @param dateOfBirth to be as a String
*/
public void setDateOfBirth(String dateOfBirth) throws InvalidDateException {
if(dateOfBirth.length() > 0) {
logger.finer("Trying to set of birth with the String " + dateOfBirth + " provided");
if (dateOfBirth.length() > 0) {
String[] date = dateOfBirth.split("\\.");
try{
this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
try {
this.dateOfBirth = LocalDate.of(Integer.parseInt(date[2]), Integer.parseInt(date[1]), Integer.parseInt(date[0]));
logger.fine("Date of birth of" + getName() + " has been set to " + dateOfBirth);
} catch (NumberFormatException | IndexOutOfBoundsException e) {
e.printStackTrace();
logger.warning("Date of birth of " + getName() + " could not be set, leaving at null");
throw new InvalidDateException("Date invalid");
}
} else {
dateOfBirth = null;
logger.warning("Date of birth of " + getName() + " could not be set, leaving at null");
}
}
/**
* Method that sets date of Birth with a LocalDate provided
*
* @param dateOfBirth parameter given as LocalDate
*/
public void setDateOfBirth(LocalDate dateOfBirth) {
logger.fine("Setting date of birth of" + getName() + "with provided LocalDate: " + dateOfBirth);
this.dateOfBirth = dateOfBirth;
}
/**
* Override of equals method to compare participants against each other
*
* @param participant to be compared with this instance
* @return true if equals, false if not
*/
@Override
public boolean equals(Participant participant) {
return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
logger.fine("Comparing " + participant + " with " + this);
return getClass().equals(participant.getClass()) && toString().equalsIgnoreCase(participant.toString());
}
/**
* Override of the change method to change a Participant with a new one
*
* @param participant the new participant to be added
*/
@Override
public void change(Participant participant) {
public void change(Participant participant) throws InvalidPhoneNumberException {
logger.fine("changing the current Player " + this + "with " + participant.getName());
Player player = (Player) participant;
setDateOfBirth(player.getDateOfBirth());
setPhoneNumber(player.getPhoneNumber());
}
public class InvalidDateException extends Exception {
public InvalidDateException() {
super();
}
public static class InvalidDateException extends Exception {
public InvalidDateException(String errorMessage) {
super(errorMessage);
}
@@ -2,59 +2,129 @@ package ch.zhaw.projekt2.turnierverwaltung;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
/**
* Class Team represents a team that can be added to a tournament
* (in the prototype there is no functionality for the team)
*/
public class Team implements Participant {
private String name;
private List<Player> players;
private Person contactPerson;
public Team(String name){
private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
/**
* Constructor to initiate a team, sets its name
*
* @param name the new name to be set
*/
public Team(String name) {
logger.fine("Setting the new name of the team as: " + name);
setName(name);
players = new ArrayList<>();
}
public void addPlayer(Player player){
/**
* Method to add a new player to a team
*
* @param player new player to be added to a team
*/
public void addPlayer(Player player) {
logger.fine("Adding new Player named: " + player + "into the team");
players.add(player);
}
/**
* Method to return the name of the team
*
* @return the name of the team
*/
@Override
public String getName() {
logger.fine("Returning the name of the team:" + name);
return name;
}
/**
* Method to set the name of a team
*
* @param name of the team
*/
@Override
public void setName(String name) {
this.name = name;
}
/**
* Method that sets a complete List of all players as players of the team
*
* @param players List of Players to be set
*/
public void setPlayers(List<Player> players) {
logger.fine("Inserts Player");
this.players = players;
}
/**
* Method to get the List of all Players in a team
*
* @return List of all players in team
*/
public List<Player> getPlayers() {
logger.fine("Returning List of all players in " + getName());
return players;
}
/**
* Override of equals Method to compare teams with each other
*
* @param participant to be compared with this instance
* @return true if teams are the same false if not.
*/
@Override
public boolean equals(Participant participant) {
return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
return getClass().equals(participant.getClass()) && toString().equalsIgnoreCase(participant.toString());
}
/**
* Functionality to save a team is not implemented in this prototype, so no functionality is set yet to change the team
*
* @param participant date object containing new data
*/
@Override
public void change(Participant participant) {
return;
}
/**
* Method to get the current contact person of a team
*
* @return the current contact person
*/
public Person getContactPerson() {
logger.fine("Returning contact Person of team " + getName());
return contactPerson;
}
/**
* Method to set a Person as a contact person of a team
*
* @param contactPerson to be set
*/
public void setContactPerson(Person contactPerson) {
logger.fine("Setting " + contactPerson + " as a contact Person for team " + getName());
this.contactPerson = contactPerson;
}
/**
* Override of toString method, that returns the current name
*
* @return name in form of a String
*/
@Override
public String toString(){
public String toString() {
return name;
}
}
@@ -59,7 +59,7 @@ public class Tournament implements Serializable {
*
* @param newParticipant the Participant to be saved or edited
*/
public void saveParticipant(Participant newParticipant) {
public void saveParticipant(Participant newParticipant) throws Person.InvalidPhoneNumberException {
logger.fine("Trying to add " + newParticipant + " into the tournament");
for (Participant participant : participants) {
if (participant.equals(newParticipant)) {
@@ -76,8 +76,8 @@ public class Tournament implements Serializable {
/**
* Method to remove an existing participant throws error if participant could not be found
*
* @param participant
* @throws ParticipantNotExistsException
* @param participant to be removed
* @throws ParticipantNotExistsException thrown when the participant could not be found
*/
public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
logger.finer("Trying to remove " + participant + " from participants List");
@@ -120,8 +120,9 @@ public class Tournament implements Serializable {
}
/**
* @param place
* @throws PlaceNotExistsException
* Method that removes a place from the List, also checks if place is in the list
* @param place to be removed
* @throws PlaceNotExistsException thrown when the place could not be found
*/
public void removePlace(Place place) throws PlaceNotExistsException {
if (!places.contains(place)) {
@@ -156,8 +157,6 @@ public class Tournament implements Serializable {
logger.warning("Invalid number of participants only participants 2^n allowed");
throw new NumberOfParticipantInvalidException("Can not Create Game Schedule for KO Modus");
}
} else {
logger.warning("In the prototype the only accessible game schedule is the ko modus");
}
@@ -209,7 +208,7 @@ public class Tournament implements Serializable {
}
/**
* Settermethod for the name of the tournament
* Setter method for the name of the tournament
*
* @param name the new name that should be set
*/
@@ -218,7 +217,7 @@ public class Tournament implements Serializable {
}
/**
* Gettermethod to get the type of the tournament
* Getter method to get the type of the tournament
*
* @return the type of the tournament
*/
@@ -230,7 +229,7 @@ public class Tournament implements Serializable {
/**
* Setter Method to set the type of the tournament
*
* @param type
* @param type the type to be set
*/
public void setType(Type type) {
logger.fine("Setting the type of the tournament to: " + type);
@@ -238,7 +237,7 @@ public class Tournament implements Serializable {
}
/**
* Gettermethod to get the Complete GameList
* Getter method to get the Complete GameList
*
* @return the complete GameList
*/
@@ -252,19 +251,28 @@ public class Tournament implements Serializable {
* (In the Prototype only the KO-System has full functionality
*/
public enum Type {
KO("KO-System"), GROUPS("Gruppenspiele");
KO("KO-System"); //GROUPS("Gruppenspiele"); //Type GROUPS is not implemented in this prototype.
private String name;
private final String name;
private Type(String name) {
Type(String name) {
this.name = name;
}
/**
* Overridden toString method to return the name
* @return the name of the type
*/
@Override
public String toString() {
return name;
}
/**
* Method to return an Observable List containing all types
*
* @return the Observable list with all types
*/
public static ObservableList<Type> getObservableList() {
ObservableList<Type> items = FXCollections.observableArrayList();
items.addAll(values());
@@ -275,11 +283,7 @@ public class Tournament implements Serializable {
/**
* Custom exception thrown when an invalid file is chosen
*/
public class InvalidTypeException extends Exception {
public InvalidTypeException() {
super();
}
public static class InvalidTypeException extends Exception {
public InvalidTypeException(String errorMessage) {
super(errorMessage);
}
@@ -287,13 +291,9 @@ public class Tournament implements Serializable {
}
/**
* Custom Expeption thrown when a Participant does not exist
* Custom Exception thrown when a Participant does not exist
*/
public class ParticipantNotExistsException extends Exception {
public ParticipantNotExistsException() {
super();
}
public static class ParticipantNotExistsException extends Exception {
public ParticipantNotExistsException(String errorMessage) {
super(errorMessage);
}
@@ -303,11 +303,7 @@ public class Tournament implements Serializable {
/**
* Custom Exception thrown when a Place does not exist
*/
public class PlaceNotExistsException extends Exception {
public PlaceNotExistsException() {
super();
}
public static class PlaceNotExistsException extends Exception {
public PlaceNotExistsException(String errorMessage) {
super(errorMessage);
}
@@ -317,11 +313,7 @@ public class Tournament implements Serializable {
/**
* Custom Exception thrown when the number of participants is not valid
*/
public class NumberOfParticipantInvalidException extends Exception {
public NumberOfParticipantInvalidException() {
super();
}
public static class NumberOfParticipantInvalidException extends Exception {
public NumberOfParticipantInvalidException(String msg) {
super(msg);
}
@@ -8,6 +8,7 @@ import java.util.Date;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
public class TournamentDecorator implements IsObservable{
private Tournament tournament;
@@ -60,7 +61,8 @@ public class TournamentDecorator implements IsObservable{
public void saveTournament(){
executorService.execute(new saveTask());
factoryDecorator.clearMessage(false);
factoryDecorator.printMessageToFooter("Zuletzt gespeichert: " + new Date().toString(),false);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("save");
factoryDecorator.printMessageToFooter(msg + new Date().toString(),false);
}
@@ -70,7 +72,8 @@ public class TournamentDecorator implements IsObservable{
try {
if(fileIO.tournamentExists(name)){
//TODO:Logger
factoryDecorator.printMessageToFooter("Turniername existiert bereits",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("tournamentExists");
factoryDecorator.printMessageToFooter(msg, true);
return;
}
Tournament tournament = new Tournament(name, type);
@@ -80,16 +83,19 @@ public class TournamentDecorator implements IsObservable{
} catch (InvalidNameException e) {
e.printStackTrace();
//TODO: Logger
factoryDecorator.printMessageToFooter("Invalider Turniername",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidName");
factoryDecorator.printMessageToFooter(msg, true);
} catch (Tournament.InvalidTypeException e) {
e.printStackTrace();
//TODO: Logger
factoryDecorator.printMessageToFooter("Turniermodus nicht möglich",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidMode");
factoryDecorator.printMessageToFooter(msg, true);
} catch (IOException e) {
e.printStackTrace();
//TODO: Logger
factoryDecorator.printMessageToFooter("Fehler bei Dateizugriff",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("IOException");
factoryDecorator.printMessageToFooter(msg, true);
}
}
@@ -101,7 +107,8 @@ public class TournamentDecorator implements IsObservable{
informListener();
} catch (IOException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Fehler bei Dateizugriff",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("IOException");
factoryDecorator.printMessageToFooter(msg, true);
}
}
@@ -112,7 +119,8 @@ public class TournamentDecorator implements IsObservable{
factoryDecorator.clearMessage(true);
} catch (Tournament.NumberOfParticipantInvalidException e) {
e.printStackTrace();
factoryDecorator.printMessageToFooter("Anzahl Teilnehmer nicht vielfaches von 2",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("numberParticipant");
factoryDecorator.printMessageToFooter(msg, true);
}
informListener();
}
@@ -124,13 +132,16 @@ public class TournamentDecorator implements IsObservable{
informListener();
} catch (InvalidNameException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Invalider Teilnehmername",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidName");
factoryDecorator.printMessageToFooter(msg, true);
} catch (Person.InvalidPhoneNumberException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Invalide Telefonnummer",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidPhone");
factoryDecorator.printMessageToFooter(msg, true);
} catch (Player.InvalidDateException e) {
e.printStackTrace();
factoryDecorator.printMessageToFooter("Ungültiges Geburtsdatum", true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidDate");
factoryDecorator.printMessageToFooter(msg, true);
}
}
@@ -141,8 +152,8 @@ public class TournamentDecorator implements IsObservable{
informListener();
} catch (Tournament.ParticipantNotExistsException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Teilnehmer existiert nicht",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("participantNotExist");
factoryDecorator.printMessageToFooter(msg, true);
}
}
@@ -153,7 +164,8 @@ public class TournamentDecorator implements IsObservable{
informListener();
} catch (InvalidNameException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Invalider Ortsname",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("invalidName");
factoryDecorator.printMessageToFooter(msg, true);
}
}
@@ -164,7 +176,8 @@ public class TournamentDecorator implements IsObservable{
informListener();
} catch (Tournament.PlaceNotExistsException e) {
e.printStackTrace(); //TODO handle and logging
factoryDecorator.printMessageToFooter("Ort existiert nicht",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("placeNotExist");
factoryDecorator.printMessageToFooter(msg, true);
}
}
@@ -175,6 +188,11 @@ public class TournamentDecorator implements IsObservable{
}
}
public void closeApplication() throws InterruptedException {
executorService.shutdown();
executorService.awaitTermination(2000, TimeUnit.MILLISECONDS);
}
private class saveTask implements Runnable {
@Override
@@ -184,7 +202,8 @@ public class TournamentDecorator implements IsObservable{
} catch (IOException e) {
e.printStackTrace();
Platform.runLater(() -> {
factoryDecorator.printMessageToFooter("Datenzugriff nicht moeglich",true);
String msg = factoryDecorator.getLanguageConfigurator().getSelectedLanguage("IOException");
factoryDecorator.printMessageToFooter(msg, true);
});
}
}
@@ -1,39 +1,51 @@
package ch.zhaw.projekt2.turnierverwaltung.main;
import ch.zhaw.projekt2.turnierverwaltung.Factory;
import ch.zhaw.projekt2.turnierverwaltung.FactoryDecorator;
import ch.zhaw.projekt2.turnierverwaltung.FileIO;
import ch.zhaw.projekt2.turnierverwaltung.TournamentDecorator;
import ch.zhaw.projekt2.turnierverwaltung.*;
import javafx.application.Application;
import javafx.event.EventHandler;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.layout.BorderPane;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import java.util.logging.Logger;
public class MainWindow extends Application {
private FileIO fileIO = new FileIO(System.getProperty("user.dir") + System.getProperty("file.separator") + "tournierverwaltung_angrynerds");
private FactoryDecorator factoryDecorator;
private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
private LanguageConfigurator languageConfigurator = new LanguageConfigurator();
private Factory factory = new Factory(fileIO, tournamentDecorator, languageConfigurator);
private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
@Override
public void start(Stage primaryStage) throws Exception {
BorderPane pane = factory.loadMainWindow();
factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
factory.loadAllViews(factoryDecorator, pane);
tournamentDecorator.setFactoryDecorator(factoryDecorator);
factoryDecorator.openTournamentList();
languageConfigurator.translateGUI();
Scene scene = new Scene(pane);
primaryStage.setScene(scene);
primaryStage.setMinHeight(600);
primaryStage.setMinWidth(800);
primaryStage.setMaximized(true);
primaryStage.setResizable(true);
primaryStage.setFullScreen(false);
primaryStage.show();
}
@Override
public void stop() {
try {
super.stop();
tournamentDecorator.closeApplication();
} catch (Exception e) {
logger.warning("Exception while closing application");
}
}
}
@@ -1,21 +1,49 @@
package ch.zhaw.projekt2.turnierverwaltung.main;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.LanguageConfigurator;
import javafx.application.Platform;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Label;
import javafx.scene.control.Menu;
import javafx.scene.control.MenuItem;
public class MainWindowController extends FXController {
@FXML
void changeLangToGerman(ActionEvent event) {
private MenuItem closeBtn;
@FXML
private Label mainTitle;
@FXML
private Menu menuItemLanguage;
@FXML
void changeLangToGerman(ActionEvent event) {
getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.GERMAN);
}
@FXML
void changeLangToEnglish(ActionEvent event) {
getLanguageConfigurator().changeLanguage(LanguageConfigurator.Language.ENGLISH);
}
@FXML
void closeApplication(ActionEvent event) {
Platform.exit();
}
@Override
public void shareGUIElementWithLanguageConfigurator() {
getLanguageConfigurator().recieveLabel(mainTitle);
getLanguageConfigurator().recieveMenuItem(closeBtn);
getLanguageConfigurator().recieveMenuItem(menuItemLanguage);
}
@Override
public void loadContent() {
@@ -0,0 +1,39 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.LanguageConfigurator;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
public class AlertNewSchedule extends Alert {
private ButtonType yesButton;
private ButtonType noButton;
private Boolean result;
private String yes;
private String no;
private String titleDelete;
private String headerDelete;
private String contentDelete;
public AlertNewSchedule(LanguageConfigurator languageConfigurator){
super(Alert.AlertType.WARNING);
yes = languageConfigurator.getSelectedLanguage("yes");
no = languageConfigurator.getSelectedLanguage("no");
titleDelete = languageConfigurator.getSelectedLanguage("titleSchedule");
headerDelete = languageConfigurator.getSelectedLanguage("headerSchedule");
contentDelete = languageConfigurator.getSelectedLanguage("contentSchedule");
yesButton = new ButtonType(yes, ButtonBar.ButtonData.YES);
noButton = new ButtonType(no, ButtonBar.ButtonData.NO);
setTitle(titleDelete);
setHeaderText(headerDelete);
setContentText(contentDelete);
getButtonTypes().setAll(yesButton, noButton);
}
public boolean showAndGetResult() {
showAndWait().ifPresent(input -> {
result = input == yesButton;
});
return result;
}
}
@@ -32,6 +32,14 @@ public class GameController extends FXController{
@FXML
private TextField pointsTeamTwo;
@FXML
private Label locationLabel;
@Override
public void shareGUIElementWithLanguageConfigurator() {
getLanguageConfigurator().recieveLabel(locationLabel);
}
@FXML
void saveGameResult(Event event) {
gameDecorator.saveGameResult(pointsTeamOne.getText(), pointsTeamTwo.getText());
@@ -48,6 +56,7 @@ public class GameController extends FXController{
@Override
public void loadContent() {
getLanguageConfigurator().translateGUI();
participantNameOne.setText(gameDecorator.getParticipantOne());
participantNameTwo.setText(gameDecorator.getParticipantTwo());
pointsTeamOne.setText(String.valueOf(gameDecorator.getPoints1()));
@@ -71,10 +80,11 @@ public class GameController extends FXController{
}
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator) {
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator,LanguageConfigurator languageConfigurator) {
setTournamentDecorator(tournamentDecorator);
this.gameDecorator = gameDecorator;
placesChoiceBox.getSelectionModel().selectedItemProperty().addListener((ObservableValue<? extends Place> observable, Place oldValue, Place newValue) -> saveGamePlace(newValue));
setup(languageConfigurator);
placesChoiceBox.getSelectionModel().selectedItemProperty().addListener((ObservableValue<? extends Place> observable, Place oldValue, Place newValue) -> saveGamePlace(newValue == null ? oldValue : newValue));
}
}
@@ -1,11 +1,11 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.Tournament;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.Labeled;
import javafx.scene.layout.HBox;
public class GameScheduleController extends FXController {
@@ -28,9 +28,25 @@ public class GameScheduleController extends FXController {
@FXML
private CheckBox treeView;
@Override
public void shareGUIElementWithLanguageConfigurator() {
getLanguageConfigurator().recieveLabel(treeView);
getLanguageConfigurator().recieveLabel(createScheduleBtn);
getLanguageConfigurator().recieveLabel(editParticipantBtn);
getLanguageConfigurator().recieveLabel(editLocBtn);
getLanguageConfigurator().recieveLabel(closeTournamentBtn);
}
@FXML
void createNewSchedule(ActionEvent event) {
getTournamentDecorator().createNewGameSchedule();
if (getTournamentDecorator().getTournament().getGameList().size() > 0) {
AlertNewSchedule alert = new AlertNewSchedule(getLanguageConfigurator());
if (alert.showAndGetResult()) {
getTournamentDecorator().createNewGameSchedule();
}
} else {
getTournamentDecorator().createNewGameSchedule();
}
}
@FXML
@@ -68,13 +68,26 @@ public class ParticipantFormularController extends FXController {
@FXML
private Button saveBtn;
@Override
public void shareGUIElementWithLanguageConfigurator() {
getLanguageConfigurator().recieveLabel(participantListTitle);
getLanguageConfigurator().recieveLabel(closeBtn);
getLanguageConfigurator().recieveLabel(deleteBtn);
getLanguageConfigurator().recieveLabel(newParticipantFormularTitle);
getLanguageConfigurator().recieveLabel(participantNameLabel);
getLanguageConfigurator().recieveLabel(firstNameLabel);
getLanguageConfigurator().recieveLabel(phoneNumberLabel);
getLanguageConfigurator().recieveLabel(birthDateLabel);
getLanguageConfigurator().recieveLabel(saveBtn);
}
@FXML
void changedSelection(MouseEvent event){
Player participant = (Player) participantListView.getSelectionModel().getSelectedItems().get(0);
participantNameTextField.setText(participant.getName());
firstNameTextField.setText(participant.getFirstName());
phoneNumberTextField.setText(participant.getPhoneNumber());
birthDateTextField.setText(participant.getFormatedDateOfBirth());
birthDateTextField.setText(participant.getFormattedDateOfBirth());
}
@FXML
@@ -11,22 +11,9 @@ import javafx.scene.control.Label;
import javafx.scene.control.ListView;
import javafx.scene.control.TextField;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
public class PlacesFormularController extends FXController {
@FXML
private Button addBtn;
@FXML
private VBox changeBtn;
@FXML
private GridPane grid;
@FXML
private Label newPlaceFormularTitle;
@FXML
private Button closeBtn;
@@ -34,6 +21,8 @@ public class PlacesFormularController extends FXController {
@FXML
private Button deleteBtn;
@FXML
private Label newPlaceTitle;
@FXML
private Label placeListTitle;
@@ -50,6 +39,17 @@ public class PlacesFormularController extends FXController {
@FXML
private Button saveBtn;
@Override
public void shareGUIElementWithLanguageConfigurator() {
getLanguageConfigurator().recieveLabel(placeListTitle);
getLanguageConfigurator().recieveLabel(newPlaceTitle);
getLanguageConfigurator().recieveLabel(placeNameLabel);
getLanguageConfigurator().recieveLabel(closeBtn);
getLanguageConfigurator().recieveLabel(deleteBtn);
getLanguageConfigurator().recieveLabel(saveBtn);
}
@FXML
void changedSelection(MouseEvent event){
Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
@@ -1,29 +1,39 @@
package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
import ch.zhaw.projekt2.turnierverwaltung.LanguageConfigurator;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
public class AlertDelete extends Alert {
ButtonType yesButton = new ButtonType("Ja", ButtonBar.ButtonData.YES);
ButtonType noButton = new ButtonType("Nein", ButtonBar.ButtonData.NO);
ButtonType yesButton;
ButtonType noButton;
Boolean result;
String yes;
String no;
String titleDelete;
String headerDelete;
String contentDelete;
public AlertDelete(String name){
public AlertDelete(LanguageConfigurator languageConfigurator){
super(Alert.AlertType.WARNING);
setTitle("Entfernen");
setHeaderText("Turnier entfernen?");
setContentText("Sind Sie sicher, dass sie das Turnier " + name + " entfernen wollen?\n" +
"Nach diesem Vorgang kann es nicht wiederhergestellt werden.");
yes = languageConfigurator.getSelectedLanguage("yes");
no = languageConfigurator.getSelectedLanguage("no");
titleDelete = languageConfigurator.getSelectedLanguage("titleDelete");
headerDelete = languageConfigurator.getSelectedLanguage("headerDelete");
contentDelete = languageConfigurator.getSelectedLanguage("contentDelete");
yesButton = new ButtonType(yes, ButtonBar.ButtonData.YES);
noButton = new ButtonType(no, ButtonBar.ButtonData.NO);
setTitle(titleDelete);
setHeaderText(headerDelete);
setContentText(contentDelete);
getButtonTypes().setAll(yesButton, noButton);
}
public boolean showAndGetResult() {
result = false;
showAndWait().ifPresent(type -> {
if (type == yesButton) {
result = true;
}
result = type == yesButton;
});
return result;
}
@@ -25,8 +25,6 @@ public class TournamentListController extends FXController {
@FXML
private Button createBtn;
@FXML
private GridPane grid;
@FXML
private ChoiceBox<Tournament.Type> modusChoiceBox;
@@ -55,6 +53,17 @@ public class TournamentListController extends FXController {
@FXML
private TextField tournamentNameField;
@Override
public void shareGUIElementWithLanguageConfigurator() {
getLanguageConfigurator().recieveLabel(createBtn);
getLanguageConfigurator().recieveLabel(newTournamentFormularTitle);
getLanguageConfigurator().recieveLabel(openBtn);
getLanguageConfigurator().recieveLabel(deleteBtn);
getLanguageConfigurator().recieveLabel(tournamentListTitle);
getLanguageConfigurator().recieveLabel(tournamentModLabel);
getLanguageConfigurator().recieveLabel(tournamentNameLabel);
}
@FXML
void createTournament(ActionEvent event) {
getTournamentDecorator().createTournament(tournamentNameField.getText(), modusChoiceBox.getValue());
@@ -69,7 +78,7 @@ public class TournamentListController extends FXController {
@FXML
void deleteTournament(ActionEvent event) {
FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
AlertDelete alert = new AlertDelete(tournamentFile.toString());
AlertDelete alert = new AlertDelete(getLanguageConfigurator());
if(alert.showAndGetResult()){
getTournamentDecorator().deleteTournament(tournamentFile);
}
@@ -16,17 +16,18 @@
<menus>
<Menu mnemonicParsing="false" text="Start">
<items>
<Menu mnemonicParsing="false" text="Sprache">
<Menu fx:id="menuItemLanguage" mnemonicParsing="false" text="Sprache">
<items>
<MenuItem mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
<MenuItem mnemonicParsing="false" onAction="#changeLangToEnglish" text="English" />
</items>
</Menu>
<MenuItem mnemonicParsing="false" onAction="#closeApplication" text="Close" />
<MenuItem fx:id="closeBtn" mnemonicParsing="false" onAction="#closeApplication" text="Close" />
</items>
</Menu>
</menus>
</MenuBar>
<Label text="Turnier Manager">
<Label fx:id="mainTitle" text="Turnier Manager">
<font>
<Font name="System Bold" size="40.0" />
</font>
@@ -42,7 +42,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<Label text="Ort">
<Label fx:id="locationLabel" text="Ort">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
@@ -1,15 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
<center>
<ScrollPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<content>
<HBox fx:id="hBoxCenter" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="324.0" prefWidth="600.0" />
</content>
</ScrollPane>
</center>
<top>
<HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<children>
<CheckBox fx:id="treeView" mnemonicParsing="false" onAction="#changeView" selected="true" text="Baumansicht" />
<Button fx:id="createScheduleBtn" mnemonicParsing="false" onAction="#createNewSchedule" text="Create New Game Schedule">
<CheckBox fx:id="treeView" minWidth="100.0" mnemonicParsing="false" onAction="#changeView" selected="true" text="Baumansicht" textOverrun="WORD_ELLIPSIS" wrapText="true">
<HBox.margin>
<Insets left="20.0" right="20.0" />
</HBox.margin>
</CheckBox>
<Button fx:id="createScheduleBtn" mnemonicParsing="false" onAction="#createNewSchedule" text="Spielplan neu erstellen">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
@@ -24,18 +38,12 @@
<Insets right="20.0" />
</HBox.margin>
</Button>
<Button fx:id="closeTournamentBtn" layoutX="470.0" layoutY="10.0" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament">
<Button fx:id="closeTournamentBtn" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin></Button>
</HBox.margin>
</Button>
</children>
</HBox>
</top>
<center>
<ScrollPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<content>
<HBox fx:id="hBoxCenter" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="324.0" prefWidth="600.0" />
</content>
</ScrollPane>
</center>
</BorderPane>
@@ -1,11 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.control.Separator?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
<children>
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
@@ -48,7 +56,7 @@
</Separator>
<VBox fx:id="changeBtn" alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="newplaceFormularTitle" text="Ort ändern/erstellen">
<Label fx:id="newPlaceTitle" text="Ort ändern/erstellen">
<font>
<Font name="System Bold" size="21.0" />
</font>