295,14 → 295,6 |
this.loginHistory = loginHistory; |
} |
|
public boolean equals(Object o) |
{ |
if(o == null || !(o instanceof User)) return false; |
|
User u = (User)o; |
return (getId() != null) && (u.getId() != null) && (getId().equals(u.getId())); |
} |
|
protected void update(User origin) |
{ |
this.login = origin.login; |
311,14 → 303,6 |
this.locale = origin.locale; |
} |
|
public int hashCode() |
{ |
if(getId() == null) |
return 0; |
else |
return getId().hashCode(); |
} |
|
public String getTypeKey() |
{ |
return ak.hostadmiral.core.resources.CoreResources.TYPE_USER; |
387,6 → 371,6 |
|
public String toString() |
{ |
return getClass().getName() + " [" + getId() + "] [" + getLogin() + "]"; |
return "User id=[" + getId() + "] login=[" + login + "]"; |
} |
} |