Compare commits

..
Author SHA1 Message Date
schrom01 3d13dbcb45 changed ParticipantFormular to change existing objects and don't replace them.
changed ParticipantFormular and PlacesFormular to clear textfields after saving.
solved #19
2022-05-07 11:53:10 +02:00
schrom01 02456bc5bf fixed participanFormular and placesFormular
#19
2022-05-06 09:23:19 +02:00
schrom01 f3495d28d6 fixed functionality Places Formular 2022-05-01 23:35:25 +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
16 changed files with 278 additions and 102 deletions
@@ -61,6 +61,10 @@ public class FactoryDecorator implements IsObservable{
factory.loadPlacesFormular((BorderPane) pane, this);
}
public void openScheduleView() {
factory.loadGameScheduler((BorderPane) pane, this);
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();
@@ -11,14 +11,20 @@ import java.util.Arrays;
import java.util.List;
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.getName());
/**
* 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()) {
@@ -37,6 +43,11 @@ public class FileIO {
}
}
/**
* 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();
@@ -56,12 +67,15 @@ public class FileIO {
}
/**
* @param tournamentFile
* @return
* @throws ClassNotFoundException
* @throws IOException File not found or not readable.
* 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 {
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");
@@ -80,10 +94,10 @@ public class FileIO {
throw e;
} catch (IOException e) {
logger.severe("Failed to read File" + tournamentFile.getName());
throw new IOException("Error while reading File",e);
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");
throw new ClassNotFoundException("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 {
@@ -91,37 +105,49 @@ public class FileIO {
in.close();
} catch (IOException e) {
logger.severe("Failed to close input stream");
throw new IOException("Error while closing input stream",e);
throw new IOException("Error while closing input stream", e);
}
}
}
return tournament;
}
public void saveTournament(Tournament tournament) throws IOException {
/**
* 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 {
boolean newFile = newSave.createNewFile();
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) {
throw new RuntimeException(e);
logger.severe("Could not find tournament File");
throw e;
} catch (IOException e) {
throw new RuntimeException(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) {
throw new RuntimeException(e);
logger.severe("Failed to close output stream");
throw new IOException("Error while closing output stream", e);
}
}
@@ -129,6 +155,25 @@ public class FileIO {
}
/**
* 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");
}
}
public class TournamentFile extends File{
public TournamentFile(URI uri) {
@@ -141,8 +186,4 @@ public class FileIO {
}
public void deleteTournament(File tournamentFile) throws IOException {
throw new UnsupportedOperationException("Method deleteTournament not implemented yet.");
}
}
@@ -5,14 +5,14 @@ import java.io.Serializable;
public class Game implements Serializable {
private Participant participant1, Participant2;
private int points1, points2;
private Location location;
private Place place;
public Location getLocation() {
return location;
public Place getLocation() {
return place;
}
public void setLocation(Location location) {
this.location = location;
public void setLocation(Place place) {
this.place = place;
}
public int getPoints1() {
@@ -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;
}
}
@@ -6,4 +6,5 @@ public interface Participant extends Serializable {
String getName();
void setName(String name);
boolean equals(Participant participant);
void change(Participant participant);
}
@@ -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;
@@ -0,0 +1,32 @@
package ch.zhaw.projekt2.turnierverwaltung;
import java.io.Serializable;
public class Place implements Serializable {
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;
}
@Override
public String toString(){
return name;
}
public boolean equals(Place place){
return name.equals(place.getName());
}
}
@@ -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());
}
}
@@ -27,11 +27,24 @@ public class Team implements Participant {
this.name = name;
}
public void setPlayers(List<Player> players) {
this.players = players;
}
public List<Player> 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;
}
@@ -7,12 +7,14 @@ import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
public class Tournament implements Serializable {
private String name;
private Type type;
private List<Participant> participants;
private List<Place> places;
@@ -26,12 +28,14 @@ public class Tournament implements Serializable {
setName(name);
setType(type);
participants = new ArrayList<>();
places = new ArrayList<>();
}
public void addParticipant(Participant newParticipant) throws ParticipantExistsException {
for(Participant participant : participants){
public void saveParticipant(Participant newParticipant) throws ParticipantExistsException {
for(Participant participant: participants){
if(participant.equals(newParticipant)){
participants.remove(participant);
participant.change(newParticipant);
return;
}
}
participants.add(newParticipant);
@@ -50,6 +54,24 @@ public class Tournament implements Serializable {
return participantsObservable;
}
public void addPlace(Place newPlace) throws PlaceExistsException {
places.removeIf(place -> place.equals(newPlace));
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() {
return name;
}
@@ -120,5 +142,27 @@ public class Tournament implements Serializable {
}
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);
}
}
}
@@ -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
@@ -101,6 +100,26 @@ public class TournamentDecorator implements IsObservable{
}
}
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();
@@ -76,27 +76,28 @@ public class ParticipantFormularController extends FXController {
birthDateTextField.setText(participant.getFormatedDateOfBirth());
}
@FXML
void changeParticipant(MouseEvent event) {
}
@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
void delete(ActionEvent event) {
System.out.println("delete");
Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
getTournamentDecorator().deleteParticipant(participant);
}
@FXML
void close(ActionEvent event) {
getFactoryDecorator().openScheduleView();
}
@Override
@@ -1,6 +1,8 @@
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;
@@ -9,11 +11,21 @@ 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 Label AddListTitle;
private Button addBtn;
@FXML
private VBox changeBtn;
@FXML
private GridPane grid;
@FXML
private Label newPlaceFormularTitle;
@FXML
private Button closeBtn;
@@ -21,46 +33,51 @@ public class PlacesFormularController extends FXController {
@FXML
private Button deleteBtn;
@FXML
private GridPane grid;
@FXML
private ListView<?> locationListView;
private Label placeListTitle;
@FXML
private Label locationNameLabel;
private ListView<Place> placeListView;
@FXML
private TextField locationNameTextField;
private Label placeNameLabel;
@FXML
private Label newLocationFormularTitle;
private TextField placeNameTextField;
@FXML
private Button saveBtn;
@FXML
void changedSelection(MouseEvent event) {
void changedSelection(MouseEvent event){
Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
placeNameTextField.setText(place.getName());
}
@FXML
void closeFormular(ActionEvent event) {
void savePlace(ActionEvent event) {
getTournamentDecorator().savePlace(placeNameTextField.getText());
clearFormular();
}
private void clearFormular() {
placeNameTextField.clear();
}
@FXML
void deleteSelectedPlace(ActionEvent event) {
void delete(ActionEvent event) {
Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
getTournamentDecorator().deletePlace(place);
}
@FXML
void saveLocation(ActionEvent event) {
void close(ActionEvent event) {
getFactoryDecorator().openScheduleView();
}
@Override
public void loadContent() {
placeListView.setItems(getTournamentDecorator().getTournament().getPlaces());
}
}
@@ -53,7 +53,7 @@
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Separator>
<VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<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>
@@ -1,23 +1,15 @@
<?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?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="404.0" prefWidth="635.0" xmlns="http://javafx.com/javafx/17" 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/11.0.2" 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">
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="AddListTitle" text="Hinzugefügt">
<Label fx:id="placeListTitle" text="Hinzugefügt">
<font>
<Font name="System Bold" size="21.0" />
</font>
@@ -25,30 +17,38 @@
<Insets bottom="20.0" />
</VBox.margin>
</Label>
<ListView fx:id="locationListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<ListView fx:id="placeListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets left="10.0" right="10.0" />
</VBox.margin>
<opaqueInsets>
<Insets />
</opaqueInsets>
</VBox.margin>
</ListView>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children>
<Button fx:id="closeBtn" mnemonicParsing="false" onAction="#closeFormular" text="Schliessen">
<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>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteSelectedPlace" text="Löschen" />
</children>
</HBox>
</children>
<HBox.margin>
<Insets left="40.0" />
</HBox.margin>
</VBox>
<Separator orientation="VERTICAL" prefHeight="200.0" />
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
<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="newLocationFormularTitle" text="Austragungsort bearbeiten/erstellen">
<Label fx:id="newplaceFormularTitle" text="Ort ändern/erstellen">
<font>
<Font name="System Bold" size="21.0" />
</font>
@@ -64,14 +64,17 @@
</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="locationNameLabel" styleClass="lableGrid" text="Austragungsort">
<Label fx:id="placeNameLabel" styleClass="lableGrid" text="Name">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="locationNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
<TextField fx:id="placeNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
@@ -79,12 +82,15 @@
</children>
</GridPane>
<Separator prefWidth="200.0" />
<Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveLocation" text="Speichern" VBox.vgrow="ALWAYS">
<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>
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.
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
@@ -60,7 +60,7 @@ echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
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