]> git.mxchange.org Git - juser-core.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Sat, 9 May 2020 23:54:18 +0000 (01:54 +0200)
committerRoland Häder <roland@mxchange.org>
Sat, 9 May 2020 23:54:58 +0000 (01:54 +0200)
- renamed other to fooEntity

Signed-off-by: Roland Häder <roland@mxchange.org>
src/org/mxchange/jusercore/model/user/LoginUser.java
src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java

index 436d17c7cb5ae72e5640d9b4f514bfc8aebdcc5d..ba6e47ce90499fe596e76af6dae57518039fc9cf 100644 (file)
@@ -254,17 +254,17 @@ public class LoginUser implements User {
                        return false;
                }
 
-               final User other = (User) object;
+               final User user = (User) object;
 
-               if (!Objects.equals(this.getUserName(), other.getUserName())) {
+               if (!Objects.equals(this.getUserName(), user.getUserName())) {
                        return false;
-               } else if (!Objects.equals(this.getUserConfirmKey(), other.getUserConfirmKey())) {
+               } else if (!Objects.equals(this.getUserConfirmKey(), user.getUserConfirmKey())) {
                        return false;
-               } else if (!Objects.equals(this.getUserAccountStatus(), other.getUserAccountStatus())) {
+               } else if (!Objects.equals(this.getUserAccountStatus(), user.getUserAccountStatus())) {
                        return false;
-               } else if (!Objects.equals(this.getUserContact(), other.getUserContact())) {
+               } else if (!Objects.equals(this.getUserContact(), user.getUserContact())) {
                        return false;
-               } else if (!Objects.equals(this.getUserProfileMode(), other.getUserProfileMode())) {
+               } else if (!Objects.equals(this.getUserProfileMode(), user.getUserProfileMode())) {
                        return false;
                }
 
index c61ddc3f98e0656cb4d2fcb1e70ccd6316cdd708..3501a0ffc936955712726e636b5b1b85e64a4418 100644 (file)
@@ -99,7 +99,7 @@ public class UserPasswordHistory implements PasswordHistory {
         * Constructor with password hash and user instance
         * <p>
         * @param userPasswordHistoryPasswordHash Password hash
-        * @param userPasswordHistoryUser User instance
+        * @param userPasswordHistoryUser         User instance
         */
        public UserPasswordHistory (final String userPasswordHistoryPasswordHash, final User userPasswordHistoryUser) {
                // Set all
@@ -117,13 +117,13 @@ public class UserPasswordHistory implements PasswordHistory {
                        return false;
                }
 
-               final PasswordHistory other = (PasswordHistory) object;
+               final PasswordHistory history = (PasswordHistory) object;
 
-               if (!Objects.equals(this.getUserPasswordHistoryId(), other.getUserPasswordHistoryId())) {
+               if (!Objects.equals(this.getUserPasswordHistoryId(), history.getUserPasswordHistoryId())) {
                        return false;
-               } else if (!Objects.equals(this.getUserPasswordHistoryPasswordHash(), other.getUserPasswordHistoryPasswordHash())) {
+               } else if (!Objects.equals(this.getUserPasswordHistoryPasswordHash(), history.getUserPasswordHistoryPasswordHash())) {
                        return false;
-               } else if (!Objects.equals(this.getUserPasswordHistoryUser(), other.getUserPasswordHistoryUser())) {
+               } else if (!Objects.equals(this.getUserPasswordHistoryUser(), history.getUserPasswordHistoryUser())) {
                        return false;
                }