From fc4b44fa4740387f6b62374573bc4e5702b65968 Mon Sep 17 00:00:00 2001 From: Kevin Pfannenstiel Date: Mon, 30 Jan 2023 19:30:20 +0100 Subject: [PATCH 1/2] Bugs bisschen entfernt --- .../java/com/example/vpr_javafx/Data.java | 2 +- .../example/vpr_javafx/HelloController.java | 2 +- .../java/com/example/vpr_javafx/Menu.java | 2 + .../example/vpr_javafx/MenuOverview-view.fxml | 30 +++--- .../example/vpr_javafx/HelloController.class | Bin 6485 -> 5801 bytes .../classes/com/example/vpr_javafx/Menu.class | Bin 1828 -> 2037 bytes .../example/vpr_javafx/MenuOverview-view.fxml | 91 +++++++++--------- .../example/vpr_javafx/Registration-view.fxml | 39 ++++++-- 8 files changed, 99 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/example/vpr_javafx/Data.java b/src/main/java/com/example/vpr_javafx/Data.java index 88cfd5c..f9319f9 100644 --- a/src/main/java/com/example/vpr_javafx/Data.java +++ b/src/main/java/com/example/vpr_javafx/Data.java @@ -262,7 +262,7 @@ public class Data { * The method validates the user input * * @return boolean inputValid - * @author Kevin Maier + * @author Kevin Maier, Kevin Pfannenstiel */ public boolean validateData(TextField tfPhone, PasswordField pfPassword) { diff --git a/src/main/java/com/example/vpr_javafx/HelloController.java b/src/main/java/com/example/vpr_javafx/HelloController.java index 3b83fce..ff06b9d 100644 --- a/src/main/java/com/example/vpr_javafx/HelloController.java +++ b/src/main/java/com/example/vpr_javafx/HelloController.java @@ -138,7 +138,7 @@ public class HelloController { imageUrl=veganUrl; } - Image image = new Image("C:/Unterricht/VPR_Projekt/target/classes/com/example/vpr_javafx/" + imageUrl); + Image image = new Image("C:/VPR_Projekt_Java/target/classes/com/example/vpr_javafx/" + imageUrl); switch (i) { case 0: diff --git a/src/main/java/com/example/vpr_javafx/Menu.java b/src/main/java/com/example/vpr_javafx/Menu.java index 47296bd..d4e58d9 100644 --- a/src/main/java/com/example/vpr_javafx/Menu.java +++ b/src/main/java/com/example/vpr_javafx/Menu.java @@ -71,6 +71,7 @@ public class Menu { /** * The method toString() returns fomated dishdata + * * @return a String with dish, sideDish, list of ingredients and the typ of the menu * @author Madeleine Vigier */ @@ -81,3 +82,4 @@ public class Menu { + type + '\n' + ingredients; } +} 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 9b6e622..29f3851 100644 --- a/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml +++ b/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml @@ -1,18 +1,13 @@ - - - - - - - - - - - + + + + + + - + diff --git a/target/classes/com/example/vpr_javafx/HelloController.class b/target/classes/com/example/vpr_javafx/HelloController.class index bde13864374e1ffcd07b24795aa932534e913a14..bb2cb28f7a838d9300200473e782bbf0296cd68b 100644 GIT binary patch literal 5801 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 literal 6485 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 C+H3Ft diff --git a/target/classes/com/example/vpr_javafx/Menu.class b/target/classes/com/example/vpr_javafx/Menu.class index 1316271748e1f678c29852841ca672b980a17a8e..e1c78431419c3813fb3553e0969c4379e127e098 100644 GIT binary patch delta 505 zcmZ8eyG{a86r8)u?#hOTk%S;NCWgd-3af$wf+(VbFKkUrq`*os0ecHe%liv{fJSU6 zER2RNWsjERr}`G(5paua|BRt5UWxA83DF9_ze)%nD&jZlgflMTJF^*&YsXgvmdt`#qNc delta 380 zcmYjLJ5Iwu6r8oayI@&PK@&hi2!w=UlHho_#A z^STlX%!*e21iap8G`Na~{WKk<8i~M~>B}W^?Py!$)Lh8(xe~1{1aKfAvBA1*K4d5= zH)^#|CE0-@E@Km+sj29)#?Iq%HY-vnF|pXkD?a0y-^gRm;6`~ps1JZvc zGBai;P@jm+n+luRt`D0S@kkwuXijOypCPxya9|ZJsvEgF)IsLS%Ko#9 V7V`|XdyFF-vvXN>ae^M^e*yo-EP4O{ diff --git a/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml b/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml index 6a5cd21..29f3851 100644 --- a/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml +++ b/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml @@ -8,7 +8,7 @@ -