From 22cc69ecf73e67a658600413939b1cc40bfa4ba2 Mon Sep 17 00:00:00 2001 From: Kevin Pfannenstiel Date: Fri, 3 Feb 2023 14:07:30 +0100 Subject: [PATCH] bug fixes --- pom.xml | 2 +- .../java/com/example/vpr_javafx/Data.java | 4 +- .../com/example/vpr_javafx/LoginDatei.java | 42 --------- ...oApplication.java => MainApplication.java} | 6 +- ...lloController.java => MainController.java} | 3 +- .../example/vpr_javafx/MenuOverview-view.fxml | 2 +- .../example/vpr_javafx/MenuSelect-view.fxml | 2 +- .../com/example/vpr_javafx/Order-view.fxml | 2 +- .../example/vpr_javafx/Registration-view.fxml | 2 +- .../com/example/vpr_javafx/hello-view.fxml | 2 +- .../classes/com/example/vpr_javafx/Data.class | Bin 12298 -> 12294 bytes .../example/vpr_javafx/HelloApplication.class | Bin 1528 -> 0 bytes .../example/vpr_javafx/HelloController.class | Bin 13687 -> 0 bytes .../example/vpr_javafx/MenuOverview-view.fxml | 2 +- .../example/vpr_javafx/MenuSelect-view.fxml | 2 +- .../com/example/vpr_javafx/Order-view.fxml | 2 +- .../example/vpr_javafx/Registration-view.fxml | 86 ++++++++++++++---- .../com/example/vpr_javafx/hello-view.fxml | 2 +- 18 files changed, 83 insertions(+), 78 deletions(-) delete mode 100644 src/main/java/com/example/vpr_javafx/LoginDatei.java rename src/main/java/com/example/vpr_javafx/{HelloApplication.java => MainApplication.java} (70%) rename src/main/java/com/example/vpr_javafx/{HelloController.java => MainController.java} (99%) delete mode 100644 target/classes/com/example/vpr_javafx/HelloApplication.class delete mode 100644 target/classes/com/example/vpr_javafx/HelloController.class diff --git a/pom.xml b/pom.xml index 4df0b03..6f68185 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ default-cli - com.example.vpr_javafx/com.example.vpr_javafx.HelloApplication + com.example.vpr_javafx/com.example.vpr_javafx.MainApplication diff --git a/src/main/java/com/example/vpr_javafx/Data.java b/src/main/java/com/example/vpr_javafx/Data.java index 9c9251f..d114d59 100644 --- a/src/main/java/com/example/vpr_javafx/Data.java +++ b/src/main/java/com/example/vpr_javafx/Data.java @@ -289,7 +289,7 @@ public class Data { * @return phoneNumberValid, passwordValid * @author Kevin Maier, Kevin Pfannenstiel */ - public boolean validateData(TextField tfPhone, PasswordField pfPassword, HelloController controller) + public boolean validateData(TextField tfPhone, PasswordField pfPassword, MainController controller) { boolean phoneNumberMatchFound; boolean passwordMatchFound; @@ -411,7 +411,7 @@ public class Data { * @param controller Controller * @return phoneNumberValid, passwordValid, postalCodeValid */ - public boolean validateRegistration(TextField tfName, TextField tfPhone, PasswordField pfPassword, TextField tfStreet, TextField tfHouseNumber, TextField tfPostalCode, TextField tfCity, TextField tfChild, HelloController controller) + public boolean validateRegistration(TextField tfName, TextField tfPhone, PasswordField pfPassword, TextField tfStreet, TextField tfHouseNumber, TextField tfPostalCode, TextField tfCity, TextField tfChild, MainController controller) { boolean phoneNumberMatchFound; boolean passwordMatchFound; diff --git a/src/main/java/com/example/vpr_javafx/LoginDatei.java b/src/main/java/com/example/vpr_javafx/LoginDatei.java deleted file mode 100644 index 54da77d..0000000 --- a/src/main/java/com/example/vpr_javafx/LoginDatei.java +++ /dev/null @@ -1,42 +0,0 @@ -//package com.example.vpr_javafx; -// -//import java.io.IOException; -//import java.nio.file.Files; -//import java.nio.file.Paths; -//import java.util.HashMap; -//import java.util.List; -// -//public class LoginDatei -//{ -// private final String dateiname; -// -// public LoginDatei(String dateiname) -// { -// this.dateiname = dateiname; -// } -// -// public HashMap readFile() -// { -// try { -// List lines = Files.readAllLines(Paths.get(dateiname)); -// -// HashMap user = new HashMap<>(); -// -// for (int i = 0; i < lines.size(); i++) -// { -// String[] parts = lines.get(i).split(";"); -// -// String phoneNumber = parts[3]; -// String password = parts[5]; -// -// user.put(phoneNumber, password); -// } -// -// return user; -// -// } catch (IOException e) { -// e.printStackTrace(); -// return new HashMap<>(); -// } -// } -//} diff --git a/src/main/java/com/example/vpr_javafx/HelloApplication.java b/src/main/java/com/example/vpr_javafx/MainApplication.java similarity index 70% rename from src/main/java/com/example/vpr_javafx/HelloApplication.java rename to src/main/java/com/example/vpr_javafx/MainApplication.java index 137b8bb..5e73d97 100644 --- a/src/main/java/com/example/vpr_javafx/HelloApplication.java +++ b/src/main/java/com/example/vpr_javafx/MainApplication.java @@ -7,15 +7,15 @@ import javafx.stage.Stage; import java.io.IOException; -public class HelloApplication extends Application { +public class MainApplication extends Application { @Override public void start(Stage stage) throws IOException { - FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("MenuOverview-view.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("MenuOverview-view.fxml")); Scene scene = new Scene(fxmlLoader.load(),1000, 800); stage.setTitle("Mittagsbestellung"); stage.setScene(scene); stage.show(); - HelloController controller = fxmlLoader.getController(); + MainController controller = fxmlLoader.getController(); controller.FillLabels(); controller.writeAllergene(); } diff --git a/src/main/java/com/example/vpr_javafx/HelloController.java b/src/main/java/com/example/vpr_javafx/MainController.java similarity index 99% rename from src/main/java/com/example/vpr_javafx/HelloController.java rename to src/main/java/com/example/vpr_javafx/MainController.java index ceecaa3..025dbd6 100644 --- a/src/main/java/com/example/vpr_javafx/HelloController.java +++ b/src/main/java/com/example/vpr_javafx/MainController.java @@ -12,7 +12,6 @@ import javafx.scene.Scene; import javafx.scene.control.*; import javafx.scene.image.Image; import javafx.scene.image.ImageView; -import javafx.scene.layout.AnchorPane; import javafx.scene.layout.StackPane; import javafx.stage.Stage; import java.io.FileWriter; @@ -22,7 +21,7 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -public class HelloController { +public class MainController { @FXML private Label lMonH1; diff --git a/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml b/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml index b086191..104e4af 100644 --- a/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml +++ b/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml @@ -7,7 +7,7 @@ - +