diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java index 15a07cc..2099098 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/App.java @@ -6,18 +6,8 @@ package ch.zhaw.projekt2.turnierverwaltung; import ch.zhaw.projekt2.turnierverwaltung.main.MainWindow; import javafx.application.Application; -import java.io.IOException; - public class App { public static void main(String[] args) { - 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); } } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java index 14b76f0..05bc85e 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java @@ -6,6 +6,9 @@ import javafx.collections.ObservableList; import java.io.*; import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.logging.Logger; /** @@ -15,7 +18,7 @@ public class FileIO { private File mainDir; private File saves; - private static final Logger logger = Logger.getLogger(FileIO.class.getCanonicalName()); + private static final Logger logger = Logger.getLogger(FileIO.class.getName()); /** * Constructor initiates the Directory and creates a save folder if not already existing. @@ -40,7 +43,6 @@ public class FileIO { } } - /** * Returns a list with all save Files that are located inside the save folder. * @@ -49,26 +51,18 @@ public class FileIO { public ObservableList getList() { logger.fine("Creating a List out of all Files in the save directory and returning it"); ObservableList tournamentFiles = FXCollections.observableArrayList(); - for (File tournament : saves.listFiles()) { + 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"); + public boolean tournamentExists(String name){ + for(TournamentFile file : getList()) { + if(file.toString().toLowerCase().equals(name.toLowerCase())){ return true; } } - logger.fine(name + " is an unique name in the list"); return false; } @@ -96,13 +90,13 @@ public class FileIO { logger.finer("Starting to read tournament File"); tournament = (Tournament) in.readObject(); } catch (FileNotFoundException e) { - logger.severe("Could not find tournament File" + e); + logger.severe("Could not find tournament File"); 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); + logger.severe("No definition for the class with the specified name could be found"); throw new ClassNotFoundException("No definition for the class with the specified name could be found", e); } finally { if (in != null) { @@ -110,7 +104,7 @@ public class FileIO { logger.finer("Trying to close input stream"); in.close(); } catch (IOException e) { - logger.severe("Failed to close input stream" + e); + logger.severe("Failed to close input stream"); throw new IOException("Error while closing input stream", e); } } @@ -139,20 +133,20 @@ public class FileIO { newSave.createNewFile(); out = new ObjectOutputStream(new FileOutputStream(newSave)); out.writeObject(tournament); - System.out.println("Save File " + tournament.getName() + ".txt being saved to " + saves.getAbsolutePath()); + System.out.println("Save File" + tournament.getName() + ".txt being saved to " + saves.getAbsolutePath()); } catch (FileNotFoundException e) { - logger.severe("Could not find tournament File" + e); + logger.severe("Could not find tournament File"); throw e; } catch (IOException e) { - logger.severe("Failed to write File " + tournament.getName() + e); + logger.severe("Failed to write File" + tournament.getName()); 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); + logger.severe("Failed to close output stream"); throw new IOException("Error while closing output stream", e); } } @@ -179,28 +173,14 @@ public class FileIO { throw new FileNotFoundException("File deletion unsuccessful"); } } + + public class TournamentFile extends File{ - /** - * 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() { + public String toString(){ return getName().split("\\.")[0]; } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LogConfiguration.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LogConfiguration.java deleted file mode 100644 index b15c578..0000000 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LogConfiguration.java +++ /dev/null @@ -1,41 +0,0 @@ -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()); - } -} diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java index 6f85290..31300f5 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Participant.java @@ -6,4 +6,5 @@ public interface Participant extends Serializable { String getName(); void setName(String name); boolean equals(Participant participant); + void change(Participant participant); } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java index 9cf624f..73e598b 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Person.java @@ -4,7 +4,7 @@ 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 final String PHONE_MATCHING_REGEX = "[\\+]?[0-9]*"; private String name; private String firstName; diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java index 3165364..29bb2c6 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Player.java @@ -29,12 +29,27 @@ public class Player extends Person implements Participant{ } 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])); + if(dateOfBirth.length() > 0) { + String[] date = dateOfBirth.split("\\."); + this.dateOfBirth = LocalDate.of(Integer.valueOf(date[2]), Integer.valueOf(date[1]), Integer.valueOf(date[0])); + } else { + dateOfBirth = null; + } + } + + public void setDateOfBirth(LocalDate dateOfBirth) { + this.dateOfBirth = dateOfBirth; } @Override public boolean equals(Participant participant) { return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase()); } + + @Override + public void change(Participant participant) { + Player player = (Player) participant; + setDateOfBirth(player.getDateOfBirth()); + setPhoneNumber(player.getPhoneNumber()); + } } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java index e815a16..8a2a0ba 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Team.java @@ -27,11 +27,24 @@ public class Team implements Participant { this.name = name; } + public void setPlayers(List players) { + this.players = players; + } + + public List getPlayers() { + return players; + } + @Override public boolean equals(Participant participant) { return getClass().equals(participant.getClass()) && toString().toLowerCase().equals(participant.toString().toLowerCase()); } + @Override + public void change(Participant participant) { + return; + } + public Person getContactPerson() { return contactPerson; } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java index b4097d5..21c9a5e 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java @@ -31,8 +31,13 @@ public class Tournament implements Serializable { places = new ArrayList<>(); } - public void addParticipant(Participant newParticipant) throws ParticipantExistsException { - participants.removeIf(participant -> participant.equals(newParticipant)); + public void saveParticipant(Participant newParticipant) throws ParticipantExistsException { + for(Participant participant: participants){ + if(participant.equals(newParticipant)){ + participant.change(newParticipant); + return; + } + } participants.add(newParticipant); } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java index dcb3112..6f28efd 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java @@ -2,7 +2,6 @@ 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{ @@ -81,7 +80,7 @@ public class TournamentDecorator implements IsObservable{ public void savePlayer(String firstName, String name, String phoneNumber, String dateOfBirth){ try { - tournament.addParticipant(new Player(firstName, name, phoneNumber, dateOfBirth)); + tournament.saveParticipant(new Player(firstName, name, phoneNumber, dateOfBirth)); informListener(); } catch (Tournament.ParticipantExistsException e) { e.printStackTrace(); //TODO handle and logging diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java index c1f059e..290b1e6 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java @@ -15,7 +15,7 @@ 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 FileIO fileIO = new FileIO(System.getProperty("user.dir") + "/tournierverwaltung_angrynerds"); private TournamentDecorator tournamentDecorator = new TournamentDecorator(fileIO); private Factory factory = new Factory(fileIO, tournamentDecorator); //TODO make it private! private FactoryDecorator factoryDecorator; diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java index 0528301..8492fdd 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java @@ -79,6 +79,14 @@ public class ParticipantFormularController extends FXController { @FXML void saveParticipant(ActionEvent event) { getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText()); + clearFormular(); + } + + private void clearFormular() { + firstNameTextField.clear(); + participantNameTextField.clear(); + phoneNumberTextField.clear(); + birthDateTextField.clear(); } @FXML diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java index c5534e5..036fb4f 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java @@ -58,6 +58,11 @@ public class PlacesFormularController extends FXController { @FXML void savePlace(ActionEvent event) { getTournamentDecorator().savePlace(placeNameTextField.getText()); + clearFormular(); + } + + private void clearFormular() { + placeNameTextField.clear(); } @FXML diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/logging/log.properties b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/logging/log.properties deleted file mode 100644 index c8eaee4..0000000 --- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/logging/log.properties +++ /dev/null @@ -1,33 +0,0 @@ -## 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