tmp

[RRRRHHHH_Code] / ruralHouses / src / gui / LoginGUI.java

diff --git a/ruralHouses/src/gui/LoginGUI.java b/ruralHouses/src/gui/LoginGUI.java
index db04aff..1e59e89 100644 (file)
--- a/ruralHouses/src/gui/LoginGUI.java
+++ b/ruralHouses/src/gui/LoginGUI.java
@@ -16,10 +16,6 @@ import javax.swing.SwingConstants;
 import businessLogic.LoginManager;
 import businessLogic.LoginManagerInterface;
 import domain.Account;
-import domain.Owner;
-
-import javax.swing.JRadioButton;
-import javax.swing.ButtonGroup;
 
 public class LoginGUI extends JFrame {
 
@@ -29,7 +25,6 @@ public class LoginGUI extends JFrame {
        private JPasswordField passwordField;
        private LoginManagerInterface loginManager = new LoginManager();
        private JLabel loginFeedback;
-       private final ButtonGroup buttonGroup = new ButtonGroup();
        public LoginGUI() {
                super();
                initialize();
@@ -86,7 +81,8 @@ public class LoginGUI extends JFrame {
        private void jButton_ActionPerformed(ActionEvent e){
                        
                Account acc = loginManager.checkCredentials(usernameField.getText(),new String(passwordField.getPassword()));
-               if (acc.getAdmin()) {
+               if (acc == null) loginFeedback.setText("Incorrect username or password");
+               else if( acc.getAdmin()) {
                        this.setVisible(false);
                        Frame a = new AdminMenuGUI();
                        a.setVisible(true);