Refactoring

This commit is contained in:
M66B
2019-06-25 09:46:31 +02:00
parent ecfbe1df43
commit 78e48cd506
3 changed files with 247 additions and 81 deletions

View File

@@ -44,13 +44,13 @@ public class TupleMessageEx extends EntityMessage {
public boolean duplicate;
@Override
public boolean uiEquals(Object obj) {
public boolean equals(Object obj) {
if (obj instanceof TupleMessageEx) {
TupleMessageEx other = (TupleMessageEx) obj;
return (super.uiEquals(obj) &&
return (super.equals(obj) &&
Objects.equals(this.accountName, other.accountName) &&
Objects.equals(this.accountColor, other.accountColor) &&
//this.accountNotify == other.accountNotify &&
this.accountNotify == other.accountNotify &&
this.folderName.equals(other.folderName) &&
Objects.equals(this.folderDisplay, other.folderDisplay) &&
this.folderType.equals(other.folderType) &&
@@ -68,27 +68,4 @@ public class TupleMessageEx extends EntityMessage {
}
return false;
}
@Override
public boolean equals(Object obj) {
if (obj instanceof TupleMessageEx) {
TupleMessageEx other = (TupleMessageEx) obj;
return (super.equals(obj) &&
Objects.equals(this.accountName, other.accountName) &&
Objects.equals(this.accountColor, other.accountColor) &&
this.accountNotify == other.accountNotify &&
this.folderName.equals(other.folderName) &&
Objects.equals(this.folderDisplay, other.folderDisplay) &&
this.folderType.equals(other.folderType) &&
this.count == other.count &&
this.unseen == other.unseen &&
this.unflagged == other.unflagged &&
this.attachments == other.attachments &&
this.drafts == other.drafts &&
this.visible == other.visible &&
Objects.equals(this.totalSize, other.totalSize) &&
this.duplicate == other.duplicate);
}
return false;
}
}