]> git.mxchange.org Git - juser-activity-core.git/commitdiff
renamed field to make it more clear
authorRoland Häder <roland@mxchange.org>
Thu, 28 Apr 2016 09:43:04 +0000 (11:43 +0200)
committerRoland Häder <roland@mxchange.org>
Thu, 28 Apr 2016 09:43:04 +0000 (11:43 +0200)
src/org/mxchange/jusercore/model/user/LoginUser.java
src/org/mxchange/jusercore/model/user/User.java

index 33678e58aa60c177238ad1e8ca4c35da2633cbfc..b5bc4daf5ca0fd0e13a25a1cba165bfce9105998 100644 (file)
@@ -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;
+       }
+
 }
index 915fbcf24e07e03df1560cad995708dcaf5ecf30..1c8692ac4e59d7b00cd23a17aa5ff47d21ed6fe6 100644 (file)
@@ -139,14 +139,14 @@ public interface User extends Serializable {
         * <p>
         * @return Reason of last locked
         */
-       String getLastLockedReason ();
+       String getUserLastLockedReason ();
 
        /**
         * Setter for reason of last locked
         * <p>
         * @param lastLockedReason Reason of last locked
         */
-       void setLastLockedReason (final String lastLockedReason);
+       void setUserLastLockedReason (final String lastLockedReason);
 
        /**
         * Getter for user name