Started with the separated DB with the given code

[RRRRHHHH_Code] / ruralHouses / src / domain / Account.java

diff --git a/ruralHouses/src/domain/Account.java b/ruralHouses/src/domain/Account.java
index ce6bd9e..989440c 100644 (file)
--- a/ruralHouses/src/domain/Account.java
+++ b/ruralHouses/src/domain/Account.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 
 import businessLogic.SecurityManager;
 
+
 public class Account implements Serializable {
 
        /**
@@ -16,18 +17,15 @@ public class Account implements Serializable {
        private byte[] username;
        private byte[] password;
        private byte[] salt;
-
-
        private Owner owner;
        private boolean admin = false;
 
-       
-       public Account(String usr){
-               this.username = SecurityManager.getInstance().calculateHash(usr);
+
+       public Account(byte[] usr){
+               this.username = usr;
                this.salt =null;
                this.password = null;
                this.owner = null;
-               
        }
        public Account(String usr, String pass, boolean isAdmin) {
                this.username = SecurityManager.getInstance().calculateHash(usr);
@@ -35,7 +33,13 @@ public class Account implements Serializable {
                this.password = SecurityManager.getInstance().calculateSaltedHash(pass.toCharArray(), this.salt);
                this.owner = null;
                this.admin = isAdmin;
-
+       }
+       
+       public Account(Owner own){
+               this.username = null;
+               this.salt =null;
+               this.password = null;
+               this.owner = own;
        }
 
        public Account(String usr, String pass, Owner ow) {
@@ -48,6 +52,9 @@ public class Account implements Serializable {
 
        }
 
+
+       
+
        public byte[] getUsername() {
                return username;
        }
@@ -87,8 +94,6 @@ public class Account implements Serializable {
                if (getClass() != obj.getClass())
                        return false;
                Account other = (Account) obj;
-               if (!Arrays.equals(password, other.password))
-                       return false;
                if (!Arrays.equals(username, other.username))
                        return false;
                return true;