Remove username attribute
This commit is contained in:
@@ -32,7 +32,6 @@ public class User
|
||||
private String password;
|
||||
private long activationCode;
|
||||
private Calendar activationDate;
|
||||
private String username;
|
||||
private Set<String> tags = new HashSet<String>();
|
||||
private boolean allowSendEmail = false;
|
||||
private String locale;
|
||||
@@ -118,9 +117,7 @@ public class User
|
||||
final String email = getEmail();
|
||||
if (email != null ? !email.equals(user.getEmail()) : user.getEmail() != null) return false;
|
||||
if (firstname != null ? !firstname.equals(user.firstname) : user.firstname != null) return false;
|
||||
if (lastname != null ? !lastname.equals(user.lastname) : user.lastname != null) return false;
|
||||
return !(username != null ? !username.equals(user.username) : user.username != null);
|
||||
|
||||
return !(lastname != null ? !lastname.equals(user.lastname) : user.lastname != null);
|
||||
}
|
||||
|
||||
|
||||
@@ -133,14 +130,6 @@ public class User
|
||||
return result;
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public String getLocale() {
|
||||
return locale;
|
||||
|
Reference in New Issue
Block a user