From: Roland Häder Date: Thu, 28 Apr 2016 09:43:04 +0000 (+0200) Subject: renamed field to make it more clear X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e1c8e2ac4369131d3b3e2d57fcbdebc33244b28;p=juser-core.git renamed field to make it more clear --- diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index 33678e5..b5bc4da 100644 --- a/src/org/mxchange/jusercore/model/user/LoginUser.java +++ b/src/org/mxchange/jusercore/model/user/LoginUser.java @@ -83,13 +83,6 @@ public class LoginUser implements User { */ private static final long serialVersionUID = 4_328_454_581_751L; - /** - * Last locked reason - */ - @Lob - @Column (name = "user_last_locked_reason") - private String lastLockedReason; - /** * Account status */ @@ -141,6 +134,13 @@ public class LoginUser implements User { @Column (name = "user_last_locked_timestamp") private Calendar userLastLocked; + /** + * Last locked reason + */ + @Lob + @Column (name = "user_last_locked_reason") + private String userLastLockedReason; + /** * User name */ @@ -203,24 +203,6 @@ public class LoginUser implements User { (Objects.equals(this.getUserId(), other.getUserId()))); } - @Override - public int hashCode () { - int hash = 5; - hash = 83 * hash + Objects.hashCode(this.getUserName()); - hash = 83 * hash + Objects.hashCode(this.getUserId()); - return hash; - } - - @Override - public String getLastLockedReason () { - return this.lastLockedReason; - } - - @Override - public void setLastLockedReason (final String lastLockedReason) { - this.lastLockedReason = lastLockedReason; - } - @Override public UserAccountStatus getUserAccountStatus () { return this.userAccountStatus; @@ -291,6 +273,16 @@ public class LoginUser implements User { this.userLastLocked = userLastLocked; } + @Override + public String getUserLastLockedReason () { + return this.userLastLockedReason; + } + + @Override + public void setUserLastLockedReason (final String userLastLockedReason) { + this.userLastLockedReason = userLastLockedReason; + } + @Override public String getUserName () { return this.userName; @@ -321,4 +313,12 @@ public class LoginUser implements User { this.userUpdated = userUpdated; } + @Override + public int hashCode () { + int hash = 5; + hash = 83 * hash + Objects.hashCode(this.getUserName()); + hash = 83 * hash + Objects.hashCode(this.getUserId()); + return hash; + } + } diff --git a/src/org/mxchange/jusercore/model/user/User.java b/src/org/mxchange/jusercore/model/user/User.java index 915fbcf..1c8692a 100644 --- a/src/org/mxchange/jusercore/model/user/User.java +++ b/src/org/mxchange/jusercore/model/user/User.java @@ -139,14 +139,14 @@ public interface User extends Serializable { *

* @return Reason of last locked */ - String getLastLockedReason (); + String getUserLastLockedReason (); /** * Setter for reason of last locked *

* @param lastLockedReason Reason of last locked */ - void setLastLockedReason (final String lastLockedReason); + void setUserLastLockedReason (final String lastLockedReason); /** * Getter for user name