From eea10407c911ffd441ae3797a84183e7842f9931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20S=C3=A4ume?= Date: Wed, 22 May 2024 09:49:52 +0200 Subject: [PATCH] #8: Cleanup & Javadoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dominik Säume --- src/main/java/de/hitec/nhplus/Main.java | 17 +++++++++++------ .../de/hitec/nhplus/fixtures/UserFixture.java | 9 +++++++-- .../de/hitec/nhplus/utils/tab/TabStruct.java | 4 ++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/hitec/nhplus/Main.java b/src/main/java/de/hitec/nhplus/Main.java index 2393731..fb533ea 100644 --- a/src/main/java/de/hitec/nhplus/Main.java +++ b/src/main/java/de/hitec/nhplus/Main.java @@ -37,10 +37,17 @@ public class Main extends Application { @Override public void start(Stage primaryStage) { this.primaryStage = primaryStage; - executePassword(); + User user = executeLogin(); + if(user != null){ + executeMainApplication(user); + } } - private void executePassword() { + /** + * Executes the login. + * @return User The {@link User} object for the logged-in {@link User}. Is {@code null}, if the login was not successful, + */ + private User executeLogin() { try { FXMLLoader loader = new FXMLLoader(Main.class.getResource("/de/hitec/nhplus/login/LoginView.fxml")); @@ -55,12 +62,10 @@ public class Main extends Application { controller.initialize(loginStage); loginStage.showAndWait(); - - if(controller.user != null){ - executeMainApplication(controller.user); - } + return controller.user; } catch (IOException exception) { exception.printStackTrace(); + return null; } } diff --git a/src/main/java/de/hitec/nhplus/fixtures/UserFixture.java b/src/main/java/de/hitec/nhplus/fixtures/UserFixture.java index 7b3550f..bb75d7d 100644 --- a/src/main/java/de/hitec/nhplus/fixtures/UserFixture.java +++ b/src/main/java/de/hitec/nhplus/fixtures/UserFixture.java @@ -13,7 +13,12 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.*; -public class UserFixture implements Fixture{ +/** + * {@link Fixture} for {@link User}. + * + * @author Dominik Säume + */ +public class UserFixture implements Fixture { private static final String SCHEMA = "/de/hitec/nhplus/login/database/User.sql"; private static final String PERMISSION_SCHEMA = "/de/hitec/nhplus/login/database/UserPermission.sql"; private static final String TO_NURSE_SCHEMA = "/de/hitec/nhplus/login/database/UserToNurse.sql"; @@ -94,7 +99,7 @@ public class UserFixture implements Fixture{ UserDao dao = DaoFactory.getInstance().createUserDAO(); Map usersByUsername = new HashMap<>(); - for (User user : users){ + for (User user : users) { dao.create(user); usersByUsername.put(user.getUsername(), user); } diff --git a/src/main/java/de/hitec/nhplus/utils/tab/TabStruct.java b/src/main/java/de/hitec/nhplus/utils/tab/TabStruct.java index 9a49919..bcdf6ab 100644 --- a/src/main/java/de/hitec/nhplus/utils/tab/TabStruct.java +++ b/src/main/java/de/hitec/nhplus/utils/tab/TabStruct.java @@ -1,5 +1,9 @@ package de.hitec.nhplus.utils.tab; +/** + * A simple class holding the data needed for constructing a tab. + * @see TabManager + */ public class TabStruct { public String title; public String view;