RRRRHHHH_Code
Diff Revisions
4f8bcc ...
vs
25898b ...
for ruralHouses/src/domain/Account.java
|
@@ -22,8 +22,8 @@ |
22 |
22 |
|
private boolean admin = false; |
23 |
23 |
|
|
24 |
24 |
|
|
25 |
|
- |
public Account(String usr){ |
26 |
|
- |
this.username = SecurityManager.getInstance().calculateHash(usr); |
|
25 |
+ |
public Account(byte[] usr){ |
|
26 |
+ |
this.username = usr; |
27 |
27 |
|
this.salt =null; |
28 |
28 |
|
this.password = null; |
29 |
29 |
|
this.owner = null; |
|
@@ -48,6 +48,7 @@ |
48 |
48 |
|
|
49 |
49 |
|
} |
50 |
50 |
|
|
|
51 |
+ |
|
51 |
52 |
|
public byte[] getUsername() { |
52 |
53 |
|
return username; |
53 |
54 |
|
} |
|
@@ -86,8 +87,6 @@ |
86 |
87 |
|
if (getClass() != obj.getClass()) |
87 |
88 |
|
return false; |
88 |
89 |
|
Account other = (Account) obj; |
89 |
|
- |
if (!Arrays.equals(password, other.password)) |
90 |
|
- |
return false; |
91 |
90 |
|
if (!Arrays.equals(username, other.username)) |
92 |
91 |
|
return false; |
93 |
92 |
|
return true; |