From: Roland Häder Date: Sat, 9 May 2020 23:32:03 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=15bde062e5668efe08dd091fb4b8dbfa704c567e;p=jaddressbook-core.git Continued: - renamed other -> entityName Signed-off-by: Roland Häder --- diff --git a/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java index 252d46e..6853de7 100644 --- a/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java +++ b/src/org/mxchange/jaddressbook/model/addressbook/UserAddressbook.java @@ -180,19 +180,19 @@ public class UserAddressbook implements Addressbook { return false; } - final Addressbook other = (Addressbook) object; + final Addressbook addressbook = (Addressbook) object; - if (!Objects.equals(this.getAddressbookId(), other.getAddressbookId())) { + if (!Objects.equals(this.getAddressbookId(), addressbook.getAddressbookId())) { return false; - } else if (!Objects.equals(this.getAddressbookLastLocked(), other.getAddressbookLastLocked())) { + } else if (!Objects.equals(this.getAddressbookLastLocked(), addressbook.getAddressbookLastLocked())) { return false; - } else if (!Objects.equals(this.getAddressbookLastLockedReason(), other.getAddressbookLastLockedReason())) { + } else if (!Objects.equals(this.getAddressbookLastLockedReason(), addressbook.getAddressbookLastLockedReason())) { return false; - } else if (!Objects.equals(this.getAddressbookName(), other.getAddressbookName())) { + } else if (!Objects.equals(this.getAddressbookName(), addressbook.getAddressbookName())) { return false; - } else if (!Objects.equals(this.getAddressbookStatus(), other.getAddressbookStatus())) { + } else if (!Objects.equals(this.getAddressbookStatus(), addressbook.getAddressbookStatus())) { return false; - } else if (!Objects.equals(this.getAddressbookUser(), other.getAddressbookUser())) { + } else if (!Objects.equals(this.getAddressbookUser(), addressbook.getAddressbookUser())) { return false; } diff --git a/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java index 4d1a57d..88b6003 100644 --- a/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java +++ b/src/org/mxchange/jaddressbook/model/addressbook/entry/UserAddressbookEntry.java @@ -142,15 +142,15 @@ public class UserAddressbookEntry implements AddressbookEntry { return false; } - final AddressbookEntry other = (AddressbookEntry) object; + final AddressbookEntry addressbookEntry = (AddressbookEntry) object; - if (!Objects.equals(this.getAddressbookEntryBusinessBasicData(), other.getAddressbookEntryBusinessBasicData())) { + if (!Objects.equals(this.getAddressbookEntryBusinessBasicData(), addressbookEntry.getAddressbookEntryBusinessBasicData())) { return false; - } else if (!Objects.equals(this.getAddressbookEntryId(), other.getAddressbookEntryId())) { + } else if (!Objects.equals(this.getAddressbookEntryId(), addressbookEntry.getAddressbookEntryId())) { return false; - } else if (!Objects.equals(this.getAddressbookEntryPrivateContact(), other.getAddressbookEntryPrivateContact())) { + } else if (!Objects.equals(this.getAddressbookEntryPrivateContact(), addressbookEntry.getAddressbookEntryPrivateContact())) { return false; - } else if (!Objects.equals(this.getEntryAddressbook(), other.getEntryAddressbook())) { + } else if (!Objects.equals(this.getEntryAddressbook(), addressbookEntry.getEntryAddressbook())) { return false; }