Compare commits

..
Author SHA1 Message Date
leobr 035b096889 finished logging and improved logging in FileIO #17 2022-05-05 23:58:42 +02:00
Leonardo Brandenberger 1ff37de1a3 Initial logging draft 2022-05-05 23:03:48 +02:00
schrom01 c323ab5759 fixed Merging problem 2022-05-01 22:50:07 +02:00
Roman SchenkandGitHub Enterprise b2c23e158d Merge pull request #16 from PM2-IT21bWIN-ruiz-mach-krea/FileIO
FileIO completed including Java Doc and logging
2022-05-01 22:47:33 +02:00
schrom01 2f111cf1e4 implemented functionality of PlacesFormular 2022-05-01 22:43:41 +02:00
Roman SchenkandGitHub Enterprise 4ae7cd2e5a Merge branch 'main' into FileIO 2022-05-01 22:42:02 +02:00
Leonardo Brandenberger eb6d68e84f FileIO completed including Java Doc and logging 2022-05-01 22:30:22 +02:00
Roman SchenkandGitHub Enterprise 594299f3b2 Merge pull request #13 from PM2-IT21bWIN-ruiz-mach-krea/Participant_List
Participant list
2022-05-01 21:44:27 +02:00
Roman SchenkandGitHub Enterprise 7d30c6e4e7 Merge branch 'main' into Participant_List 2022-05-01 21:44:17 +02:00
Leonardo BrandenbergerandGitHub Enterprise b359acfab4 Merge pull request #14 from PM2-IT21bWIN-ruiz-mach-krea/GameSchedule
Game schedule
2022-05-01 21:36:16 +02:00
schrom01 0d482bfcac implemented Functionality to save, edit and delete participants. 2022-05-01 21:26:32 +02:00
Andrin Fassbind 0db169a771 Added GameSchedule View
when open tournament GameSchedule.fxml gets loaded
2022-05-01 20:26:33 +02:00
Roman SchenkandGitHub Enterprise bd9dbef1de Merge pull request #11 from PM2-IT21bWIN-ruiz-mach-krea/TournamentList
Tournament list
2022-05-01 18:45:02 +02:00
schrom01 90fa3a9183 changed position of button. 2022-05-01 18:06:25 +02:00
schrom01 4cb743a21a implemented functionality to save participants also in file. 2022-05-01 17:00:09 +02:00
schrom01 ff6f2bd94e created Methods to show and add Players. 2022-05-01 15:18:30 +02:00
schrom01 b09929da19 added Participant List to Tournament.java 2022-05-01 14:22:01 +02:00
schrom01 678060ecc0 extracted Method delete Tournament in TournamentDecorator.java 2022-05-01 13:46:20 +02:00
schrom01 61b943b091 extracted Method open Tournament to Class FactoryDecorator.java 2022-05-01 13:39:54 +02:00
schrom01 9f005281af created Class TournamentDecorator.java 2022-05-01 13:10:20 +02:00
schrom01 50f98b4ac1 added Type checking in Tournament.java 2022-05-01 12:33:14 +02:00
schrom01 80005d214d created Class AlertDelete.java 2022-05-01 12:19:22 +02:00
schrom01 58b1692181 implemented Button and Method deleteTournament in Tournament List 2022-05-01 11:27:54 +02:00
schrom01 a3bd207610 refactored toString Method of class TournamentFile 2022-05-01 11:17:18 +02:00
schrom01 5034203409 extracted Method tournamentExists to FileIO.java 2022-05-01 11:10:21 +02:00
schrom01 e79a38c696 Merge branch 'FileIO' into TournamentList
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java
2022-05-01 10:56:22 +02:00
schrom01 672ad409ce refactoring in FileIOTest.java 2022-05-01 10:54:21 +02:00
schrom01 e8e64d435c added Method deleteTournament but not implemented yet in FileIO.java
added Test Methods for deleteTournament.
2022-05-01 10:49:29 +02:00
schrom01 171cf7ef4e implemented functionality to add new Tournament 2022-05-01 10:27:21 +02:00
schrom01 fd2e775c94 cleanCode fixes. 2022-04-30 18:22:06 +02:00
schrom01 71d13314f4 Solved Problems with Filenames ParticipantFormularController.java and TournamentListController.java 2022-04-30 18:17:01 +02:00
Roman SchenkandGitHub Enterprise 2ce93cbf9b Merge pull request #8 from PM2-IT21bWIN-ruiz-mach-krea/fxml
Fxml and Factory
2022-04-30 18:09:54 +02:00
schrom01 6245e32f73 added pane to FXController.java 2022-04-30 18:03:11 +02:00
Roman SchenkandGitHub Enterprise a103174739 Delete app/build/tmp/compileJava directory 2022-04-30 18:01:35 +02:00
Roman SchenkandGitHub Enterprise 563c70a078 Delete .idea directory 2022-04-30 17:59:33 +02:00
Roman SchenkandGitHub Enterprise f8bf63a1d9 Delete .gradle directory 2022-04-30 17:58:39 +02:00
Roman SchenkandGitHub Enterprise 5660f85165 Delete .gradle directory 2022-04-30 17:57:29 +02:00
Roman SchenkandGitHub Enterprise c58fae060a Delete .idea directory 2022-04-30 17:56:40 +02:00
schrom01 6d5dd700a0 implemented functionality to show existing Tournaments. 2022-04-30 17:09:01 +02:00
schrom01 cd0c9a4773 Merge branch 'FileIO' into fxml
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java
2022-04-30 16:10:19 +02:00
schrom01 7af48449e0 created Abstract Class FXController.java 2022-04-29 17:30:26 +02:00
schrom01 9c7d62b260 created Class Factory and refactoring of MainWindow.java 2022-04-29 17:11:50 +02:00
schrom01 ca5b52541f Merge remote-tracking branch 'origin/fxml' into fxml
# Conflicts:
#	.gitignore
2022-04-29 16:18:58 +02:00
schrom01 56de1441d9 Merge branch 'main' into fxml
# Conflicts:
#	.gitignore
2022-04-29 16:18:18 +02:00
schrom01 4909bd0d7c Merge remote-tracking branch 'origin/FileIO' into FileIO 2022-04-29 16:10:50 +02:00
schrom01 90f6855a15 changed Path Separator 2022-04-29 16:09:44 +02:00
Andrin Fassbind 2413e4f8e0 refactored GUI to be able to just switch between diffrent pane in center
refactored dictionary hirarchy
2022-04-29 12:27:22 +02:00
Leonardo Brandenberger 068dc44e89 started adding logging to FileIO 2022-04-29 11:52:19 +02:00
Andrin Fassbind 89b7ac2268 created GUI Main and AddParticipant 2022-04-29 11:48:37 +02:00
Andrin Fassbind 0974af77b6 created GUI Main and AddParticipant 2022-04-29 11:48:20 +02:00
Andrin Fassbind 3ec776e64f created GUI Main and AddParticipant 2022-04-29 11:47:27 +02:00
fassbandandGitHub Enterprise db21c12f37 Merge pull request #7 from PM2-IT21bWIN-ruiz-mach-krea/creation_of_simple_classes
Creation of simple classes
2022-04-29 10:41:39 +02:00
Andrin Fassbind 96fedc3f65 created GUI Main and AddParticipant 2022-04-29 10:39:59 +02:00
Andrin Fassbind f78731951d created GUI Main and AddParticipant 2022-04-29 10:39:50 +02:00
Andrin Fassbind 2245568edf created GUI Main and AddParticipant 2022-04-29 10:39:37 +02:00
schrom01 cff22e9253 added file needed for FileIOTest 2022-04-29 08:29:10 +02:00
Andrin Fassbind d641d2f2ea created GUI 2022-04-28 19:43:42 +02:00
schrom01 509192b403 created FileIOTest and changed Exception Handling of File IO 2022-04-28 18:07:57 +02:00
schrom01 038030a3db Merge branch 'FileIO' into FileIO_Test 2022-04-28 14:58:49 +02:00
schrom01 263d79ba8e removed Class Tournamenttest.java 2022-04-28 14:57:41 +02:00
schrom01 4b658b9ed9 Merge branch 'creation_of_simple_classes' into FileIO
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
2022-04-28 14:56:21 +02:00
schrom01 0164c286fb made Tournament not abstract. 2022-04-28 14:54:28 +02:00
schrom01 48fba22853 added Date of Birth to Player.java 2022-04-28 14:54:07 +02:00
Leonardo Brandenberger 380250f60e changes so that savepath can be set elsewhere 2022-04-28 14:35:29 +02:00
Leonardo Brandenberger e1fdc5deac finished initial draft of file io and also added some test cases to disscuss in app 2022-04-28 03:07:51 +02:00
Andrin Fassbind 7e068dd281 added resources dir 2022-04-25 20:11:28 +02:00
Leonardo Brandenberger e0b1616edf Created classes to test FileIO 2022-04-24 22:06:03 +02:00
40 changed files with 1947 additions and 55 deletions
+8
View File
@@ -9,6 +9,12 @@
plugins { plugins {
// Apply the application plugin to add support for building a CLI application in Java. // Apply the application plugin to add support for building a CLI application in Java.
id 'application' id 'application'
id 'org.openjfx.javafxplugin' version '0.0.12'
}
javafx {
version = '17.0.1'
modules = [ 'javafx.controls', 'javafx.fxml' ]
} }
repositories { repositories {
@@ -22,6 +28,8 @@ dependencies {
// This dependency is used by the application. // This dependency is used by the application.
implementation 'com.google.guava:guava:30.1.1-jre' implementation 'com.google.guava:guava:30.1.1-jre'
} }
application { application {
@@ -3,12 +3,21 @@
*/ */
package ch.zhaw.projekt2.turnierverwaltung; package ch.zhaw.projekt2.turnierverwaltung;
public class App { import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow;
public String getGreeting() { import javafx.application.Application;
return "Hello World!";
}
import java.io.IOException;
public class App {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(new App().getGreeting()); try {
new LogConfiguration(System.getProperty("user.dir") + System.getProperty("file.separator") + "tournierverwaltung_angrynerds",
"ch" + System.getProperty("file.separator") + "zhaw" + System.getProperty("file.separator") + "projekt2" + System.getProperty("file.separator") +
"turnierverwaltung" + System.getProperty("file.separator") + "logging" + System.getProperty("file.separator") + "log.properties");
} catch (IOException e) {
throw new RuntimeException(e);
}
Application.launch(MainWindow.class,args);
} }
} }
@@ -0,0 +1,47 @@
package ch.zhaw.projekt2.turnierverwaltung;
import javafx.scene.layout.Pane;
public abstract class FXController {
TournamentDecorator tournamentDecorator;
FactoryDecorator factoryDecorator;
FileIO fileIO;
Pane pane;
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane){
this.tournamentDecorator = tournamentDecorator;
this.fileIO = fileIO;
this.factoryDecorator = factoryDecorator;
this.pane = pane;
tournamentDecorator.addListener(new IsObserver() {
@Override
public void update() {
loadContent();
}
});
factoryDecorator.addListener(new IsObserver() {
@Override
public void update() {
loadContent();
}
});
}
public abstract void loadContent();
protected TournamentDecorator getTournamentDecorator() {
return tournamentDecorator;
}
protected FactoryDecorator getFactoryDecorator() {
return factoryDecorator;
}
protected FileIO getFileIO() {
return fileIO;
}
protected Pane getPane() {
return pane;
}
}
@@ -0,0 +1,75 @@
package ch.zhaw.projekt2.turnierverwaltung;
import ch.zhaw.projekt2.turnierverwaltung.main.tournamentList.TournamentListController;
import javafx.fxml.FXMLLoader;
import javafx.scene.layout.BorderPane;
import java.io.IOException;
import java.net.URL;
public class Factory {
private TournamentDecorator tournamentDecorator;
private FileIO fileIO;
public Factory(FileIO fileIO, TournamentDecorator tournamentDecorator){
this.fileIO = fileIO;
this.tournamentDecorator = tournamentDecorator;
}
public TournamentDecorator getTournamentDecorator() {
return tournamentDecorator;
}
public void setTournament(Tournament tournament) {
this.tournamentDecorator.setTournament(tournament);
}
public BorderPane loadMainWindow(){
FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml"));
try {
return loader.load();
} catch (IOException e) {
e.printStackTrace();
//TODO handle and logging
}
return null;
}
public void loadTournamentList(BorderPane pane, FactoryDecorator factoryDecorator){
tournamentDecorator.setTournament(null);
TournamentListController controller = (TournamentListController) setCenterOfBorderPane(pane, getClass().getResource("tournamentList/tournamentList.fxml"), factoryDecorator);
}
//Can be used to Open new Scene in same Stage.
//This way possible to later give object to Controller
public void loadParticipantFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
setCenterOfBorderPane(pane, getClass().getResource("participantAddFormular/participantFormular.fxml"), factoryDecorator);
}
public void loadPlacesFormular(BorderPane pane, FactoryDecorator factoryDecorator) {
setCenterOfBorderPane(pane, getClass().getResource("placesAddFormular/PlacesFormular.fxml"), factoryDecorator);
}
public void loadGameScheduler(BorderPane pane, FactoryDecorator factoryDecorator) {
setCenterOfBorderPane(pane, getClass().getResource("gameScheduleView/GameSchedule.fxml"), factoryDecorator);
}
private FXController setCenterOfBorderPane(BorderPane pane, URL location, FactoryDecorator factoryDecorator) {
FXController controller = null;
try {
FXMLLoader loader = new FXMLLoader(location);
pane.setCenter(loader.load());
controller = loader.getController();
controller.setup(tournamentDecorator, fileIO, factoryDecorator, pane);
controller.loadContent();
} catch (IOException e) {
e.printStackTrace();
//TODO handle and logging?
}
return controller;
}
}
@@ -0,0 +1,73 @@
package ch.zhaw.projekt2.turnierverwaltung;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.Pane;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class FactoryDecorator implements IsObservable{
private Factory factory;
private FileIO fileIO;
private Pane pane;
private List<IsObserver> listener = new ArrayList<>();
public FactoryDecorator(FileIO fileIO, Factory factory, Pane pane){
setFactory(factory);
setFileIO(fileIO);
setPane(pane);
}
public void setFileIO(FileIO fileIO) {
this.fileIO = fileIO;
}
public void setFactory(Factory factory) {
this.factory = factory;
}
public void setPane(Pane pane) {
this.pane = pane;
}
@Override
public void addListener(IsObserver observer) {
listener.add(observer);
}
@Override
public void removeListener(IsObserver observer) {
listener.remove(observer);
}
public void openTournament(FileIO.TournamentFile tournamentFile){
try {
factory.setTournament(fileIO.loadTournament(tournamentFile));
factory.loadGameScheduler((BorderPane) pane, this);
informListener();
} catch (IOException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
} //TODO handle and logging
}
public void openParticipantFormular() {
factory.loadParticipantFormular((BorderPane) pane, this);
}
public void openPlacesFormular() {
factory.loadPlacesFormular((BorderPane) pane, this);
}
public void openScheduleView() {
factory.loadGameScheduler((BorderPane) pane, this);
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();
}
}
}
@@ -0,0 +1,209 @@
package ch.zhaw.projekt2.turnierverwaltung;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import java.io.*;
import java.net.URI;
import java.util.logging.Logger;
/**
* Class in Charge of Reading and Writing files
*/
public class FileIO {
private File mainDir;
private File saves;
private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName());
/**
* Constructor initiates the Directory and creates a save folder if not already existing.
*
* @param saveLocation the directory in which the save Files will be saved
*/
public FileIO(String saveLocation) {
this.mainDir = new File(saveLocation);
if (!mainDir.exists()) {
logger.fine("Creating main directory in given path" + saveLocation);
mainDir.mkdir();
} else {
logger.finer("main directory already exists");
}
saves = new File(mainDir, "saves");
if (!saves.exists()) {
saves.mkdir();
logger.fine("Creating save directory");
} else {
logger.finer("save directory already exists");
}
}
/**
* Returns a list with all save Files that are located inside the save folder.
*
* @return List with all containing save Files
*/
public ObservableList<TournamentFile> getList() {
logger.fine("Creating a List out of all Files in the save directory and returning it");
ObservableList<TournamentFile> tournamentFiles = FXCollections.observableArrayList();
for (File tournament : saves.listFiles()) {
tournamentFiles.add(new TournamentFile(tournament.toURI()));
}
return tournamentFiles;
}
/**
* Method to check if a tournament with the existing name already exists.
* @param name that is being checked
* @return true if the name exists already false if the name is unique
*/
public boolean tournamentExists(String name) {
logger.finer("checking for duplicate name in tournament List");
for (TournamentFile file : getList()) {
if (file.toString().toLowerCase().equals(name.toLowerCase())) {
logger.fine(name + " is an already existing name in the list");
return true;
}
}
logger.fine(name + " is an unique name in the list");
return false;
}
/**
* Loads and returns a tournament from a given File which contains the serialiazed tournament.
*
* @param tournamentFile The tournament file where the data should be read from.
* @return Tournament that is returned when succefully being read from the file
* @throws ClassNotFoundException No definition for the class with the specified name could be found
* @throws IOException File not readable
* @throws FileNotFoundException File not found
*/
public Tournament loadTournament(File tournamentFile) throws IOException, ClassNotFoundException, FileNotFoundException {
if (tournamentFile == null) {
logger.warning("Given tournament file is empty");
throw new IllegalArgumentException("Tournament File is null");
}
Tournament tournament;
logger.finer("Starting up Input Stream to read File");
ObjectInputStream in = null;
try {
logger.fine("Setting up input file and reading it");
FileInputStream fileInputStream = new FileInputStream(tournamentFile);
in = new ObjectInputStream(fileInputStream);
logger.finer("Starting to read tournament File");
tournament = (Tournament) in.readObject();
} catch (FileNotFoundException e) {
logger.severe("Could not find tournament File" + e);
throw e;
} catch (IOException e) {
logger.severe("Failed to read File" + tournamentFile.getName());
throw new IOException("Error while reading File", e);
} catch (ClassNotFoundException e) {
logger.severe("No definition for the class with the specified name could be found" + e);
throw new ClassNotFoundException("No definition for the class with the specified name could be found", e);
} finally {
if (in != null) {
try {
logger.finer("Trying to close input stream");
in.close();
} catch (IOException e) {
logger.severe("Failed to close input stream" + e);
throw new IOException("Error while closing input stream", e);
}
}
}
return tournament;
}
/**
* Serializables and saves the receiving tournament file to a txt file.
*
* @param tournament the receiving tournament.
* @throws IOException File not readable
* @throws FileNotFoundException File not found
*/
public void saveTournament(Tournament tournament) throws IOException, FileNotFoundException {
if (tournament == null) {
logger.warning("Given tournament file is empty");
throw new IllegalArgumentException("Null tournament received");
}
logger.fine("Creates the Object for the path of the save file");
File newSave = new File(saves, tournament.getName() + ".txt");
ObjectOutputStream out = null;
try {
logger.fine("creates or overwrites the new save FILE");
newSave.createNewFile();
out = new ObjectOutputStream(new FileOutputStream(newSave));
out.writeObject(tournament);
System.out.println("Save File " + tournament.getName() + ".txt being saved to " + saves.getAbsolutePath());
} catch (FileNotFoundException e) {
logger.severe("Could not find tournament File" + e);
throw e;
} catch (IOException e) {
logger.severe("Failed to write File " + tournament.getName() + e);
throw new IOException("Error while writing File", e);
} finally {
if (out != null) {
try {
out.close();
} catch (IOException e) {
logger.severe("Failed to close output stream" + e);
throw new IOException("Error while closing output stream", e);
}
}
}
}
/**
* Deletes the requested File in the directory
*
* @param tournamentFile the file that should be deleted
* @throws FileNotFoundException File could not be deleted
* @throws IllegalArgumentException File is null
*/
public void deleteTournament(File tournamentFile) throws FileNotFoundException {
if (tournamentFile == null) {
throw new IllegalArgumentException("Receiving file is null");
}
if (tournamentFile.delete()) {
logger.fine("deleted requested File");
} else {
logger.warning("Failed to delete requested File");
throw new FileNotFoundException("File deletion unsuccessful");
}
}
/**
* TournamentFile Class is in use to add missing functionality that is
*/
public class TournamentFile extends File {
/**
* Only job the constructor got is to initialize it via its superclass. See java.io.File Documentation for more info.
*
* @param uri abstract pathname needed for its superclass to intialize the file accordingly.
*/
public TournamentFile(URI uri) {
super(uri);
}
/**
* Method overrides toString to return the names of the tournaments without having .txt endings.
*
* @return String without a txt ending
*/
@Override
public String toString() {
return getName().split("\\.")[0];
}
}
}
@@ -1,16 +1,18 @@
package ch.zhaw.projekt2.turnierverwaltung; package ch.zhaw.projekt2.turnierverwaltung;
public class Game { import java.io.Serializable;
public class Game implements Serializable {
private Participant participant1, Participant2; private Participant participant1, Participant2;
private int points1, points2; private int points1, points2;
private Location location; private Place place;
public Location getLocation() { public Place getLocation() {
return location; return place;
} }
public void setLocation(Location location) { public void setLocation(Place place) {
this.location = location; this.place = place;
} }
public int getPoints1() { public int getPoints1() {
@@ -0,0 +1,12 @@
package ch.zhaw.projekt2.turnierverwaltung;
public class InvalidNameException extends Exception {
public InvalidNameException() {
super();
}
public InvalidNameException(String errorMessage) {
super(errorMessage);
}
}
@@ -0,0 +1,19 @@
package ch.zhaw.projekt2.turnierverwaltung;
/**
* Most basic interface for observing an object
* @author bles
*
*/
public interface IsObservable {
/**
* Add an observer that listens for updates
* @param observer
*/
void addListener(IsObserver observer);
/**
* Remove an observer from the list
* @param observer
*/
void removeListener(IsObserver observer);
}
@@ -0,0 +1,14 @@
package ch.zhaw.projekt2.turnierverwaltung;
/**
* Most basic interface for beeing an observer
* @author bles
*
*/
public interface IsObserver {
/**
* This method is always called when an observed object
* changes
*/
void update();
}
@@ -1,17 +0,0 @@
package ch.zhaw.projekt2.turnierverwaltung;
public class Location {
private String name;
public Location(String name){
setName(name);
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
@@ -0,0 +1,41 @@
package ch.zhaw.projekt2.turnierverwaltung;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.logging.*;
public class LogConfiguration {
private static final Logger logger = Logger.getLogger(LogConfiguration.class.getCanonicalName());
private final File mainDir;
public LogConfiguration(String saveLocation, String logFileLocation) throws IOException {
logger.fine("Starts setting up a main directory in which a folder with the log files will be placed, if not already exists");
this.mainDir = new File(saveLocation);
if (!mainDir.exists()) {
logger.fine("Creating main directory for log ordner in given path" + saveLocation);
mainDir.mkdir();
} else {
logger.finer("main directory for log folder already exists");
}
File saves = new File(mainDir, "log_files");
if (!saves.exists()) {
saves.mkdir();
logger.fine("Creating log save directory");
} else {
logger.finer("log save directory already exists");
}
String propertiesPath = "ch" + System.getProperty("file.separator") + "zhaw" + System.getProperty("file.separator") + "projekt2" + System.getProperty("file.separator") +
"turnierverwaltung" + System.getProperty("file.separator") + "logging" + System.getProperty("file.separator") + "log.properties";
logger.fine("Getting and reading logconfig file from " + propertiesPath);
InputStream logConfig = this.getClass().getClassLoader().getResourceAsStream(propertiesPath);
LogManager.getLogManager().readConfiguration(logConfig);
Logger.getLogger(LogConfiguration.class.getPackageName());
}
}
@@ -1,6 +1,9 @@
package ch.zhaw.projekt2.turnierverwaltung; package ch.zhaw.projekt2.turnierverwaltung;
public interface Participant { import java.io.Serializable;
public interface Participant extends Serializable {
String getName(); String getName();
void setName(String name); void setName(String name);
boolean equals(Participant participant);
} }
@@ -1,11 +1,23 @@
package ch.zhaw.projekt2.turnierverwaltung; package ch.zhaw.projekt2.turnierverwaltung;
public class Person { import java.io.Serializable;
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 String name; private String name;
private String firstName; private String firstName;
private String phoneNumber; private String phoneNumber;
public Person(String firstName, String name, String phoneNumber){ 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.");
}
setFirstName(firstName); setFirstName(firstName);
setName(name); setName(name);
setPhoneNumber(phoneNumber); setPhoneNumber(phoneNumber);
@@ -34,4 +46,21 @@ public class Person {
public void setPhoneNumber(String phoneNumber) { public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber; this.phoneNumber = phoneNumber;
} }
public class InvalidPhoneNumberException extends Exception {
public InvalidPhoneNumberException() {
super();
}
public InvalidPhoneNumberException(String errorMessage) {
super(errorMessage);
}
}
@Override
public String toString(){
return firstName + " " + name;
}
} }
@@ -0,0 +1,21 @@
package ch.zhaw.projekt2.turnierverwaltung;
public class Place {
private final String NAME_MATCHING_REGEX = "[a-zA-Z0-9]{1,20}";
private String name;
public Place(String name) throws InvalidNameException {
if(!name.matches(NAME_MATCHING_REGEX)){
throw new InvalidNameException("The Name is Invalid.");
}
setName(name);
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
@@ -1,21 +1,40 @@
package ch.zhaw.projekt2.turnierverwaltung; package ch.zhaw.projekt2.turnierverwaltung;
import java.util.Date; import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
public class Player extends Person implements Participant{ public class Player extends Person implements Participant{
private Date dateOfBirth; private LocalDate dateOfBirth;
public Player(String firstName, String name, String phoneNumber, Date dateOfBirth){ public Player(String firstName, String name, String phoneNumber, String dateOfBirth) throws InvalidNameException, InvalidPhoneNumberException {
super(firstName, name, phoneNumber); super(firstName, name, phoneNumber);
setDateOfBirth(dateOfBirth); setDateOfBirth(dateOfBirth);
} }
public Date getDateOfBirth() { public LocalDate getDateOfBirth() {
return dateOfBirth; return dateOfBirth;
} }
public void setDateOfBirth(Date dateOfBirth) { public String getFormatedDateOfBirth(){
this.dateOfBirth = dateOfBirth; try{
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy");
return dateOfBirth.format(formatter);
} catch (Exception e) {
//todo handle and logging
return "";
}
}
public void setDateOfBirth(String dateOfBirth) {
String[] date = dateOfBirth.split("\\.");
this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0]));
}
@Override
public boolean equals(Participant participant) {
return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
} }
} }
@@ -27,6 +27,11 @@ public class Team implements Participant {
this.name = name; this.name = name;
} }
@Override
public boolean equals(Participant participant) {
return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase());
}
public Person getContactPerson() { public Person getContactPerson() {
return contactPerson; return contactPerson;
} }
@@ -34,4 +39,9 @@ public class Team implements Participant {
public void setContactPerson(Person contactPerson) { public void setContactPerson(Person contactPerson) {
this.contactPerson = contactPerson; this.contactPerson = contactPerson;
} }
@Override
public String toString(){
return name;
}
} }
@@ -1,10 +1,76 @@
package ch.zhaw.projekt2.turnierverwaltung; package ch.zhaw.projekt2.turnierverwaltung;
public class Tournament { import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class Tournament implements Serializable {
private String name; private String name;
private Type type;
private List<Participant> participants;
private List<Place> places;
public Tournament(String name, Type type) throws InvalidNameException, InvalidTypeException {
if(!name.matches("[\\w]{1,20}")){
throw new InvalidNameException("Invalid Name entered"); //TODO handle en logging.
} else if(!Arrays.asList(Type.values()).contains(type)){
throw new InvalidTypeException("Invalid Type selected"); //TODO handle en logging.
}
public Tournament(String name){
setName(name); setName(name);
setType(type);
participants = new ArrayList<>();
}
public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
for(Participant participant : participants){
if(participant.equals(newParticipant)){
participants.remove(participant);
}
}
participants.add(newParticipant);
}
public void removeParticipant(Participant participant) throws ParticipantNotExistsException {
if(!participants.contains(participant)){
throw new ParticipantNotExistsException("The given Participant is not part of this Tournament");
}
participants.remove(participant);
}
public ObservableList<Participant> getParticipants() {
ObservableList<Participant> participantsObservable = FXCollections.observableArrayList();
participantsObservable.addAll(participants);
return participantsObservable;
}
public void addPlace(Place newPlace) throws PlaceExistsException {
for(Place place : places){
if(place.equals(newPlace)){
places.remove(place);
}
}
places.add(newPlace);
}
public void removePlace(Place place) throws PlaceNotExistsException {
if(!places.contains(place)){
throw new PlaceNotExistsException("The given Place is not part of this Tournament");
}
places.remove(place);
}
public ObservableList<Place> getPlaces() {
ObservableList<Place> placesObservable = FXCollections.observableArrayList();
placesObservable.addAll(places);
return placesObservable;
} }
public String getName() { public String getName() {
@@ -14,4 +80,90 @@ public class Tournament {
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
public Type getType() {
return type;
}
public void setType(Type type) {
this.type = type;
}
public enum Type {
KO("KO-System"), GROUPS("Gruppenspiele");
private String name;
private Type(String name) {
this.name = name;
}
@Override
public String toString() {
return name;
}
public static ObservableList<Type> getObservableList(){
ObservableList<Type> items = FXCollections.observableArrayList();
items.addAll(values());
return items;
}
}
public class InvalidTypeException extends Exception {
public InvalidTypeException() {
super();
}
public InvalidTypeException(String errorMessage) {
super(errorMessage);
}
}
public class ParticipantExistsException extends Exception {
public ParticipantExistsException() {
super();
}
public ParticipantExistsException(String errorMessage) {
super(errorMessage);
}
}
public class ParticipantNotExistsException extends Exception {
public ParticipantNotExistsException() {
super();
}
public ParticipantNotExistsException(String errorMessage) {
super(errorMessage);
}
}
public class PlaceExistsException extends Exception {
public PlaceExistsException() {
super();
}
public PlaceExistsException(String errorMessage) {
super(errorMessage);
}
}
public class PlaceNotExistsException extends Exception {
public PlaceNotExistsException() {
super();
}
public PlaceNotExistsException(String errorMessage) {
super(errorMessage);
}
}
} }
@@ -0,0 +1,129 @@
package ch.zhaw.projekt2.turnierverwaltung;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class TournamentDecorator implements IsObservable{
private Tournament tournament;
private FileIO fileIO;
private List<IsObserver> listener = new ArrayList<>();
public TournamentDecorator(FileIO fileIO){
setFileIO(fileIO);
addListener(new IsObserver() {
@Override
public void update() {
if(tournament != null){
saveTournament();
}
}
});
}
public void setFileIO(FileIO fileIO) {
this.fileIO = fileIO;
}
public void setTournament(Tournament tournament) {
this.tournament = tournament;
}
public Tournament getTournament() {
return tournament;
}
@Override
public void addListener(IsObserver observer) {
listener.add(observer);
}
@Override
public void removeListener(IsObserver observer) {
listener.remove(observer);
}
public void saveTournament(){
try {
fileIO.saveTournament(tournament);
} catch (IOException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void createTournament(String name, Tournament.Type type){
if(fileIO.tournamentExists(name)){
System.out.println("Tournament with same name exists already.");
return; //TODO handle and logging
}
try {
Tournament tournament = new Tournament(name, type);
fileIO.saveTournament(tournament);
informListener();
} catch (InvalidNameException e) {
e.printStackTrace(); //TODO handle and logging
} catch (Tournament.InvalidTypeException e) {
e.printStackTrace(); //TODO handle and logging
} catch (IOException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void deleteTournament(FileIO.TournamentFile tournamentFile){
try {
fileIO.deleteTournament(tournamentFile);
informListener();
} catch (IOException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){
try {
tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth));
informListener();
} catch (Tournament.ParticipantExistsException e) {
e.printStackTrace(); //TODO handle and logging
} catch (InvalidNameException e) {
e.printStackTrace(); //TODO handle and logging
} catch (Person.InvalidPhoneNumberException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void deleteParticipant(Participant participant){
try {
tournament.removeParticipant(participant);
informListener();
} catch (Tournament.ParticipantNotExistsException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void savePlace(String name){
try {
tournament.addPlace(new Place(name));
informListener();
} catch (Tournament.PlaceExistsException e) {
e.printStackTrace(); //TODO handle and logging
} catch (InvalidNameException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void deletePlace(Place place){
try {
tournament.removePlace(place);
informListener();
} catch (Tournament.PlaceNotExistsException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();
}
}
}
@@ -0,0 +1,40 @@
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 javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.Pane;
import javafx.stage.Stage;
import java.awt.*;
import java.io.IOException;
public class MainWindow extends Application {
private FileIO fileIO = new FileIO(System.getProperty("user.dir") + System.getProperty("file.separator") + "tournierverwaltung_angrynerds");
private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO);
private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private!
private FactoryDecorator factoryDecorator;
@Override
public void start(Stage primaryStage) throws Exception {
BorderPane pane = factory.loadMainWindow();
factoryDecorator = new FactoryDecorator(fileIO, factory, pane);
factory.loadTournamentList(pane, factoryDecorator);
Scene scene = new Scene(pane);
primaryStage.setScene(scene);
primaryStage.setMaximized(true);
primaryStage.setResizable(false);
primaryStage.setFullScreen(false);
primaryStage.show();
}
}
@@ -0,0 +1,23 @@
package ch.zhaw.projekt2.turnierverwaltung.main;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
public class MainWindowController extends FXController {
@FXML
void changeLangToGerman(ActionEvent event) {
}
@FXML
void closeApplication(ActionEvent event) {
}
@Override
public void loadContent() {
}
}
@@ -0,0 +1,16 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import javafx.fxml.FXML;
import javafx.scene.control.ChoiceBox;
public class GameController extends FXController {
@FXML
private ChoiceBox<?> placesChoiceBox;
@Override
public void loadContent() {
}
}
@@ -0,0 +1,24 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
public class GameScheduleController extends FXController {
@FXML
void openPlacesFormular(ActionEvent event) {
getFactoryDecorator().openPlacesFormular();
}
@FXML
void openParticipantFormular(ActionEvent event) {
getFactoryDecorator().openParticipantFormular();
}
@Override
public void loadContent() {
}
}
@@ -0,0 +1,99 @@
package ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.Participant;
import ch.zhaw.projekt2.turnierverwaltung.Player;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
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 ParticipantFormularController extends FXController {
@FXML
private Button addBtn;
@FXML
private Label birthDateLabel;
@FXML
private TextField birthDateTextField;
@FXML
private VBox changeBtn;
@FXML
private Label firstNameLabel;
@FXML
private TextField firstNameTextField;
@FXML
private GridPane grid;
@FXML
private Label newParticipantFormularTitle;
@FXML
private Button closeBtn;
@FXML
private Button deleteBtn;
@FXML
private Label participantListTitle;
@FXML
private ListView<Participant> participantListView;
@FXML
private Label participantNameLabel;
@FXML
private TextField participantNameTextField;
@FXML
private Label phoneNumberLabel;
@FXML
private TextField phoneNumberTextField;
@FXML
private Button 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());
}
@FXML
void saveParticipant(ActionEvent event) {
getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
}
@FXML
void delete(ActionEvent event) {
Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
getTournamentDecorator().deleteParticipant(participant);
}
@FXML
void close(ActionEvent event) {
getFactoryDecorator().openScheduleView();
}
@Override
public void loadContent() {
participantListView.setItems(getTournamentDecorator().getTournament().getParticipants());
}
}
@@ -0,0 +1,96 @@
package ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.Place;
import ch.zhaw.projekt2.turnierverwaltung.Player;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
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 Label birthDateLabel;
@FXML
private TextField birthDateTextField;
@FXML
private VBox changeBtn;
@FXML
private Label firstNameLabel;
@FXML
private TextField firstNameTextField;
@FXML
private GridPane grid;
@FXML
private Label newPlaceFormularTitle;
@FXML
private Button closeBtn;
@FXML
private Button deleteBtn;
@FXML
private Label placeListTitle;
@FXML
private ListView<Place> placeListView;
@FXML
private Label placeNameLabel;
@FXML
private TextField placeNameTextField;
@FXML
private Label phoneNumberLabel;
@FXML
private TextField phoneNumberTextField;
@FXML
private Button saveBtn;
@FXML
void changedSelection(MouseEvent event){
Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
placeNameTextField.setText(place.getName());
}
@FXML
void savePlace(ActionEvent event) {
getTournamentDecorator().savePlace(placeNameTextField.getText());
}
@FXML
void delete(ActionEvent event) {
Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
getTournamentDecorator().deletePlace(place);
}
@FXML
void close(ActionEvent event) {
getFactoryDecorator().openScheduleView();
}
@Override
public void loadContent() {
placeListView.setItems(getTournamentDecorator().getTournament().getPlaces());
}
}
@@ -0,0 +1,34 @@
package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
import java.io.IOException;
public class AlertDelete extends Alert {
ButtonType yesButton = new ButtonType("Ja", ButtonBar.ButtonData.YES);
ButtonType noButton = new ButtonType("Nein", ButtonBar.ButtonData.NO);
Boolean result;
public AlertDelete(String name){
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.");
getButtonTypes().setAll(yesButton, noButton);
}
public boolean showAndGetResult() {
result = false;
showAndWait().ifPresent(type -> {
if (type == yesButton) {
result = true;
}
});
return result;
}
}
@@ -0,0 +1,83 @@
package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.FileIO;
import ch.zhaw.projekt2.turnierverwaltung.Tournament;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.*;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.GridPane;
import java.io.File;
import java.io.IOException;
public class TournamentListController extends FXController {
@FXML
public void initialize(){
modusChoiceBox.setItems(Tournament.Type.getObservableList());
}
@FXML
private Button createBtn;
@FXML
private GridPane grid;
@FXML
private ChoiceBox<Tournament.Type> modusChoiceBox;
@FXML
private Label newTournamentFormularTitle;
@FXML
private Button openBtn;
@FXML
private Button deleteBtn;
@FXML
private Label tournamentListTitle;
@FXML
private ListView<FileIO.TournamentFile> tournamentListView;
@FXML
private Label tournamentModLabel;
@FXML
private Label tournamentNameLabel;
@FXML
private TextField tournamentNameField;
@FXML
void createTournament(ActionEvent event) {
getTournamentDecorator().createTournament(tournamentNameField.getText(), modusChoiceBox.getValue());
}
@FXML
void openTournament(ActionEvent event) {
FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
getFactoryDecorator().openTournament(tournamentFile);
}
@FXML
void deleteTournament(ActionEvent event) {
FileIO.TournamentFile tournamentFile = tournamentListView.getSelectionModel().getSelectedItems().get(0);
AlertDelete alert = new AlertDelete(tournamentFile.toString());
if(alert.showAndGetResult()){
getTournamentDecorator().deleteTournament(tournamentFile);
}
}
@Override
public void loadContent() {
tournamentListView.setItems(getFileIO().getList());
tournamentNameField.clear();
}
}
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.MainWindowController">
<top>
<VBox alignment="TOP_CENTER" prefHeight="86.0" prefWidth="600.0" BorderPane.alignment="CENTER">
<children>
<MenuBar>
<menus>
<Menu mnemonicParsing="false" text="Start">
<items>
<Menu mnemonicParsing="false" text="Sprache">
<items>
<MenuItem mnemonicParsing="false" onAction="#changeLangToGerman" text="Deutsch" />
</items>
</Menu>
<MenuItem mnemonicParsing="false" onAction="#closeApplication" text="Close" />
</items>
</Menu>
</menus>
</MenuBar>
<Label text="Turnier Manager">
<font>
<Font name="System Bold" size="40.0" />
</font>
</Label>
</children>
</VBox>
</top>
</BorderPane>
@@ -0,0 +1,10 @@
#mainContainer {
-fx-min-height: 100%;
-fx-min-width: 100%;
-fx-background-color: #f8f8f8;
}
/*
Formular Right Side
*/
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<VBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="150.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="GameContoller">
<children>
<Label fx:id="teamNameOne" text="Team One" />
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<Label text="Points">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Label>
<TextField fx:id="pointsTeamOne" prefHeight="25.0" prefWidth="50.0" />
</children>
</HBox>
<Label fx:id="teamNameTwo" text="Team Two" />
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<Label text="Points">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Label>
<TextField fx:id="pointsTeamTwo" prefHeight="25.0" prefWidth="50.0" />
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<Label text="Ort">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Label>
<ChoiceBox fx:id="placesChoiceBox" prefWidth="150.0" />
</children>
</HBox>
</children>
</VBox>
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView.GameScheduleController">
<top>
<HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<children>
<Button mnemonicParsing="false" onAction="#openParticipantFormular" text="Teilnehmer bearbeiten">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>
</Button>
<Button mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</Button>
</children>
</HBox>
</top>
</BorderPane>
@@ -0,0 +1,33 @@
## configures handlers
java.util.logging.ConsoleHandler.level = ALL
## File handler configuration
## see https://docs.oracle.com/en/java/javase/11/docs/api/java.logging/java/util/logging/FileHandler.html
java.util.logging.FileHandler.level = ALL
# %g = generation number, %u = unique number to resolve conflicts
java.util.logging.FileHandler.pattern = tournierverwaltung_angrynerds/log_files/log-%g-%u.log
# use SimpleFormatter instead of default XMLFormatter
java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
java.util.logging.FileHandler.encoding = UTF-8
# max log file size in byte before switching to next generation (=1kB); 0=unlimited
java.util.logging.FileHandler.limit = 2048
# max number of generations (%g) before overwriting (5 -> 0..4)
java.util.logging.FileHandler.count=10
java.util.logging.FileHandler.append=true
## configures Formatter
java.util.logging.SimpleFormatter.format = [%1$tc] %4$s: %5$s {%2$s}%6$s%n
## configures default log level (for all loggers, if not overwritten below)
.level = INFO
## configure root logger ""
handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
level = FINE
#ch.zhaw.prog2.turnierverwaltung.useParentHandlers = false
# logger level for individual classes
ch.zhaw.projekt2.turnierverwaltung.FileIO.level = FINEST
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.participantAddFormular.ParticipantFormularController">
<children>
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="participantListTitle" text="Hinzugefügt">
<font>
<Font name="System Bold" size="21.0" />
</font>
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Label>
<ListView fx:id="participantListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets />
</VBox.margin>
</ListView>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children>
<Button fx:id="closeBtn" mnemonicParsing="false" onAction="#close" text="Schliessen">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</Button>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#delete" text="Löschen">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</Button>
</children>
</HBox>
</children>
<HBox.margin>
<Insets left="40.0" />
</HBox.margin>
</VBox>
<Separator orientation="VERTICAL" prefHeight="200.0">
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Separator>
<VBox fx:id="changeBtn" alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="newParticipantFormularTitle" text="Teilnehmer ändern/erstellen">
<font>
<Font name="System Bold" size="21.0" />
</font>
<VBox.margin>
<Insets bottom="40.0" />
</VBox.margin>
</Label>
<Separator prefWidth="200.0" />
<GridPane fx:id="grid" prefHeight="200.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label fx:id="participantNameLabel" styleClass="lableGrid" text="Name">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="participantNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</TextField>
<Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
<Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
</children>
</GridPane>
<Separator prefWidth="200.0" />
<Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveParticipant" text="Speichern" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets bottom="10.0" top="30.0" />
</VBox.margin>
</Button>
</children>
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</VBox>
</children>
</HBox>
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
<children>
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="placeListTitle" text="Hinzugefügt">
<font>
<Font name="System Bold" size="21.0" />
</font>
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Label>
<ListView fx:id="placeListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets />
</VBox.margin>
</ListView>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children>
<Button fx:id="closeBtn" mnemonicParsing="false" onAction="#close" text="Schliessen">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</Button>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#delete" text="Löschen">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</Button>
</children>
</HBox>
</children>
<HBox.margin>
<Insets left="40.0" />
</HBox.margin>
</VBox>
<Separator orientation="VERTICAL" prefHeight="200.0">
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Separator>
<VBox fx:id="changeBtn" alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="newplaceFormularTitle" text="Teilnehmer ändern/erstellen">
<font>
<Font name="System Bold" size="21.0" />
</font>
<VBox.margin>
<Insets bottom="40.0" />
</VBox.margin>
</Label>
<Separator prefWidth="200.0" />
<GridPane fx:id="grid" prefHeight="200.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label fx:id="placeNameLabel" styleClass="lableGrid" text="Name">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="placeNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</TextField>
<Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
<Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
</children>
</GridPane>
<Separator prefWidth="200.0" />
<Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#savePlace" text="Speichern" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets bottom="10.0" top="30.0" />
</VBox.margin>
</Button>
</children>
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</VBox>
</children>
</HBox>
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<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.tournamentList.TournamentListController">
<children>
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="tournamentListTitle" text="Bestehende Turniere">
<font>
<Font name="System Bold" size="21.0" />
</font>
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Label>
<ListView fx:id="tournamentListView" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets />
</VBox.margin>
</ListView>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<VBox.margin>
<Insets bottom="20.0" top="40.0" />
</VBox.margin>
<children>
<Button fx:id="openBtn" mnemonicParsing="false" onAction="#openTournament" text="Öffnen">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin></Button>
<Button fx:id="deleteBtn" layoutX="138.0" layoutY="28.0" mnemonicParsing="false" onAction="#deleteTournament" text="Löschen">
<HBox.margin>
<Insets />
</HBox.margin></Button>
</children>
</HBox>
</children>
<HBox.margin>
<Insets left="40.0" />
</HBox.margin>
</VBox>
<Separator orientation="VERTICAL" prefHeight="200.0">
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Separator>
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="newTournamentFormularTitle" text="Neues Turnier erstellen">
<font>
<Font name="System Bold" size="21.0" />
</font>
<VBox.margin>
<Insets bottom="40.0" />
</VBox.margin></Label>
<Separator prefWidth="200.0" />
<GridPane fx:id="grid" prefHeight="200.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label fx:id="tournamentNameLabel" styleClass="lableGrid" text="Turnier Name:">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="tournamentNameField" styleClass="inputGrid" GridPane.columnIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</TextField>
<Label fx:id="tournamentModLabel" styleClass="lableGrid" text="Turnier Modus:" GridPane.rowIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<ChoiceBox fx:id="modusChoiceBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
</children>
</GridPane>
<Separator prefWidth="200.0" />
<Button fx:id="createBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#createTournament" text="Erstellen" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets bottom="20.0" top="40.0" />
</VBox.margin></Button>
</children>
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</VBox>
</children>
</HBox>
@@ -1,14 +0,0 @@
/*
* This Java source file was generated by the Gradle 'init' task.
*/
package ch.zhaw.projekt2.turnierverwaltung;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
class AppTest {
@Test void appHasAGreeting() {
App classUnderTest = new App();
assertNotNull(classUnderTest.getGreeting(), "app should have a greeting");
}
}
@@ -0,0 +1,157 @@
package ch.zhaw.projekt2.turnierverwaltung;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Comparator;
import java.util.List;
import java.util.logging.Logger;
import static org.junit.jupiter.api.Assertions.*;
class FileIOTest {
String RESOURCES_DIR = "./src/test/resources/ch/zhaw/projekt2/turnierverwaltung/";
String mainDir;
String saveDir;
FileIO io;
@Test
void FileIONewDir() throws IOException {
mainDir = RESOURCES_DIR + "FileIONew";
saveDir = mainDir + "/saves";
File mainDirFile = new File(mainDir);
File saveDirFile = new File(mainDir);
try{
Files.walk(mainDirFile.toPath())
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
} catch (IOException e) {
e.printStackTrace();
}
assertFalse(mainDirFile.exists());
assertFalse(saveDirFile.exists());
io = new FileIO(mainDir);
assertTrue(mainDirFile.exists());
assertTrue(saveDirFile.exists());
Files.walk(mainDirFile.toPath())
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
assertFalse(mainDirFile.exists());
assertFalse(saveDirFile.exists());
}
@Nested
class Read{
@BeforeEach
void init() {
mainDir = RESOURCES_DIR + "FileIORead";
io = new FileIO(mainDir);
}
@Test
void getList() {
List<FileIO.TournamentFile> tournaments = io.getList();
assertEquals("empty.txt", tournaments.get(0).getName());
assertEquals("test1.txt", tournaments.get(1).getName());
}
@Test
void getListEmpty() {
mainDir = RESOURCES_DIR + "FileIOEmpty";
io = new FileIO(mainDir);
assertEquals(0, io.getList().size());
}
@Test
void loadTournament() throws IOException, ClassNotFoundException {
mainDir = RESOURCES_DIR + "FileIORead";
io = new FileIO(mainDir);
Tournament tournament = io.loadTournament(new File(mainDir + "/saves/test1.txt"));
assertEquals("test1", tournament.getName());
}
@Test
void loadTournamentNotExisting(){
File file = new File("Not-existing-File");
assertFalse(file.exists());
assertThrows(FileNotFoundException.class, () -> io.loadTournament(file));
assertFalse(file.exists());
}
@Test
void loadTournamentEmpty(){
assertThrows(IOException.class, () -> io.loadTournament(new File(mainDir + "/saves/empty.txt")));
}
@Test
void loadTournamentFileNull(){
assertThrows(IllegalArgumentException.class, () -> io.loadTournament(null));
}
}
@Nested
class Save{
@BeforeEach
void setup(){
mainDir = RESOURCES_DIR + "FileIOSave";
io = new FileIO(mainDir);
}
@Test
void saveTournament() throws IOException, InvalidNameException, Tournament.InvalidTypeException {
Tournament tournament = null;
tournament = new Tournament("test1", Tournament.Type.KO);
io.saveTournament(tournament);
File file = new File(mainDir + "/saves/test1.txt");
assertTrue(file.exists());
assertTrue(file.delete());
assertFalse(file.exists());
}
@Test
void saveTournamentNull(){
assertThrows(IllegalArgumentException.class, () -> io.saveTournament(null));
}
}
@Nested
class Delete{
@BeforeEach
void setup(){
mainDir = RESOURCES_DIR + "FileIODelete";
io = new FileIO(mainDir);
}
@Test
void deleteTournament() throws IOException {
File file = new File(mainDir + "/saves/test1.txt");
file.createNewFile();
assertTrue(file.exists());
io.deleteTournament(file);
assertFalse(file.exists());
}
@Test
void deleteTournamentNotExisting() throws IOException {
File file = new File("Not-existing-File");
assertFalse(file.exists());
assertThrows(FileNotFoundException.class, () -> io.deleteTournament(file));
assertFalse(file.exists());
}
@Test
void deleteTournamentNull(){
assertThrows(IllegalArgumentException.class, () -> io.deleteTournament(null));
}
}
}
Vendored
+2 -2
View File
@@ -46,7 +46,7 @@ echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo place of your Java installation.
goto fail goto fail
@@ -60,7 +60,7 @@ echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo place of your Java installation.
goto fail goto fail