projects
/
RRRRHHHH_Code
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code
[RRRRHHHH_Code]
/
ruralHouses
/
src
/
domain
/
Account.java
diff --git
a/ruralHouses/src/domain/Account.java
b/ruralHouses/src/domain/Account.java
index
ff19267
..
7fb472c
100644
(file)
--- a/
ruralHouses/src/domain/Account.java
+++ b/
ruralHouses/src/domain/Account.java
@@
-2,9
+2,9
@@
package domain;
import java.io.Serializable;
import java.util.Arrays;
import java.io.Serializable;
import java.util.Arrays;
-
import businessLogic.SecurityManager;
import businessLogic.SecurityManager;
+
public class Account implements Serializable {
/**
public class Account implements Serializable {
/**
@@
-21,7
+21,6
@@
public class Account implements Serializable {
private Owner owner;
private boolean admin = false;
private Owner owner;
private boolean admin = false;
-
public Account(byte[] usr){
this.username = usr;
this.salt =null;
public Account(byte[] usr){
this.username = usr;
this.salt =null;
@@
-48,7
+47,9
@@
public class Account implements Serializable {
}
}
+
+
public byte[] getUsername() {
return username;
}
public byte[] getUsername() {
return username;
}