From a120422e89ef0a5e9098523f8c720028374e51dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 May 2020 01:54:18 +0200 Subject: [PATCH] Continued: - renamed other to fooEntity MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- src/org/mxchange/jusercore/model/user/LoginUser.java | 12 ++++++------ .../user/password_history/UserPasswordHistory.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index 436d17c..ba6e47c 100644 --- a/src/org/mxchange/jusercore/model/user/LoginUser.java +++ b/src/org/mxchange/jusercore/model/user/LoginUser.java @@ -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; } diff --git a/src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java b/src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java index c61ddc3..3501a0f 100644 --- a/src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java +++ b/src/org/mxchange/jusercore/model/user/password_history/UserPasswordHistory.java @@ -99,7 +99,7 @@ public class UserPasswordHistory implements PasswordHistory { * Constructor with password hash and user instance *

* @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; } -- 2.39.5