diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java
index 246c2392184b350584ef861220d48f90dc02b047..93593a377e83e4010fff62b69ed1848ef175f7b0 100644
--- a/src/main/java/com/application/GUI/LineChartFunctionality.java
+++ b/src/main/java/com/application/GUI/LineChartFunctionality.java
@@ -318,6 +318,7 @@ public class LineChartFunctionality {
}
}
+ getRegressionSeriesConfidenceInterval().getData().clear();
Map<Integer, ArrayList<Double>> confidenceIntervalShadow = statistics(multiMap,true);
for ( Map.Entry<Integer, ArrayList<Double>> entry : confidenceIntervalShadow.entrySet()) {
for (int i = 0; i < entry.getValue().size(); i++) {
diff --git a/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java b/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java
index e96015ba4592ddac1de67180f8ace1b381551399..fe07431d0739826764285cbccabbde1a73fd8b2f 100644
--- a/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java
+++ b/src/main/java/com/application/GUI/PopUpWindows/InputPopup.java
@@ -20,6 +20,7 @@ import static com.application.DB.DB.getCurrentDrying;
import static com.application.DB.Constants.MAX_USER_INPUT_CHARACTERS;
import static com.application.DB.HelpingFunctions.setLoadedData;
import static com.application.GUI.LineChartFunctionality.*;
+import static com.application.GUI.Panes.CreateLogoBar.getLogin;
import static com.application.Main.*;
import static com.application.DB.DB.setInputParameters;
@@ -32,7 +33,6 @@ import static com.application.DB.DB.setInputParameters;
*/
public class InputPopup {
-
public static void display() {
Stage window = new Stage();
@@ -132,6 +132,10 @@ public class InputPopup {
boolean err = false;
+ if(getLogin().getText().equals("Login")){
+ err = true;
+ }
+
// If the input is null, sets the value to be empty
if (treeSpeciesList.getValue() == null) {
Constants.TREE_SPECIES = "";
@@ -244,7 +248,9 @@ public class InputPopup {
ex.printStackTrace();
}
- }
+ } else {
+ NotificationPopUp.displayNotificationWindow("Please login!");
+ }
}
);
diff --git a/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java b/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java
index 0f1dc1b3797b08432f2c99e44772a2f9de28cbb9..a77b62ca3bd936ac4392e3762f1a9a63f42b1ced 100644
--- a/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java
+++ b/src/main/java/com/application/GUI/PopUpWindows/LoginPopup.java
@@ -1,8 +1,11 @@
package com.application.GUI.PopUpWindows;
+import javafx.event.EventHandler;
import javafx.geometry.Pos;
import javafx.scene.Scene;
import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
import javafx.scene.layout.VBox;
import javafx.stage.Modality;
import javafx.stage.Stage;
@@ -16,7 +19,28 @@ import static com.application.GUI.Panes.CreateLogoBar.getLogin;
public class LoginPopup {
- public static PasswordField PASSWORD_TEXT_FIELD = new PasswordField();
+ private static PasswordField PASSWORD_TEXT_FIELD = new PasswordField();
+ private static TextField USERNAME_TEXT_FIELD = new TextField();
+
+ /**
+ * Tries to login
+ *
+ * @return a boolean if an error should be thrown or not. True gives no error, false throws an error.
+ */
+ private static boolean loginButtonPressed(){
+ try {
+ getAccountInformation(getUsernameTextField().getText(), hashPassword(getPasswordTextField().getText()));
+ if(getLogin().getText().equals("Admin")) {
+ LoginPopup.adminPopup();
+ return true;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return !getLogin().getText().equals("Login");
+ }
+
public static void login(){
@@ -27,36 +51,33 @@ public class LoginPopup {
Label userNameLabel = new Label("Username:");
Label passwordLabel = new Label("Password:");
- TextField userNameTextField = new TextField();
- getPasswordTextField().clear();
-
Button closeButton = new Button("Close");
Button loginButton = new Button("Login");
+
+ getPasswordTextField().clear();
+
closeButton.setOnAction(event -> window.close());
- loginButton.setOnAction(event -> {
- try {
- getAccountInformation(userNameTextField.getText(), hashPassword(getPasswordTextField().getText()));
- if(getLogin().getText().equals("Admin")) {
- LoginPopup.adminPopup();
- window.close();
- }
- } catch (Exception e) {
- e.printStackTrace();
+ getPasswordTextField().setOnKeyPressed( event -> {
+ if( event.getCode() == KeyCode.ENTER ) {
+ if(loginButtonPressed()){
+ window.close();
+ }
}
+ });
- if(!getLogin().getText().equals("Login")){
+ loginButton.setOnAction(event -> {
+ if(loginButtonPressed()){
window.close();
}
-
});
VBox layout = new VBox(10);
layout.setAlignment(Pos.CENTER);
- layout.getChildren().addAll(userNameLabel, userNameTextField, passwordLabel, getPasswordTextField(), loginButton, closeButton);
+ layout.getChildren().addAll(userNameLabel, getUsernameTextField(), passwordLabel, getPasswordTextField(), loginButton, closeButton);
Scene scene = new Scene(layout, 500, 300);
scene.getStylesheets().add(InputPopup.class.getResource("/com.application/CSS/styleSheet.css").toExternalForm());
@@ -281,4 +302,8 @@ public class LoginPopup {
public static PasswordField getPasswordTextField() {
return PASSWORD_TEXT_FIELD;
}
+
+ public static TextField getUsernameTextField() {
+ return USERNAME_TEXT_FIELD;
+ }
}
diff --git a/target/classes/com/application/DB/AccountHandler.class b/target/classes/com/application/DB/AccountHandler.class
index eab033a15af2f1f96d2b7e538ef914214b61ea2f..02a8049690ac1479b6016badc13cbef09e5aa87a 100644
Binary files a/target/classes/com/application/DB/AccountHandler.class and b/target/classes/com/application/DB/AccountHandler.class differ
diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class
index cb0cd97ba64645c47e99470a2b50cfbb545200ab..f9cd0427f1d17a46b71d6a7a175b9be36af824b4 100644
Binary files a/target/classes/com/application/DB/DB.class and b/target/classes/com/application/DB/DB.class differ
diff --git a/target/classes/com/application/DB/HelpingFunctions.class b/target/classes/com/application/DB/HelpingFunctions.class
index 20e3d6c5e0490d9ddbe6094ea05e11c3be6765fe..2847eab1c308e4df52d0b801cd32249daaf9dd44 100644
Binary files a/target/classes/com/application/DB/HelpingFunctions.class and b/target/classes/com/application/DB/HelpingFunctions.class differ
diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class
index bc6a733dad6584d6375cd818bbd9a7750cfdd36a..755df60ca93225f1a78d090a5e98155b2c0eb342 100644
Binary files a/target/classes/com/application/GUI/LineChartFunctionality.class and b/target/classes/com/application/GUI/LineChartFunctionality.class differ
diff --git a/target/classes/com/application/GUI/Panes/BottomBar.class b/target/classes/com/application/GUI/Panes/BottomBar.class
deleted file mode 100644
index 12ce86ef6278f3b1a3a17d788f51dd8d0ac0ae24..0000000000000000000000000000000000000000
Binary files a/target/classes/com/application/GUI/Panes/BottomBar.class and /dev/null differ
diff --git a/target/classes/com/application/GUI/Panes/LogoBar.class b/target/classes/com/application/GUI/Panes/LogoBar.class
deleted file mode 100644
index 654a3b92355770a294d191cc0f302fe5fc700687..0000000000000000000000000000000000000000
Binary files a/target/classes/com/application/GUI/Panes/LogoBar.class and /dev/null differ
diff --git a/target/classes/com/application/GUI/Panes/MenuBar.class b/target/classes/com/application/GUI/Panes/MenuBar.class
deleted file mode 100644
index eb12162b61fb84ddc3e69ec508f7df592b17a1c6..0000000000000000000000000000000000000000
Binary files a/target/classes/com/application/GUI/Panes/MenuBar.class and /dev/null differ
diff --git a/target/classes/com/application/GUI/Panes/SideBar$1WorkerThread.class b/target/classes/com/application/GUI/Panes/SideBar$1WorkerThread.class
deleted file mode 100644
index bb54f0a22c4bec363dc81cddb6023fda37586d64..0000000000000000000000000000000000000000
Binary files a/target/classes/com/application/GUI/Panes/SideBar$1WorkerThread.class and /dev/null differ
diff --git a/target/classes/com/application/GUI/Panes/SideBar.class b/target/classes/com/application/GUI/Panes/SideBar.class
deleted file mode 100644
index 2176f7d89cd8104c978404d72d8af780c4142634..0000000000000000000000000000000000000000
Binary files a/target/classes/com/application/GUI/Panes/SideBar.class and /dev/null differ
diff --git a/target/classes/com/application/GUI/PopUpWindows/InputPopup.class b/target/classes/com/application/GUI/PopUpWindows/InputPopup.class
index 347ac9d24189f21a827c7d1ad4ed22d1523084af..728dd498b6efc1a0bb249930929c014285629008 100644
Binary files a/target/classes/com/application/GUI/PopUpWindows/InputPopup.class and b/target/classes/com/application/GUI/PopUpWindows/InputPopup.class differ
diff --git a/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class b/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class
index c94b2f85d508e5f666aed9e7f81ececd4e584974..f42ec1d8527ca6d4539c0dfcdac663c4f084eeb4 100644
Binary files a/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class and b/target/classes/com/application/GUI/PopUpWindows/LoginPopup.class differ
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index aa6c0575581b03ac72e0f15042a91c42bfd30150..6b48ef79d20cc6414449b1d7dd4c8f8131946f60 100644
Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ