Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

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

diff --git a/ruralHouses/src/domain/Account.java b/ruralHouses/src/domain/Account.java
index ba7a630..08e841c 100644 (file)
--- a/ruralHouses/src/domain/Account.java
+++ b/ruralHouses/src/domain/Account.java
@@ -1,27 +1,40 @@
 package domain;
 
+import java.io.Serializable;
 import java.util.Arrays;
 
 import businessLogic.SecurityManager;
 
-public class Account {
+public class Account implements Serializable {
 
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
        
 
        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(Owner own){
+               this.username = null;
+               this.salt =null;
+               this.password = null;
+               this.owner = own;
+               
        }
        public Account(String usr, String pass, boolean isAdmin) {
                this.username = SecurityManager.getInstance().calculateHash(usr);
@@ -42,6 +55,7 @@ public class Account {
 
        }
 
+       
        public byte[] getUsername() {
                return username;
        }
@@ -58,6 +72,7 @@ public class Account {
                return admin;
        }
 
+       
        public void setAdmin(boolean admin) {
                this.admin = admin;
        }
@@ -80,8 +95,6 @@ public class Account {
                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;